From 0f1163e876a2c602bce31adec679b401fe43d5b6 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Thu, 11 Aug 2022 14:00:50 +0100 Subject: [PATCH] Merge pull request #9221 from overleaf/jpa-pin-s3mock [misc] pin s3mock image to older version GitOrigin-RevId: b5548c080fc2142ccf1dd5601689e397f935a0c9 --- services/filestore/docker-compose.ci.yml | 2 +- services/filestore/docker-compose.yml | 2 +- services/filestore/test/acceptance/deps/Dockerfile.s3mock | 2 +- services/track-changes/docker-compose.ci.yml | 2 +- services/track-changes/docker-compose.yml | 2 +- services/track-changes/test/acceptance/deps/Dockerfile.s3mock | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/filestore/docker-compose.ci.yml b/services/filestore/docker-compose.ci.yml index a8cbd5faf8..63f1286d5a 100644 --- a/services/filestore/docker-compose.ci.yml +++ b/services/filestore/docker-compose.ci.yml @@ -60,7 +60,7 @@ services: command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs . user: root s3: - image: adobe/s3mock + image: adobe/s3mock:2.4.14 environment: - initialBuckets=fake_user_files,fake_template_files,fake_public_files,bucket healthcheck: diff --git a/services/filestore/docker-compose.yml b/services/filestore/docker-compose.yml index 6f4cdb4168..71ef317b98 100644 --- a/services/filestore/docker-compose.yml +++ b/services/filestore/docker-compose.yml @@ -68,7 +68,7 @@ services: command: npm run --silent test:acceptance s3: - image: adobe/s3mock + image: adobe/s3mock:2.4.14 environment: - initialBuckets=fake_user_files,fake_template_files,fake_public_files,bucket healthcheck: diff --git a/services/filestore/test/acceptance/deps/Dockerfile.s3mock b/services/filestore/test/acceptance/deps/Dockerfile.s3mock index 15eda4dd4b..6509092bd8 100644 --- a/services/filestore/test/acceptance/deps/Dockerfile.s3mock +++ b/services/filestore/test/acceptance/deps/Dockerfile.s3mock @@ -1,4 +1,4 @@ -FROM adobe/s3mock +FROM adobe/s3mock:2.4.14 RUN apk add --update --no-cache curl COPY healthcheck.sh /healthcheck.sh HEALTHCHECK --interval=1s --timeout=1s --retries=30 CMD /healthcheck.sh http://localhost:9090 diff --git a/services/track-changes/docker-compose.ci.yml b/services/track-changes/docker-compose.ci.yml index 5eca22fb3b..28f286d370 100644 --- a/services/track-changes/docker-compose.ci.yml +++ b/services/track-changes/docker-compose.ci.yml @@ -64,7 +64,7 @@ services: interval: 1s retries: 20 s3: - image: adobe/s3mock + image: adobe/s3mock:2.4.14 environment: - initialBuckets=fake_user_files,fake_template_files,fake_public_files,bucket healthcheck: diff --git a/services/track-changes/docker-compose.yml b/services/track-changes/docker-compose.yml index 2028d9c0b1..78b6b6b28e 100644 --- a/services/track-changes/docker-compose.yml +++ b/services/track-changes/docker-compose.yml @@ -67,7 +67,7 @@ services: retries: 20 s3: - image: adobe/s3mock + image: adobe/s3mock:2.4.14 environment: - initialBuckets=fake_user_files,fake_template_files,fake_public_files,bucket healthcheck: diff --git a/services/track-changes/test/acceptance/deps/Dockerfile.s3mock b/services/track-changes/test/acceptance/deps/Dockerfile.s3mock index 15eda4dd4b..6509092bd8 100644 --- a/services/track-changes/test/acceptance/deps/Dockerfile.s3mock +++ b/services/track-changes/test/acceptance/deps/Dockerfile.s3mock @@ -1,4 +1,4 @@ -FROM adobe/s3mock +FROM adobe/s3mock:2.4.14 RUN apk add --update --no-cache curl COPY healthcheck.sh /healthcheck.sh HEALTHCHECK --interval=1s --timeout=1s --retries=30 CMD /healthcheck.sh http://localhost:9090