Skip to content

Conversation

@thatguyinabeanie
Copy link
Collaborator

@thatguyinabeanie thatguyinabeanie commented Jul 22, 2025

Associated PRs

Description

Required: Please provide a brief description of what this pull request is trying to accomplish.

  • swaps the base image with Civis's ubuntu jammy 22.04 fips enabled image.
  • then proceeds to execute the same process in their dockerfile, mostly untouched.

Context, Consequences, & Considerations

Required: Please step through the following list, pausing at each item to consider your change in relation to the item's context.
Check the box to mark that it applies, and enter your relevant notes under the item.

  • Security: This has security implications. This includes (but not limited to) adding users, modifying user/app permissions, network rules/policies, changing a system interconnection, or changing an authorization strategy.
    • This PR does not require security review. These changes are part of a project plan that has already undergone security review. The link is provided below.
    • This PR requires security review. Add the security label to this PR then request a review from the Security Code Reviewers Team.
  • Execution: This change requires commands to be run outside of the normal merge.
  • Impact: This change may cause service interruptions.
  • Testing: How did you test this change (unit tests, acceptance tests, etc.)? Did you do any manual testing?

manual

  • Testing: How will you confirm this change once it's merged?
  • Documentation: Documentation to reflect this change has been added to Confluence or Zendesk.
  • All items of the checklist have been considered and this PR description is complete.

thatguyinabeanie and others added 7 commits July 21, 2025 22:38
- Replace multi-stage build with gabemendoza1/cloudcode-baseimage-ubuntu-fips:jammy-22.04
- Remove Ubuntu Cloud Image extraction and Alpine stage
- Remove sources.list copy (already configured in base image)
- Add s6-overlay installation for LinuxServer.io compatibility
- Add LinuxServer.io mod scripts (docker-mods, package-install, lsiown)
- Conditionally create abc user (911:911) if not exists
- Maintain full LinuxServer.io ecosystem on FIPS foundation

🤖 Generated with [opencode](https://opencode.ai)

Co-Authored-By: opencode <noreply@opencode.ai>
github-actions[bot]

This comment was marked as off-topic.

@thatguyinabeanie thatguyinabeanie requested a review from Copilot July 22, 2025 13:32

This comment was marked as outdated.

@thatguyinabeanie thatguyinabeanie changed the title Ubuntu fips [CIVIS-11019] civis ubuntu 22.04 fips enabled base image for linuxserver Jul 22, 2025
@thatguyinabeanie thatguyinabeanie changed the title [CIVIS-11019] civis ubuntu 22.04 fips enabled base image for linuxserver [CIVIS-11019] ubuntu 22.04 fips enabled base image for linuxserver Jul 22, 2025
Copy link

@leanne73 leanne73 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some questions - I'm not sure I fully understand the background/history of this PR and this repo, in relation to the linuxserver/docker-baseimage-ubuntu repo.

Also, sorry if I missed it among all the PRs, but could you describe how you view the purpose of each of these image layers now - what each layer provides and when we'll need to update each one?

The final checkbox of the PR description needs to be checked too, assuming everything else is complete.

Dockerfile Outdated

FROM alpine:3 as rootfs-stage
# ECR and base image configuration
ARG ECR_ACCOUNT_ID=1234567890123

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain why we're using a placeholder value here? I agree with copliot's suggestion (assuming this is not a real value).

What will supply these values for the real build?

@thatguyinabeanie thatguyinabeanie changed the base branch from jammy to jammy-squash July 24, 2025 23:31
@thatguyinabeanie thatguyinabeanie changed the base branch from jammy-squash to jammy July 24, 2025 23:33
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR migrates the LinuxServer Ubuntu base image to use Civis Analytics' FIPS-enabled Ubuntu 22.04 base image while maintaining compatibility with the existing LinuxServer infrastructure. The changes eliminate LinuxServer-specific build infrastructure and replace it with AWS CodeBuild/ECR-based workflows for FIPS compliance.

Key Changes

  • Replace upstream Ubuntu base with Civis FIPS-enabled Ubuntu 22.04 image from ECR
  • Remove Jenkins-based CI/CD in favor of AWS CodeBuild workflows
  • Update Dockerfile to install S6 overlay directly on the FIPS base instead of building from scratch

Reviewed Changes

Copilot reviewed 16 out of 17 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
Dockerfile Core changes to use ECR FIPS base image and install S6 overlay directly
docker-compose.yml New composition for building with ECR registry and build args
buildspec/*.yaml AWS CodeBuild specifications for push, release, and merge workflows
Jenkinsfile Removed entire Jenkins-based CI/CD pipeline
sources.list* Removed custom APT sources (using base image sources)
.github/workflows/* Removed LinuxServer GitHub workflows
package_versions.txt Removed package tracking file
readme-vars.yml, jenkins-vars.yml Removed LinuxServer configuration files
Comments suppressed due to low confidence (1)

buildspec/release.yaml:20

  • Missing closing brace '}' for the MINOR_TAG variable expansion. This will cause the docker build command to fail.
        --tag ${FIPS_REPOSITORY_URI}:${MINOR_TAG

Copy link

@leanne73 leanne73 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@thatguyinabeanie thatguyinabeanie merged commit 8ebf7f8 into jammy Jul 25, 2025
2 of 3 checks passed
@civis-robot
Copy link

Pull Request Merged!!! This build is running now.

@thatguyinabeanie thatguyinabeanie deleted the ubuntu-fips-2 branch July 25, 2025 17:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants