Skip to content

Commit b6faa7f

Browse files
committed
Use Docker images from ACR in GHA workflows
It was decided to drop the empty Docker image when moving to ACR as that image was not really used anywhere
1 parent 348cac9 commit b6faa7f

File tree

1 file changed

+6
-34
lines changed

1 file changed

+6
-34
lines changed

.github/workflows/cd.yml

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -76,29 +76,16 @@ jobs:
7676

7777
test-docker-images:
7878
name: verify that the docker images work
79-
needs: publish_docker_image_to_docker_hub
79+
needs: publish_docker_image_to_acr
8080
runs-on: ubuntu-24.04
8181
env:
8282
SA_PASSWORD: "P@ssw0rd"
8383

8484
strategy:
8585
matrix:
8686
include:
87-
# empty image, no test dumps are imported
88-
- dockerImage: empty
89-
volumeMapping: ""
90-
expectedOutput: |
91-
name
92-
--------------------------------------------------------------------------------------------------------------------------------
93-
master
94-
model
95-
msdb
96-
tempdb
97-
98-
(4 rows affected)
99-
# schema-only image, no test dumps are imported
100-
- dockerImage: schema-only
101-
volumeMapping: ""
87+
# no test dumps are imported
88+
- volumeMapping: ""
10289
expectedOutput: |
10390
name
10491
--------------------------------------------------------------------------------------------------------------------------------
@@ -109,23 +96,8 @@ jobs:
10996
tempdb
11097
11198
(5 rows affected)
112-
# empty image, but test dumps are imported
113-
- dockerImage: empty
114-
volumeMapping: ' -v "$(pwd)/docker-image-test-data:/data:ro"'
115-
expectedOutput: |
116-
name
117-
--------------------------------------------------------------------------------------------------------------------------------
118-
bardb
119-
foodb
120-
master
121-
model
122-
msdb
123-
tempdb
124-
125-
(6 rows affected)
126-
# schema-only image, also test dumps are imported
127-
- dockerImage: schema-only
128-
volumeMapping: ' -v "$(pwd)/docker-image-test-data:/data:ro"'
99+
# test dumps are imported
100+
- volumeMapping: ' -v "$(pwd)/docker-image-test-data:/data:ro"'
129101
expectedOutput: |
130102
name
131103
--------------------------------------------------------------------------------------------------------------------------------
@@ -168,7 +140,7 @@ jobs:
168140
--network hsl \
169141
-e SA_PASSWORD="$SA_PASSWORD" \
170142
${{ matrix.volumeMapping }} \
171-
$IMAGE_NAME:${{ matrix.dockerImage }}-$COMMIT_ID
143+
"${{ needs.publish_docker_image_to_acr.outputs.docker_image }}"
172144
173145
- name:
174146
Verify that dockerized MSSQL database is up and can be connected to

0 commit comments

Comments
 (0)