Skip to content

Commit

Permalink
Work around dependabot not updating docker-compose (#6810)
Browse files Browse the repository at this point in the history
  • Loading branch information
relud authored Nov 20, 2024
1 parent cef5919 commit 52f5d8b
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 5 deletions.
17 changes: 12 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,9 @@ services:

# https://www.elastic.co/guide/en/elasticsearch/reference/8.14/docker.html
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.14.3
build:
context: docker/images/elasticsearch
image: local/socorro_elasticsearch
mem_limit: 1g
command:
- bin/elasticsearch
Expand All @@ -219,7 +221,9 @@ services:

# https://hub.docker.com/_/postgres/
postgresql:
image: postgres:16.4
build:
context: docker/images/postgres
image: local/socorro_postgres
ports:
- "8574:5432"
environment:
Expand All @@ -231,8 +235,9 @@ services:
# https://cloud.google.com/sdk/docs/downloads-docker
# official pubsub emulator
pubsub:
# also available as google/cloud-sdk:<version>-emulators
image: gcr.io/google.com/cloudsdktool/google-cloud-cli:463.0.0-emulators
build:
context: docker/images/pubsub-emulator
image: local/socorro_pubsub_emulator
command:
- gcloud
- beta
Expand All @@ -246,7 +251,9 @@ services:

# https://hub.docker.com/_/memcached/
memcached:
image: memcached:1.5.1
build:
context: docker/images/memcached
image: local/socorro_memcached
ports:
- "11211:11211"

Expand Down
1 change: 1 addition & 0 deletions docker/images/elasticsearch/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FROM docker.elastic.co/elasticsearch/elasticsearch:8.14.3@sha256:96ae58e574cb40b2caf8bdebc6dda7b789e1fae7d56346cc83c288374e18b1c2
1 change: 1 addition & 0 deletions docker/images/memcached/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FROM memcached:1.5.1@sha256:fc1826e2cb45307c5ac777b18107f14b53f91572b44bc1f856d3ba2e5d115059
1 change: 1 addition & 0 deletions docker/images/postgres/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FROM postgres:16.4@sha256:e62fbf9d3e2b49816a32c400ed2dba83e3b361e6833e624024309c35d334b412
3 changes: 3 additions & 0 deletions docker/images/pubsub-emulator/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Define this image outside of docker-compose.yml so that it gets dependabot updates
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:501.0.0-emulators@sha256:4dfc65b1795329f1a94316d3a0eb70a4a37d4813cac0efe05c43b08b2e66d44d
# also available as google/cloud-sdk:<version>-emulators

0 comments on commit 52f5d8b

Please sign in to comment.