Skip to content

Commit c8a8ee9

Browse files
thatguyinabeanieopencode
andauthored
[CIVIS-11019] update to use ubuntu 22.04 fips enabled base image (#1)
* ubuntu fips * Improve Dockerfile formatting and readability - Use consistent 2-space indentation throughout - Remove unnecessary comment blocks - Better organize ARG declarations - Improve line continuation formatting 🤖 Generated with [opencode](https://opencode.ai) Co-Authored-By: opencode <noreply@opencode.ai> * remove extraneous file * remove jenkins things * remove extra files * Add docker-compose configuration for FIPS-compliant code-server - Add docker-compose.yml with build args for VERSION and CODE_RELEASE - Add .env.example with configurable environment variables - Update .gitignore and .dockerignore to exclude .env files - Set CODE_RELEASE default to 4.102.1 for stable builds - Configure image name: gabemendoza1/codecloud-code-server 🤖 Generated with [opencode](https://opencode.ai) Co-Authored-By: opencode <noreply@opencode.ai> * simplify * update image * update image * update image * add netcat-openbsd * netcat * default ids 0 * remove extra files * remove more workflows * upgrade Python to 3.12 🤖 Generated with [opencode](https://opencode.ai) Co-Authored-By: opencode <noreply@opencode.ai> * add buildspec * update buildspec defs * update buildspec defs * ubuntu-fips-2 * fixed buildspec args * FIPS_REPOSITORY_URI * styling * update placeholders * latest * latest * put that thing back where it came from or so help me * only need 1 * simplify Dockerfile * no need ignores * no need ignores * simplify * remove comment * trigger codebuild * jammy --------- Co-authored-by: opencode <noreply@opencode.ai>
1 parent b5d20f6 commit c8a8ee9

14 files changed

+158
-2076
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,38 @@
1-
<!--- Provide a general summary of your changes in the Title above -->
1+
## Description
22

3-
[linuxserverurl]: https://linuxserver.io
4-
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
3+
Required: Please provide a brief description of what this pull request is trying to accomplish.
54

5+
>
66
7-
<!--- Before submitting a pull request please check the following -->
7+
## Context, Consequences, & Considerations
88

9-
<!--- If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR -->
10-
<!--- Ask yourself if this modification is something the whole userbase will benefit from, if this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
11-
<!--- That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message -->
12-
<!--- You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->
13-
<!--- We maintain a changelog of major revisions to the container at the end of readme-vars.yml in the root of this repository, please add your changes there if appropriate -->
9+
Required: Please step through the following list, pausing at each item to consider your change in relation to the item's context.
10+
Check the box to mark that it applies, and enter your relevant notes under the item.
1411

12+
- [ ] 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.
13+
- [ ] 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.
14+
- [ ] This PR requires security review. Add the `security` label to this PR then request a review from the [Security Code Reviewers Team](https://github.com/orgs/civisanalytics/teams/security-code-reviewers).
1515

16-
<!--- Coding guidelines: -->
17-
<!--- 1. Installed packages in the Dockerfiles should be in alphabetical order -->
18-
<!--- 2. Changes to Dockerfile should be replicated in Dockerfile.armhf and Dockerfile.aarch64 if applicable -->
19-
<!--- 3. Indentation style (tabs vs 4 spaces vs 1 space) should match the rest of the document -->
20-
<!--- 4. Readme is auto generated from readme-vars.yml, make your changes there -->
16+
>
2117
22-
------------------------------
18+
- [ ] Execution: This change requires commands to be run outside of the normal merge.
2319

24-
- [ ] I have read the [contributing](https://github.com/linuxserver/docker-code-server/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
20+
>
2521
26-
------------------------------
22+
- [ ] Impact: This change may cause service interruptions.
2723

28-
<!--- We welcome all PR’s though this doesn’t guarantee it will be accepted. -->
24+
>
2925
30-
## Description:
31-
<!--- Describe your changes in detail -->
26+
- [ ] Testing: How did you test this change (unit tests, acceptance tests, etc.)? Did you do any manual testing?
3227

33-
## Benefits of this PR and context:
34-
<!--- Please explain why we should accept this PR. If this fixes an outstanding bug, please reference the issue # -->
28+
>
3529
36-
## How Has This Been Tested?
37-
<!--- Please describe in detail how you tested your changes. -->
38-
<!--- Include details of your testing environment, and the tests you ran to -->
39-
<!--- see how your change affects other areas of the code, etc. -->
30+
- [ ] Testing: How will you confirm this change once it's merged?
4031

32+
>
4133
42-
## Source / References:
43-
<!--- Please include any forum posts/github links relevant to the PR -->
34+
- [ ] Documentation: Documentation to reflect this change has been added to Confluence or Zendesk.
35+
36+
>
37+
38+
- [ ] **All items of the checklist have been considered and this PR description is complete.**

.github/workflows/call_issue_pr_tracker.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/workflows/call_issues_cron.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

.github/workflows/greetings.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

Dockerfile

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,47 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-ubuntu:noble
3+
ARG ECR_ACCOUNT_ID
4+
ARG ECR_REGION=us-east-1
5+
ARG BASE_IMAGE_NAME=docker-linuxserver-ubuntu-fips
6+
ARG BASE_IMAGE_TAG=jammy
7+
ARG ECR_URI=${ECR_ACCOUNT_ID}.dkr.ecr-fips.${ECR_REGION}.amazonaws.com/${BASE_IMAGE_NAME}:${BASE_IMAGE_TAG}
48

5-
# set version label
9+
FROM ${ECR_URI} as docker-code-server-python
10+
11+
ARG DEBIAN_FRONTEND="noninteractive"
12+
13+
# Install Python 3.12
14+
RUN echo "**** install Python 3.12 ****" && \
15+
apt-get update && \
16+
apt-get install -y \
17+
software-properties-common \
18+
gpg-agent && \
19+
curl -fsSL https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0xF23C5A6CF475977595C89F51BA6932366A755776 | apt-key add - && \
20+
echo "deb https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu jammy main" > /etc/apt/sources.list.d/deadsnakes.list && \
21+
apt-get update && \
22+
apt-get install -y \
23+
python3.12 \
24+
python3.12-dev \
25+
python3.12-venv && \
26+
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 1 && \
27+
update-alternatives --install /usr/bin/python python /usr/bin/python3.12 1 && \
28+
curl -sS https://bootstrap.pypa.io/get-pip.py | python3.12 && \
29+
pip3 install --upgrade pip setuptools wheel && \
30+
python3 --version && \
31+
pip3 --version && \
32+
echo "**** clean up ****" && \
33+
apt-get clean && \
34+
rm -rf \
35+
/var/lib/apt/lists/* \
36+
/tmp/*
37+
38+
FROM docker-code-server-python
639
ARG BUILD_DATE
740
ARG VERSION
841
ARG CODE_RELEASE
42+
943
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
10-
LABEL maintainer="aptalca"
44+
LABEL maintainer="civisanalytics"
1145

1246
# environment settings
1347
ARG DEBIAN_FRONTEND="noninteractive"
@@ -21,6 +55,7 @@ RUN \
2155
libatomic1 \
2256
nano \
2357
net-tools \
58+
netcat-openbsd \
2459
sudo && \
2560
echo "**** install code-server ****" && \
2661
if [ -z ${CODE_RELEASE+x} ]; then \

Dockerfile.aarch64

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)