diff --git a/.github/workflows/test_database.yml b/.github/workflows/test_database.yml index b6404062d..04ec08ffa 100644 --- a/.github/workflows/test_database.yml +++ b/.github/workflows/test_database.yml @@ -30,8 +30,8 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - - name: Database | Build 'test_up' image - run: docker build --target test_up -t "gradido/database:test_up" database/ + - name: Database | Build 'up' image + run: docker build --target up -t "gradido/database:up" -f database/Dockerfile . database_migration_test: if: needs.files-changed.outputs.database == 'true' || needs.files-changed.outputs.docker-compose == 'true' || needs.files-changed.outputs.mariadb == 'true' diff --git a/docker-compose.reset.yml b/docker-compose.reset.yml index 0d5a442de..46d66ff75 100644 --- a/docker-compose.reset.yml +++ b/docker-compose.reset.yml @@ -14,7 +14,8 @@ services: # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there image: gradido/database:local-reset build: - context: ./database + context: . + dockerfile: ./database/Dockerfile target: reset depends_on: - mariadb diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 1824772ce..3f674370a 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -70,7 +70,8 @@ services: database: image: gradido/database:up build: - context: ./database + context: . + dockerfile: ./database/Dockerfile target: up environment: - NODE_ENV=test diff --git a/docker-compose.yml b/docker-compose.yml index 0c6e7ad1e..d1e85aaa3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -220,7 +220,8 @@ services: # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there image: gradido/database:local-up build: - context: ./database + context: . + dockerfile: ./database/Dockerfile target: up depends_on: - mariadb