Skip to content

Commit 12faf17

Browse files
authored
Harden Playwright CI base image loading
1 parent 2a8a8e3 commit 12faf17

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

.github/workflows/tests.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- uses: actions/checkout@v6
3535

3636
- name: Resolve base Docker images
37-
run: echo "BASE_IMAGES=$(paste -sd ' ' e2e/server/base-images.txt)" >> "$GITHUB_ENV"
37+
run: echo "BASE_IMAGES_FILE=${{ github.workspace }}/e2e/server/base-images.txt" >> "$GITHUB_ENV"
3838

3939
- name: Cache base Docker images
4040
uses: actions/cache@v5
@@ -46,6 +46,8 @@ jobs:
4646
4747
- name: Load or pull base Docker images
4848
run: |
49+
mapfile -t base_images < "$BASE_IMAGES_FILE"
50+
4951
if [ -f /tmp/base-docker-images.tar ]; then
5052
echo "Loading base images from cache"
5153
docker load -i /tmp/base-docker-images.tar
@@ -54,8 +56,8 @@ jobs:
5456
while IFS= read -r image; do
5557
[ -n "$image" ] || continue
5658
docker pull "$image"
57-
done < e2e/server/base-images.txt
58-
docker save $BASE_IMAGES -o /tmp/base-docker-images.tar
59+
done < "$BASE_IMAGES_FILE"
60+
docker save "${base_images[@]}" -o /tmp/base-docker-images.tar
5961
fi
6062
6163
- name: Build superdesk server
@@ -64,8 +66,10 @@ jobs:
6466

6567
- name: Archive e2e server images
6668
run: |
69+
mapfile -t base_images < "$BASE_IMAGES_FILE"
70+
6771
docker save \
68-
$BASE_IMAGES \
72+
"${base_images[@]}" \
6973
superdesk-client-core-e2e-server:ci | gzip > /tmp/e2e-server-images.tar.gz
7074
7175
- name: Upload e2e server images

0 commit comments

Comments
 (0)