Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 1 addition & 7 deletions .github/workflows/test_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
- '.github/workflows/test_docker.yml'
- 'setup.py'
- '**/Dockerfile.*'
- 'utils/docker/**'
branches:
- main
- release-*
Expand All @@ -14,7 +13,6 @@ on:
- '.github/workflows/test_docker.yml'
- 'setup.py'
- '**/Dockerfile.*'
- 'utils/docker/**'
branches:
- main
- release-*
Expand Down Expand Up @@ -69,19 +67,15 @@ jobs:
# build.sh builds the wheels, and with them the driver.
- name: Build Docker image
run: bash utils/docker/build.sh --${{ matrix.arch }} ${{ matrix.docker-image-variant }} playwright-python:localbuild-${{ matrix.docker-image-variant }}
# check_layers.js looks at the paths of the files, for caches and other leftovers.
# This scan looks at the content of the files, in all layers, and finds secrets.
# The scan looks at the content of the files, in all layers of the image.
- name: Scan the image for secrets
uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
with:
image-ref: playwright-python:localbuild-${{ matrix.docker-image-variant }}
scanners: secret
version: v0.76.2
exit-code: '1'
# The secret scan needs no vulnerability database.
cache: 'false'
- name: Test check_layers.js
run: bash utils/docker/test_check_layers.sh
- name: Start the container
id: container
run: |
Expand Down
2 changes: 0 additions & 2 deletions utils/docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ for ((attempt = 1; attempt <= MAX_ATTEMPTS; attempt++)); do
--build-arg UBUNTU_MIRROR_PREFIX="${UBUNTU_MIRROR_PREFIX}" \
"${SECRET_ARGS[@]}" \
-t "$3" -f "Dockerfile.$2" .; then
# A failure of this check is not transient, so it does not retry the build.
node ./check_layers.js "$3"
exit 0
fi
if (( attempt < MAX_ATTEMPTS )); then
Expand Down
150 changes: 0 additions & 150 deletions utils/docker/check_layers.js

This file was deleted.

74 changes: 0 additions & 74 deletions utils/docker/test_check_layers.sh

This file was deleted.

Loading