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

Jump to bottom

Remove Docker Compose: "version" #2718

Merged
merged 8 commits into from
Mar 27, 2024
Merged

Remove Docker Compose: "version" #2718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b25e002
docker-compose version is obsolete
originalsouth Mar 26, 2024
79b9fed
Merge remote-tracking branch 'origin/main' into fix/docker-compose_ve…
originalsouth Mar 26, 2024
0c954df
Remove *base.yml and adjust dependencies
originalsouth Mar 26, 2024
921eb24
Set proper directory after removing *base.yml
originalsouth Mar 26, 2024
4a487c8
docker-compose version is obsolete (for all) and improve test build r…
originalsouth Mar 26, 2024
b27238f
Format and remove kill in the Rocky Makefile docker compose entries
originalsouth Mar 26, 2024
4dfde15
Merge remote-tracking branch 'origin/main' into fix/docker-compose_ve…
originalsouth Mar 26, 2024
086e4ec
Merge remote-tracking branch 'origin/main' into fix/docker-compose_ve…
originalsouth Mar 27, 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: 1 addition & 1 deletion .github/workflows/build-rdo-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ jobs:
run: python3.10 -m venv /var/www/html/.venv

- name: Create scheduler release archive
run: tar -cvzf ${{ env.PKGDIR }}/scheduler_${{ env.RELEASE_VERSION }}.tar.gz --exclude=./.git* --exclude=Makefile --exclude=Dockerfile --exclude=base.yml --exclude=requirements* --exclude=tests .
run: tar -cvzf ${{ env.PKGDIR }}/scheduler_${{ env.RELEASE_VERSION }}.tar.gz --exclude=./.git* --exclude=Makefile --exclude=Dockerfile --exclude=requirements* --exclude=tests .
working-directory: ./mula

- name: Create virtual env
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mula_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
uses: actions/checkout@v4

- name: Build the images
run: DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker compose -f base.yml -f .ci/docker-compose.yml build --build-arg PYTHON_VERSION=${{ matrix.version }}
run: DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker compose --project-directory . -f .ci/docker-compose.yml build --build-arg PYTHON_VERSION=${{ matrix.version }}
working-directory: ./mula

- name: Run unit tests
Expand Down
2 changes: 0 additions & 2 deletions boefjes/.ci/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.9"

services:
katalogus_integration:
build:
Expand Down
1 change: 0 additions & 1 deletion boefjes/.dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,3 @@ sql_migrations
.dockerignore
export_migrations
docs
base.yml
2 changes: 1 addition & 1 deletion boefjes/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ check:
## Tests
##|------------------------------------------------------------------------|

ci-docker-compose := docker compose -f base.yml -f .ci/docker-compose.yml
ci-docker-compose := docker compose --project-directory . -f .ci/docker-compose.yml


test: itest ## Run all tests.
Expand Down
1 change: 0 additions & 1 deletion boefjes/base.yml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions bytes/.ci/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.9"

services:
bytes_unit:
build:
Expand Down
2 changes: 1 addition & 1 deletion bytes/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ migrate: ## Run alembic migrations
##|------------------------------------------------------------------------|

test: utest itest ## Run all tests.
ci-docker-compose := docker compose -f base.yml -f .ci/docker-compose.yml
Copy link
Contributor

Choose a reason for hiding this comment

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

By changing the paths in the compose file you can sometimes resolve this already even without the --project-directory 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I am not sure what you mean @Donnype, can you be more specific?

  • You want to change the path inside the compose file (tried that with context wasn't trivial to get to work...)?
  • You want to change the path of the compose file?
--project-directory string   Specify an alternate working directory
                             (default: the path of the, first specified, Compose file)

ci-docker-compose := docker compose --project-directory . -f .ci/docker-compose.yml


utest: ## Run the unit tests.
Expand Down
1 change: 0 additions & 1 deletion bytes/base.yml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions docker-compose.release-example.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# You should use this file in the following manner:
# `docker compose --env-file .env-prod -f docker-compose.release-example.yml`

version: "3.9"

services:
rabbitmq:
restart: on-failure
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.9"

services:
rabbitmq:
restart: unless-stopped
Expand Down
2 changes: 0 additions & 2 deletions keiko/.ci/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.9"

services:
ci_keiko:
healthcheck:
Expand Down
4 changes: 2 additions & 2 deletions keiko/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ test:
pytest

itest:
docker compose -f docker-compose-base.yml -f .ci/docker-compose.yml up -d --build && sleep 1
docker compose --project-directory . -f .ci/docker-compose.yml up -d --build && sleep 1
robot -d reports tests/robot
docker compose -f docker-compose-base.yml -f .ci/docker-compose.yml down --remove-orphans
docker compose --project-directory . -f .ci/docker-compose.yml down --remove-orphans

debian12:
mkdir -p build
Expand Down
1 change: 0 additions & 1 deletion keiko/docker-compose-base.yml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions mula/.ci/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.9"

services:
ci_scheduler_unit:
build:
Expand Down
1 change: 0 additions & 1 deletion mula/.dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,3 @@ pyproject.toml
sql_migrations
.dockerignore
docs
base.yml
2 changes: 1 addition & 1 deletion mula/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export file
export DOCKER_BUILDKIT=1
export COMPOSE_DOCKER_CLI_BUILD=1

ci-docker-compose := docker compose -f base.yml -f .ci/docker-compose.yml
ci-docker-compose := docker compose --project-directory . -f .ci/docker-compose.yml

##
##+------------------------------------------------------------------------+
Expand Down
1 change: 0 additions & 1 deletion mula/base.yml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions octopoes/.ci/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.9"

services:

rabbitmq:
Expand Down
12 changes: 5 additions & 7 deletions octopoes/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,12 @@ test:
pytest

rtest:
docker compose -f docker-compose-base.yml -f .ci/docker-compose.yml kill
docker compose -f docker-compose-base.yml -f .ci/docker-compose.yml down --remove-orphans
docker compose -f docker-compose-base.yml -f .ci/docker-compose.yml up -d --build ci_octopoes ci_octopoes_api_worker
docker compose --project-directory . -f .ci/docker-compose.yml down --remove-orphans
docker compose --project-directory . -f .ci/docker-compose.yml up -d --build ci_octopoes ci_octopoes_api_worker
sleep 2
robot -d reports tests/robot

itest:
docker compose -f docker-compose-base.yml -f .ci/docker-compose.yml kill
docker compose -f docker-compose-base.yml -f .ci/docker-compose.yml build $(build_args)
docker compose -f docker-compose-base.yml -f .ci/docker-compose.yml down
docker compose -f docker-compose-base.yml -f .ci/docker-compose.yml run --rm octopoes_integration
docker compose --project-directory . -f .ci/docker-compose.yml down --remove-orphans
docker compose --project-directory . -f .ci/docker-compose.yml build $(build_args)
docker compose --project-directory . -f .ci/docker-compose.yml run --rm octopoes_integration
1 change: 0 additions & 1 deletion octopoes/base.yml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion octopoes/docker-compose-base.yml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions rocky/.ci/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.9"

services:
rocky_tests:
build:
Expand Down
1 change: 0 additions & 1 deletion rocky/.dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,5 @@ pyproject.toml
sql_migrations
.dockerignore
docs
base.yml
assets/dist
static
11 changes: 5 additions & 6 deletions rocky/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,17 @@ test:
python3 manage.py test

testclean:
docker compose -f .ci/docker-compose.yml kill
docker compose -f .ci/docker-compose.yml down --remove-orphans
docker compose -f .ci/docker-compose.yml build
docker compose --project-directory . -f .ci/docker-compose.yml down --remove-orphans
docker compose --project-directory . -f .ci/docker-compose.yml build

utest: testclean ## Run the unit tests.
docker compose -f .ci/docker-compose.yml run --rm rocky_tests
docker compose --project-directory . -f .ci/docker-compose.yml run --rm rocky_tests

itest: testclean ## Run the integration tests.
docker compose -f .ci/docker-compose.yml run --rm rocky_integration
docker compose --project-directory . -f .ci/docker-compose.yml run --rm rocky_integration

bench: testclean ## Run the report benchmark.
docker compose -f .ci/docker-compose.yml run --rm rocky_integration \
docker compose --project-directory . -f .ci/docker-compose.yml run --rm rocky_integration \
python -m cProfile -o .ci/bench_$$(date +%Y_%m_%d-%H:%M:%S).pstat -m pytest -m slow --no-cov tests/integration

export_migrations:
Expand Down