Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Freesurfer rev6 #14

Merged
merged 5 commits into from
Dec 13, 2024
Merged

Freesurfer rev6 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
049573f
revert back to root user for rootless podman on NFS
rkm Nov 19, 2024
6009e19
restore lib/qt for graphical apps
rkm Nov 19, 2024
9e87466
bump image revision
rkm Nov 19, 2024
e8500b7
add ignore for trivy root user check
rkm Nov 19, 2024
f947570
allow root user via hadolint
rkm Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions bin/trivy-image-scan.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ docker run \
"${TRIVY_IMG}" \
image \
--config "/repo/configs/${config}" \
--ignorefile /repo/configs/.trivyignore \
--format table \
--output /reports/trivy-cve.txt \
"${image}"
Expand All @@ -51,6 +52,7 @@ docker run \
"${TRIVY_IMG}" \
image \
--config "/repo/configs/${config}" \
--ignorefile /repo/configs/.trivyignore \
--format cyclonedx \
--output /reports/trivy-sbom.json \
"${image}"
1 change: 1 addition & 0 deletions bin/trivy-misconfig-dockerfile.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ docker run \
ghcr.io/aquasecurity/trivy:latest \
config \
--config "/repo/configs/${config}" \
--ignorefile /repo/configs/.trivyignore \
"/repo/${dockerfile}"

1 change: 1 addition & 0 deletions configs/.trivyignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
AVD-DS-0002 # Image user should not be root
2 changes: 2 additions & 0 deletions configs/hadolint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
ignored:
# Ignore "Pin versions in apt get install"
- DL3008
# Ignore "Last USER should not be root"
- DL3002
6 changes: 2 additions & 4 deletions software/Freesurfer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM docker.io/ubuntu@sha256:e9569c25505f33ff72e88b2990887c9dcf230f23259da296eb814fc2b41af999

ARG FREESURFER_VERSION="7.4.1"
ARG FREESURFER_IMAGE_REVISION="5"
ARG FREESURFER_IMAGE_REVISION="6"
ARG FREESURFER_DEB_MD5="bfe85dd76677cfb7ca2b247b9ac6148e"

ENV \
Expand Down Expand Up @@ -83,14 +83,12 @@ RUN : \
&& rm -rf \
average/mult-comp-cor \
lib/cuda \
lib/qt \
subjects \
trctrain \
&& :

RUN : \
&& mkdir /safe_data /safe_outputs /scratch \
&& useradd ces-user \
&& :

USER ces-user
USER root
Loading