UNCLASSIFIED

Skip to content

GitLab

Commit 3ef6955c authored by thomas.shepherd's avatar thomas.shepherd
Browse files

Merge branch 'development' into 'master' 

Merge Development into Master

See merge request !45
parents 92d41bc6 7b9603af
Pipeline #416461 failed with stages
in 10 minutes and 47 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
Dockerfile
View file @ 3ef6955c
...@@ -13,9 +13,11 @@ COPY --from=base /usr/local/tomcat/ /usr/local/tomcat/ ...@@ -13,9 +13,11 @@ COPY --from=base /usr/local/tomcat/ /usr/local/tomcat/
COPY scripts/catalina.sh /usr/local/tomcat/bin COPY scripts/catalina.sh /usr/local/tomcat/bin
USER 0 USER 0
RUN chmod +x /usr/local/tomcat/bin/catalina.sh RUN chmod +x /usr/local/tomcat/bin/catalina.sh &&\
WORKDIR /usr/local/tomcat/bin chmod o-w /etc/pki/ca-trust/source/anchors/Certificates_PKCS7_v5.7_DoD.pem &&\
chmod o-w /usr/local/tomcat/bin/catalina.sh
WORKDIR /usr/local/tomcat/bin
USER 1001 USER 1001
EXPOSE 8080 EXPOSE 8080
......
hardening_manifest.yaml
View file @ 3ef6955c
...@@ -37,7 +37,7 @@ labels: ...@@ -37,7 +37,7 @@ labels:
# List of resources to make available to the offline build context # List of resources to make available to the offline build context
resources: resources:
- url: "docker://docker.io/tomcat@sha256:6e40250d8fac4eca05c2067cb81f79427e4ddbaf4e78d5ecd21c35e8c5f2bfcf" - url: "docker://docker.io/tomcat@sha256:edd50c648b4c10ce85cd1c2f0dffc235794c4f806464612dd7c4af7bd9c3b957"
tag: "tomcat:9.0.50-jdk11-openjdk" tag: "tomcat:9.0.50-jdk11-openjdk"
# List of project maintainers # List of project maintainers
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

UNCLASSIFIED