Skip to content

Commit 3bfd17e

Browse files
thatguyinabeaniethatguyinabeanie
committed
ubuntu fips
1 parent b5d20f6 commit 3bfd17e

File tree

2 files changed

+40
-45
lines changed

2 files changed

+40
-45
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.**

‎Dockerfile‎

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

3-
FROM ghcr.io/linuxserver/baseimage-ubuntu:noble
3+
FROM gabemendoza1/cloudcode-baseimage-ubuntu-fips:jammy-22.04
44

55
# set version label
66
ARG BUILD_DATE
77
ARG VERSION
88
ARG CODE_RELEASE
99
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
10-
LABEL maintainer="aptalca"
10+
LABEL maintainer="civisanalytics"
1111

1212
# environment settings
1313
ARG DEBIAN_FRONTEND="noninteractive"
14-
ENV HOME="/config"
14+
ENV HOME="/workspace"
1515

1616
RUN \
1717
echo "**** install runtime dependencies ****" && \
1818
apt-get update && \
1919
apt-get install -y \
20-
git \
21-
libatomic1 \
22-
nano \
23-
net-tools \
24-
sudo && \
20+
git \
21+
libatomic1 \
22+
nano \
23+
net-tools \
24+
sudo && \
2525
echo "**** install code-server ****" && \
2626
if [ -z ${CODE_RELEASE+x} ]; then \
27-
CODE_RELEASE=$(curl -sX GET https://api.github.com/repos/coder/code-server/releases/latest \
28-
| awk '/tag_name/{print $4;exit}' FS='[""]' | sed 's|^v||'); \
27+
CODE_RELEASE=$(curl -sX GET https://api.github.com/repos/coder/code-server/releases/latest \
28+
| awk '/tag_name/{print $4;exit}' FS='[""]' | sed 's|^v||'); \
2929
fi && \
3030
mkdir -p /app/code-server && \
3131
curl -o \
32-
/tmp/code-server.tar.gz -L \
33-
"https://github.com/coder/code-server/releases/download/v${CODE_RELEASE}/code-server-${CODE_RELEASE}-linux-amd64.tar.gz" && \
32+
/tmp/code-server.tar.gz -L \
33+
"https://github.com/coder/code-server/releases/download/v${CODE_RELEASE}/code-server-${CODE_RELEASE}-linux-amd64.tar.gz" && \
3434
tar xf /tmp/code-server.tar.gz -C \
35-
/app/code-server --strip-components=1 && \
35+
/app/code-server --strip-components=1 && \
3636
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
3737
echo "**** clean up ****" && \
3838
apt-get clean && \
3939
rm -rf \
40-
/config/* \
41-
/tmp/* \
42-
/var/lib/apt/lists/* \
43-
/var/tmp/*
40+
/config/* \
41+
/tmp/* \
42+
/var/lib/apt/lists/* \
43+
/var/tmp/*
4444

4545
# add local files
4646
COPY /root /

0 commit comments

Comments
 (0)