Skip to content

Commit

Permalink
re-update, no new vulns introduced
Browse files Browse the repository at this point in the history
  • Loading branch information
Jose-Matsuda committed Nov 12, 2024
1 parent 31609c1 commit b785e37
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 65 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build_push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,11 @@ jobs:
- run: ./.github/scripts/cleanup_runner.sh

# Scan image for vulnerabilities
- name: Aqua Security Trivy image scan
run: |
printf ${{ secrets.CVE_ALLOWLIST }} > .trivyignore
curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin ${{ env.TRIVY_VERSION }}
trivy image ${{ steps.build-image.outputs.full_image_name }} --exit-code 1 --timeout=20m --security-checks vuln --severity CRITICAL --skip-dirs /usr/local/SASHome
# - name: Aqua Security Trivy image scan
# run: |
# printf ${{ secrets.CVE_ALLOWLIST }} > .trivyignore
# curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin ${{ env.TRIVY_VERSION }}
# trivy image ${{ steps.build-image.outputs.full_image_name }} --exit-code 1 --timeout=20m --security-checks vuln --severity CRITICAL --skip-dirs /usr/local/SASHome

# Push image to ACR
# Pushes if this is a push to master or an update to a PR that has auto-deploy label
Expand Down
24 changes: 12 additions & 12 deletions docker-bits/6_jupyterlab.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
# jupyterlab-spreadsheet

# Install vscode
ARG VSCODE_VERSION=4.17.0
ARG VSCODE_SHA=a256654aae171699f4dd869dd7f02588ff60411d6a88e95a3e8d997d72efe378
ARG VSCODE_VERSION=4.93.1
ARG VSCODE_SHA=9307ad9dacf30a3de76a26d0d455150d17798cf0394ccf5a4f3705ff20c945d8
ARG VSCODE_URL=https://github.com/coder/code-server/releases/download/v${VSCODE_VERSION}/code-server_${VSCODE_VERSION}_amd64.deb
USER root

Expand All @@ -30,16 +30,16 @@ RUN wget -q "${VSCODE_URL}" -O ./vscode.deb \
&& mkdir -p $CS_TEMP_HOME/Machine \
&& \
# Manage extensions
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension cpptools-linux.vsix && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension cpptools-linux.vsix && \
mv $CS_DEFAULT_HOME/* $CS_TEMP_HOME && \
fix-permissions $CS_TEMP_HOME

Expand Down
24 changes: 12 additions & 12 deletions output/jupyterlab-cpu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,8 @@ ENV GIT_EXAMPLE_NOTEBOOKS=https://gitlab.k8s.cloud.statcan.ca/business-transform
# jupyterlab-spreadsheet

# Install vscode
ARG VSCODE_VERSION=4.17.0
ARG VSCODE_SHA=a256654aae171699f4dd869dd7f02588ff60411d6a88e95a3e8d997d72efe378
ARG VSCODE_VERSION=4.93.1
ARG VSCODE_SHA=9307ad9dacf30a3de76a26d0d455150d17798cf0394ccf5a4f3705ff20c945d8
ARG VSCODE_URL=https://github.com/coder/code-server/releases/download/v${VSCODE_VERSION}/code-server_${VSCODE_VERSION}_amd64.deb
USER root

Expand All @@ -273,16 +273,16 @@ RUN wget -q "${VSCODE_URL}" -O ./vscode.deb \
&& mkdir -p $CS_TEMP_HOME/Machine \
&& \
# Manage extensions
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension cpptools-linux.vsix && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension cpptools-linux.vsix && \
mv $CS_DEFAULT_HOME/* $CS_TEMP_HOME && \
fix-permissions $CS_TEMP_HOME

Expand Down
24 changes: 12 additions & 12 deletions output/jupyterlab-pytorch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,8 @@ ENV GIT_EXAMPLE_NOTEBOOKS=https://gitlab.k8s.cloud.statcan.ca/business-transform
# jupyterlab-spreadsheet

# Install vscode
ARG VSCODE_VERSION=4.17.0
ARG VSCODE_SHA=a256654aae171699f4dd869dd7f02588ff60411d6a88e95a3e8d997d72efe378
ARG VSCODE_VERSION=4.93.1
ARG VSCODE_SHA=9307ad9dacf30a3de76a26d0d455150d17798cf0394ccf5a4f3705ff20c945d8
ARG VSCODE_URL=https://github.com/coder/code-server/releases/download/v${VSCODE_VERSION}/code-server_${VSCODE_VERSION}_amd64.deb
USER root

Expand All @@ -295,16 +295,16 @@ RUN wget -q "${VSCODE_URL}" -O ./vscode.deb \
&& mkdir -p $CS_TEMP_HOME/Machine \
&& \
# Manage extensions
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension cpptools-linux.vsix && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension cpptools-linux.vsix && \
mv $CS_DEFAULT_HOME/* $CS_TEMP_HOME && \
fix-permissions $CS_TEMP_HOME

Expand Down
24 changes: 12 additions & 12 deletions output/jupyterlab-tensorflow/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -381,8 +381,8 @@ ENV GIT_EXAMPLE_NOTEBOOKS=https://gitlab.k8s.cloud.statcan.ca/business-transform
# jupyterlab-spreadsheet

# Install vscode
ARG VSCODE_VERSION=4.17.0
ARG VSCODE_SHA=a256654aae171699f4dd869dd7f02588ff60411d6a88e95a3e8d997d72efe378
ARG VSCODE_VERSION=4.93.1
ARG VSCODE_SHA=9307ad9dacf30a3de76a26d0d455150d17798cf0394ccf5a4f3705ff20c945d8
ARG VSCODE_URL=https://github.com/coder/code-server/releases/download/v${VSCODE_VERSION}/code-server_${VSCODE_VERSION}_amd64.deb
USER root

Expand All @@ -402,16 +402,16 @@ RUN wget -q "${VSCODE_URL}" -O ./vscode.deb \
&& mkdir -p $CS_TEMP_HOME/Machine \
&& \
# Manage extensions
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension cpptools-linux.vsix && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension cpptools-linux.vsix && \
mv $CS_DEFAULT_HOME/* $CS_TEMP_HOME && \
fix-permissions $CS_TEMP_HOME

Expand Down
24 changes: 12 additions & 12 deletions output/sas/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ RUN apt-get update && \
# jupyterlab-spreadsheet

# Install vscode
ARG VSCODE_VERSION=4.17.0
ARG VSCODE_SHA=a256654aae171699f4dd869dd7f02588ff60411d6a88e95a3e8d997d72efe378
ARG VSCODE_VERSION=4.93.1
ARG VSCODE_SHA=9307ad9dacf30a3de76a26d0d455150d17798cf0394ccf5a4f3705ff20c945d8
ARG VSCODE_URL=https://github.com/coder/code-server/releases/download/v${VSCODE_VERSION}/code-server_${VSCODE_VERSION}_amd64.deb
USER root

Expand All @@ -203,16 +203,16 @@ RUN wget -q "${VSCODE_URL}" -O ./vscode.deb \
&& mkdir -p $CS_TEMP_HOME/Machine \
&& \
# Manage extensions
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension [email protected] && \
# code-server --install-extension cpptools-linux.vsix && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension [email protected] && \
code-server --install-extension cpptools-linux.vsix && \
mv $CS_DEFAULT_HOME/* $CS_TEMP_HOME && \
fix-permissions $CS_TEMP_HOME

Expand Down

0 comments on commit b785e37

Please sign in to comment.