Merge pull request datafold#9 from datafold/chiel-dat-3098-dockerized-setup-incl-dockerish-cli

[DAT-3098] Use mysql image that supports ARM and AMD

Author: cfernhout

dev/docker-compose.yml

@@ -58,7 +58,7 @@ services:
 
  mysql:
  container_name: mysql
- image: "${MYSQL_IMAGE:-mysql}"
+ image: mysql:oracle
  command: >
  --default-authentication-plugin=mysql_native_password
  --innodb-buffer-pool-size=8G

example.sh

@@ -1,12 +1,6 @@
 #!/usr/bin/env bash
 set -ex
 
-# Use a linux/arm64 docker image for MySQL when running on ARM
-CPU_ARCHITECTURE=$(uname -p)
-if [[ "${CPU_ARCHITECTURE}" == "arm" ]]; then
-MYSQL_IMAGE="arm64v8/mysql:oracle"
-fi
-
 main () {
  cd dev/
  initialize 
@@ -17,27 +11,27 @@ main () {
 }
 
 initialize() {
- MYSQL_IMAGE=${MYSQL_IMAGE} docker-compose up -d postgres mysql
+ docker-compose up -d postgres mysql
 
  until nc -z -v -w30 localhost 3306 && nc -z -v -w30 localhost 5432; do
  echo "Databases not yet ready.."
  sleep 5
  done
 
- MYSQL_IMAGE=${MYSQL_IMAGE} docker-compose up -d xdiff prepdb
+ docker-compose up -d xdiff prepdb
 }
 
 prepare_db() {
  . ./prepdb.sh
 }
 
 xdiff() {
- MYSQL_IMAGE=${MYSQL_IMAGE} docker-compose run -e DB1_URI=postgres://postgres:Password1@postgresql/postgres -e TABLE1_NAME=Rating -e DB2_URI=mysql://mysql:Password1@mysql/mysql -e TABLE2_NAME=Rating_del1 -e OPTIONS='-c timestamp --bisection-factor 4 -v -s' xdiff
- MYSQL_IMAGE=${MYSQL_IMAGE} docker-compose run -e DB1_URI=postgres://postgres:Password1@postgresql/postgres -e TABLE1_NAME=Rating -e DB2_URI=mysql://mysql:Password1@mysql/mysql -e TABLE2_NAME=Rating_update1 -e OPTIONS='-c timestamp --bisection-factor 4 -v' xdiff
- MYSQL_IMAGE=${MYSQL_IMAGE} docker-compose run -e DB1_URI=postgres://postgres:Password1@postgresql/postgres -e TABLE1_NAME=Rating -e DB2_URI=mysql://mysql:Password1@mysql/mysql -e TABLE2_NAME=Rating_update001p -e OPTIONS='-c timestamp --bisection-factor 64 -v -s' xdiff
- MYSQL_IMAGE=${MYSQL_IMAGE} docker-compose run -e DB1_URI=postgres://postgres:Password1@postgresql/postgres -e TABLE1_NAME=Rating -e DB2_URI=mysql://mysql:Password1@mysql/mysql -e TABLE2_NAME=Rating_update1p -e OPTIONS='-c timestamp --bisection-factor 4 -v -s' xdiff
- MYSQL_IMAGE=${MYSQL_IMAGE} docker-compose run -e DB1_URI=postgres://postgres:Password1@postgresql/postgres -e TABLE1_NAME=Rating -e DB2_URI=mysql://mysql:Password1@mysql/mysql -e TABLE2_NAME=Rating_del1p -e OPTIONS='-c timestamp --bisection-factor 4 -v -s' xdiff
- MYSQL_IMAGE=${MYSQL_IMAGE} docker-compose run -e DB1_URI=postgres://postgres:Password1@postgresql/postgres -e TABLE1_NAME=Rating -e DB2_URI=mysql://mysql:Password1@mysql/mysql -e TABLE2_NAME=Rating_update50p -e OPTIONS='-c timestamp --bisection-factor 4 -v -s' xdiff
+ docker-compose run -e DB1_URI=postgres://postgres:Password1@postgresql/postgres -e TABLE1_NAME=Rating -e DB2_URI=mysql://mysql:Password1@mysql/mysql -e TABLE2_NAME=Rating_del1 -e OPTIONS='-c timestamp --bisection-factor 4 -v -s' xdiff
+ docker-compose run -e DB1_URI=postgres://postgres:Password1@postgresql/postgres -e TABLE1_NAME=Rating -e DB2_URI=mysql://mysql:Password1@mysql/mysql -e TABLE2_NAME=Rating_update1 -e OPTIONS='-c timestamp --bisection-factor 4 -v' xdiff
+ docker-compose run -e DB1_URI=postgres://postgres:Password1@postgresql/postgres -e TABLE1_NAME=Rating -e DB2_URI=mysql://mysql:Password1@mysql/mysql -e TABLE2_NAME=Rating_update001p -e OPTIONS='-c timestamp --bisection-factor 64 -v -s' xdiff
+ docker-compose run -e DB1_URI=postgres://postgres:Password1@postgresql/postgres -e TABLE1_NAME=Rating -e DB2_URI=mysql://mysql:Password1@mysql/mysql -e TABLE2_NAME=Rating_update1p -e OPTIONS='-c timestamp --bisection-factor 4 -v -s' xdiff
+ docker-compose run -e DB1_URI=postgres://postgres:Password1@postgresql/postgres -e TABLE1_NAME=Rating -e DB2_URI=mysql://mysql:Password1@mysql/mysql -e TABLE2_NAME=Rating_del1p -e OPTIONS='-c timestamp --bisection-factor 4 -v -s' xdiff
+ docker-compose run -e DB1_URI=postgres://postgres:Password1@postgresql/postgres -e TABLE1_NAME=Rating -e DB2_URI=mysql://mysql:Password1@mysql/mysql -e TABLE2_NAME=Rating_update50p -e OPTIONS='-c timestamp --bisection-factor 4 -v -s' xdiff
 }
 
 shutdown() {