Skip to content

Commit

Permalink
Clean up unused Docker images
Browse files Browse the repository at this point in the history
b/359451816
  • Loading branch information
oxve committed Aug 13, 2024
1 parent 9545024 commit a4d1369
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 471 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pytest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
python-version: ${{ matrix.python-version }}
cache: 'pip'
- name: Install Pip Packages
run: pip install --require-hashes --no-deps -r ${{ github.workspace }}/docker/pytest/requirements.txt
run: pip install --require-hashes --no-deps -r ${{ github.workspace }}/pytest/requirements.txt
- name: Run Tests
run: coverage run -m pytest
- name: Coverage Report
Expand Down
36 changes: 0 additions & 36 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,27 +64,6 @@ x-shared-unittest-definitions: &shared-unittest-definitions

services:
#### Tools
pre-commit:
build:
context: ./docker/precommit_hooks
dockerfile: Dockerfile
image: pre-commit
volumes:
- ${COBALT_SRC:-.}:/code/
environment:
FROM_REF: ${FROM_REF:-HEAD^1}
TO_REF: ${TO_REF:-HEAD}

pytest:
build:
context: ./docker/pytest
dockerfile: Dockerfile
image: cobalt-build-pytest
volumes:
- ${COBALT_SRC:-.}:/code/
depends_on:
- base

crashpad-symbolize:
build:
args:
Expand Down Expand Up @@ -461,18 +440,3 @@ services:
context: ./docker/linux/
dockerfile: xvfb/Dockerfile
depends_on: [ linux-x64x11-unittest ]

linux-x64x11-integration-test:
<<: *build-common-definitions
image: cobalt-integration-test
build:
context: ./docker/linux/
dockerfile: integration_test/Dockerfile
depends_on: [ xvfb ]
working_dir: /code
environment:
- DISPLAY=xvfb:99
- IPV6_AVAILABLE=0
- PYTHONPATH=/code
- PLATFORM=${PLATFORM:-linux-x64x11}
- CONFIG=${CONFIG:-devel}
17 changes: 0 additions & 17 deletions docker/linux/integration_test/Dockerfile

This file was deleted.

52 changes: 0 additions & 52 deletions docker/precommit_hooks/Dockerfile

This file was deleted.

10 changes: 0 additions & 10 deletions docker/precommit_hooks/requirements.in

This file was deleted.

Loading

0 comments on commit a4d1369

Please sign in to comment.