Merge pull request #10859 from nanaya/docker-update

Update docker images
ppy · Jan 15, 2024 · cdac288 · cdac288
2 parents c13e22c + 493b0ac
commit cdac288
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,9 @@ _ide_helper.php
 /vendor
 composer.phar
 
+# docker related local files
+/compose.override.yml
+
 # OS-specific crud
 .DS_Store
 Thumbs.db

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -85,7 +85,7 @@ services:
       <<: *x-env
 
   db:
-    image: mysql/mysql-server:8.0
+    image: mysql:8.0
     volumes:
       - database:/var/lib/mysql
       - ./docker/development/db_user.sql:/docker-entrypoint-initdb.d/db_user.sql
@@ -116,7 +116,7 @@ services:
 
   elasticsearch:
     # Version must be kept up to date with library defined in: composer.json
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.6
+    image: elasticsearch:7.17.16
     ports:
       - "${ES_EXTERNAL_PORT:-9200}:9200"
     volumes: