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

Don't use custom docker compose services for CI #1044

Closed
wants to merge 1 commit into from
Closed

Don't use custom docker compose services for CI #1044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 6 additions & 8 deletions .github/workflows/build-and-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,18 @@ jobs:
run: make build
- name: Verify requirements.txt contains correct dependencies
run: |
docker compose run --rm --no-deps ci shell ./bin/run_verify_reqs.sh
docker compose run --rm --user="$(id --user):$(id --group)" --no-deps test shell ./bin/run_verify_reqs.sh
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

set uid/gid at runtime instead of at build time via ANTENNA_UID/ANTENNA_GID because we want to publish the image tested in CI

- name: Run lint check
run: |
make my.env
docker compose run --rm --no-deps ci shell ./bin/run_lint.sh
docker compose run --rm --user="$(id --user):$(id --group)" --no-deps test shell ./bin/run_lint.sh
- name: Run tests
run: |
make my.env
docker compose run --rm ci shell ./bin/run_tests.sh
docker compose run --rm --user="$(id --user):$(id --group)" test shell ./bin/run_tests.sh
- name: Run systemtest
run: |
docker compose run --rm ci-web shell ./bin/run_setup.sh
docker compose up --detach --wait --wait-timeout=10 ci-web
docker compose run --rm ci-web shell bash -c 'cd systemtest && NGINX_TESTS=0 POST_CHECK=1 HOST=http://ci-web:8000 pytest -vv'
make setup
docker compose up --detach --wait --wait-timeout=10 web
docker compose run --rm --user="$(id --user):$(id --group)" web shell bash -c 'cd systemtest && NGINX_TESTS=0 POST_CHECK=1 HOST=http://web:8000 pytest -vv'

- name: Set Docker image tag to "latest" for updates of the main branch
if: github.ref == 'refs/heads/main'
Expand Down
28 changes: 0 additions & 28 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,34 +53,6 @@ services:
volumes:
- .:/app

# Container that we use in CI--it can't volume mount things
ci:
image: local/antenna_deploy_base
env_file:
- docker/config/local_dev.env
- docker/config/test.env
- my.env
links:
- fakesentry
- gcs-emulator
- pubsub
- statsd

# like web but CI can't volume mount things
ci-web:
image: local/antenna_deploy_base
env_file:
# exclude docker/config/test.env because this will be used for systemtest
# which requires store and publish to actually happen
- docker/config/local_dev.env
- my.env
command: web
links:
- fakesentry
- gcs-emulator
- pubsub
- statsd

# Web container is a prod-like fully-functioning Antenna container
web:
extends:
Expand Down