Revert "🔨 switch mysql docker images to debian to work around microdn…

…f issues" This reverts commit 9d5e731.
owid · Jan 19, 2024 · 4dd53b9 · 4dd53b9
1 parent d906392
commit 4dd53b9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/devTools/docker/mysql-init-docker/Dockerfile b/devTools/docker/mysql-init-docker/Dockerfile
@@ -1,7 +1,8 @@
-FROM mysql:8.0-debian
+FROM mysql/mysql-server:latest
 
-RUN apt-get -y update \
- && apt-get install -y \
+RUN microdnf -y update \
+ && microdnf install -y \
+    libpwquality \
     curl \
     rsync \
     unzip \

diff --git a/docker-compose.dbtests.yml b/docker-compose.dbtests.yml
@@ -3,7 +3,7 @@ version: "3.7"
 services:
     # Stock mysql database. Root password is hardcoded for now
     db:
-        image: mysql:8.0-debian
+        image: mysql/mysql-server:latest
         command: --default-authentication-plugin=mysql_native_password --log-bin-trust-function-creators=ON
         restart: always
         volumes:

diff --git a/docker-compose.devcontainer.yml b/docker-compose.devcontainer.yml
@@ -44,7 +44,7 @@ services:
 
     # Stock mysql database. Used for both grapher and wordpress databases. Root password is hardcoded for now
     db:
-        image: mysql:8.0-debian
+        image: mysql/mysql-server:latest
         command: --default-authentication-plugin=mysql_native_password
         restart: always
         volumes:

diff --git a/docker-compose.full.yml b/docker-compose.full.yml
@@ -33,7 +33,7 @@ version: "3.7"
 services:
     # Stock mysql database. Used for both grapher and wordpress databases. Root password is hardcoded for now
     db:
-        image: mysql:8.0-debian
+        image: mysql/mysql-server:latest
         command: --default-authentication-plugin=mysql_native_password
         restart: always
         volumes:

diff --git a/docker-compose.grapher.yml b/docker-compose.grapher.yml
@@ -29,7 +29,7 @@ version: "3.7"
 services:
     # Stock mysql database. Root password is hardcoded for now
     db:
-        image: mysql:8.0-debian
+        image: mysql/mysql-server:latest
         command: --default-authentication-plugin=mysql_native_password
         restart: always
         volumes: