Skip to content

Commit 2add745

Browse files
committed
chore: move Dockerfile back to root cos azure pipelines need it there
1 parent 3e70297 commit 2add745

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/ci-build-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ jobs:
152152
uses: docker/build-push-action@v6
153153
with:
154154
context: .
155-
file: docker/Dockerfile
155+
file: Dockerfile
156156
push: true
157157
tags: |
158158
ghcr.io/${{ github.repository }}:${{ needs.Artefact-Version.outputs.artefact_version }}

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696

9797
- name: DAST - Build and run containerised app
9898
run: |
99-
docker compose -f docker/docker-compose.yml up -d
99+
docker compose -f docker-compose.yml up -d
100100
101101
echo "Waiting for health endpoint..."
102102
for i in {1..30}; do
File renamed without changes.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ services:
1010

1111
app:
1212
build:
13-
context: ..
14-
dockerfile: docker/Dockerfile
13+
context: .
14+
dockerfile: Dockerfile
1515
depends_on:
1616
- db
1717
environment:

gradle/tasks/api-test.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ dependencies {
6363
}
6464

6565
dockerCompose {
66-
useComposeFiles = ['docker/docker-compose.yml']
66+
useComposeFiles = ['docker-compose.yml']
6767
startedServices = ['app', 'db']
6868

6969
buildBeforeUp = true

0 commit comments

Comments
 (0)