From 750a641c759398bd3a2f7b5bf461eb2541f016e8 Mon Sep 17 00:00:00 2001 From: Donkie Date: Thu, 18 May 2023 15:58:17 +0200 Subject: [PATCH] Attempt to fix build issue 3 --- .github/workflows/integration-test.yml | 19 ++++++++++++++++++- tests_integration/docker-compose-postgres.yml | 4 ++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 8c0fd54..eeb1a55 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -7,6 +7,9 @@ on: branches: - master +env: + TEST_TAG: donkie/spoolman:test + jobs: tests: strategy: @@ -16,8 +19,22 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Build Spoolman + uses: docker/build-push-action@v4 + with: + context: . + load: true + tags: donkie/spoolman:test + - name: Build Spoolman Tester + uses: docker/build-push-action@v4 + with: + context: ./tests_integration + load: true + tags: donkie/spoolman-tester:latest - uses: isbang/compose-action@v1.4.1 with: compose-file: "./tests_integration/docker-compose-${{ matrix.dbtype }}.yml" - up-flags: "--build --abort-on-container-exit" + up-flags: "--abort-on-container-exit" down-flags: "--volumes" diff --git a/tests_integration/docker-compose-postgres.yml b/tests_integration/docker-compose-postgres.yml index 03823c3..41ff68a 100644 --- a/tests_integration/docker-compose-postgres.yml +++ b/tests_integration/docker-compose-postgres.yml @@ -5,7 +5,7 @@ services: environment: - POSTGRES_PASSWORD=abc spoolman: - build: ./../ + image: donkie/spoolman:test environment: - SPOOLMAN_DB_TYPE=postgres - SPOOLMAN_DB_HOST=db @@ -17,7 +17,7 @@ services: depends_on: - db tester: - build: . + image: donkie/spoolman-tester:latest volumes: - ./tests:/tester/tests depends_on: