revert docker-compose to main

remove comment

update DB lang pairs

revert some changes from master

.github/workflows/ci.yml

@@ -14,46 +14,16 @@ jobs:
       fail-fast: false
       matrix:
         db:
+          - mysql:5.6
           - mysql:5.7
           - mysql:8.3
           - mariadb:10.11
         pair:
-          # - elixir: 1.16
-          #   otp: 26
+          - elixir: 1.11.3
+            otp: 23.2.5
           - elixir: 1.16.3
             otp: 26.2.5
-        include:
-          - db: mysql:5.7
-            pair:
-              elixir: 1.7.4
-              otp: 21.3.8.24
 
-          - db: mysql:5.7
-            pair:
-              elixir: 1.16.3
-              otp: 26.2.5
-            lint: lint
-
-          - db: mysql:8.3
-            pair:
-              elixir: 1.7.4
-              otp: 21.3.8.24
-
-          - db: mysql:8.3
-            pair:
-              elixir: 1.16.3
-              otp: 26.2.5
-            lint: lint
-
-          - db: mariadb:10.11
-            pair:
-              elixir: 1.7.4
-              otp: 21.3.8.24
-
-          - db: mariadb:10.11
-            pair:
-              elixir: 1.16.3
-              otp: 26.2.5
     env:
       MIX_ENV: test
       DB: ${{ matrix.db }}

.gitignore

@@ -25,4 +25,3 @@ myxql-*.tar
 /errmsg-utf8.txt
 /xref_graph.*
 /config
-/data

docker-compose.yml

@@ -1,81 +1,61 @@
 version: "3"
 services:
-  # mysql-5.5:
-  #   platform: linux/x86_64
-  #   image: "mysql:5.5"
-  #   ports:
-  #     - "5050:3306"
-  #   environment:
-  #     - MYSQL_ALLOW_EMPTY_PASSWORD=1
-  # mysql-5.6:
-  #   platform: linux/x86_64
-  #   image: "mysql:5.6"
-  #   ports:
-  #     - "5060:3306"
-  #   environment:
-  #     - MYSQL_ALLOW_EMPTY_PASSWORD=1
-  #   command: "--innodb_log_file_size=1G"
-  # mysql-5.7:
-  #   platform: linux/x86_64
-  #   image: "mysql:5.7"
-  #   ports:
-  #     - "5070:3306"
-  #   environment:
-  #     - MYSQL_ALLOW_EMPTY_PASSWORD=1
-  # mysql-5.7-sha:
-  #   platform: linux/x86_64
-  #   image: "mysql:5.7"
-  #   ports:
-  #     - "5071:3306"
-  #   environment:
-  #     - MYSQL_ALLOW_EMPTY_PASSWORD=1
-  #   command: "--default-authentication-plugin=sha256_password"
+  mysql-5.5:
+    image: "mysql:5.5"
+    ports:
+      - "5050:3306"
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=1
+  mysql-5.6:
+    image: "mysql:5.6"
+    ports:
+      - "5060:3306"
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=1
+    command: "--innodb_log_file_size=1G"
+  mysql-5.7:
+    image: "mysql:5.7"
+    ports:
+      - "5070:3306"
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=1
+  mysql-5.7-sha:
+    image: "mysql:5.7"
+    ports:
+      - "5071:3306"
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=1
+    command: "--default-authentication-plugin=sha256_password"
   mysql-8.0:
-    platform: linux/x86_64
     image: "mysql:8.0"
     ports:
       - "8000:3306"
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=1
-    volumes:
-      - ./data/db/mysql8:/var/lib/mysql
-  # mysql-8.0-mysql-native-password:
-  #   platform: linux/x86_64
-  #   image: "mysql:8.0"
-  #   ports:
-  #     - "8001:3306"
-  #   environment:
-  #     - MYSQL_ALLOW_EMPTY_PASSWORD=1
-  #   command: "--default-authentication-plugin=mysql_native_password"
-  # mysql-8.0-sha:
-  #   platform: linux/x86_64
-  #   image: "mysql:8.0"
-  #   ports:
-  #     - "8002:3306"
-  #   environment:
-  #     - MYSQL_ALLOW_EMPTY_PASSWORD=1
-  #   command: "--default-authentication-plugin=sha256_password"
-  # mariadb-10.3:
-  #   platform: linux/x86_64
-  #   image: "mariadb:10.3"
-  #   ports:
-  #     - "10003:3306"
-  #   environment:
-  #     - MYSQL_ALLOW_EMPTY_PASSWORD=1
-  #   command: "--default-authentication-plugin=mysql_native_password"
-  # mariadb-10.4:
-  #   platform: linux/x86_64
-  #   image: "mariadb:10.4"
-  #   ports:
-  #     - "10004:3306"
-  #   environment:
-  #     - MYSQL_ALLOW_EMPTY_PASSWORD=1
-  mariadb-10.5:
-    platform: linux/x86_64
-    image: "mariadb:10.5"
+  mysql-8.0-mysql-native-password:
+    image: "mysql:8.0"
+    ports:
+      - "8001:3306"
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=1
+    command: "--default-authentication-plugin=mysql_native_password"
+  mysql-8.0-sha:
+    image: "mysql:8.0"
+    ports:
+      - "8002:3306"
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=1
+    command: "--default-authentication-plugin=sha256_password"
+  mariadb-10.3:
+    image: "mariadb:10.3"
+    ports:
+      - "10003:3306"
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=1
+    command: "--default-authentication-plugin=mysql_native_password"
+  mariadb-10.4:
+    image: "mariadb:10.4"
     ports:
       - "10004:3306"
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=1
-    volumes:
-      - ./data/db/mariadb10_5:/var/lib/mysql

scripts/test-versions.sh

@@ -20,7 +20,7 @@ else
 fi
 
 for name in $services; do
-  port=`docker inspect --format='{{(index (index .NetworkSettings.Ports "3306/tcp") 0).HostPort}}' myxql-${name}-1`
+  port=`docker inspect --format='{{(index (index .NetworkSettings.Ports "3306/tcp") 0).HostPort}}' myxql_${name}_1`
   echo $name
   MYSQL_TCP_PORT=$port $cmd
 done