Bump to version 8.0.30. Added MYSQL_ROUTER_ACCOUNT and MYSQL_ROUTER_PASSWORD evn variables.

Author: garutilorenzo

.github/workflows/docker-image.yml

@@ -6,21 +6,40 @@ on:
   pull_request:
     branches: [ master ]
 
+env:
+  CURRENT_MYSQL_VERSION: 8.0.30
+  CURRENT_MYSQL_MAYOR_VERSION: 8
+
 jobs:
 
   build:
 
     runs-on: ubuntu-latest
-    outputs:
-      vulnerabilities: "./vulnerabilities.json"
     steps:
     - uses: actions/checkout@v2
     - name: Build the Docker image
-      run: docker build --pull --no-cache mysqlrouter/ -f mysqlrouter/Dockerfile --tag localbuild/mysqlrouter:latest
+      run: docker build --pull --no-cache mysqlrouter/ -f mysqlrouter/Dockerfile --tag ${{ secrets.DOCKER_USER }}/mysqlrouter:latest
+    - name: docker login
+      env:
+        DOCKER_USER: ${{ secrets.DOCKER_USER }}
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+      run: |
+        docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+    - name: docker push mysqlrouter image
+      run: |
+        IMAGE_ID=${{ secrets.DOCKER_USER }}/mysqlrouter:$CURRENT_MYSQL_VERSION
+        IMAGE_ID_MAYOR=${{ secrets.DOCKER_USER }}/mysqlrouter:$CURRENT_MYSQL_MAYOR_VERSION
+        echo IMAGE_ID=$IMAGE_ID
+        echo IMAGE_ID=$IMAGE_ID_MAYOR
+        docker tag ${{ secrets.DOCKER_USER }}/mysqlrouter:latest $IMAGE_ID
+        docker tag ${{ secrets.DOCKER_USER }}/mysqlrouter:latest $IMAGE_ID_MAYOR
+        docker push $IMAGE_ID
+        docker push $IMAGE_ID_MAYOR
+        docker push ${{ secrets.DOCKER_USER }}/mysqlrouter:latest
     - uses: anchore/scan-action@v2
       id: scan
       with:
-        image: "localbuild/mysqlrouter:latest"
+        image: "${{ secrets.DOCKER_USER }}/mysqlrouter:latest"
         acs-report-enable: true
     - name: upload Anchore scan SARIF report
       uses: github/codeql-action/upload-sarif@v1

mysqlrouter/Dockerfile

@@ -1,23 +1,21 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
-RUN apt-get update && apt-get -y upgrade && apt-get install -y --no-install-recommends wget lsb-release gnupg hostname dirmngr && rm -rf /var/lib/apt/lists/* 
-RUN mkdir ~/.gnupg && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf
+RUN apt-get update && apt-get install -y --no-install-recommends wget lsb-release hostname gnupg dirmngr
 
-RUN set -ex; \
-# gpg: key 5072E1F5: public key "MySQL Release Engineering <[email protected]>" imported
-	key='A4A9406876FCBD3C456770C88C718D3B5072E1F5'; \
+RUN set -eux; \
+# gpg: key 3A79BD29: public key "MySQL Release Engineering <[email protected]>" imported
+	key='859BE8D7C586F538430B19C2467B942D3A79BD29'; \
 	export GNUPGHOME="$(mktemp -d)"; \
-	#gpg --batch --keyserver-options "timeout=10 http-proxy=$http_proxy" --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-	gpg --batch --keyserver-options "timeout=10" --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-	gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/mysql.gpg; \
+	gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
+	mkdir -p /etc/apt/keyrings; \
+	gpg --batch --export "$key" > /etc/apt/keyrings/mysql.gpg; \
 	gpgconf --kill all; \
-	rm -rf "$GNUPGHOME"; \
-	apt-key list > /dev/null
+	rm -rf "$GNUPGHOME"
 
 ENV MYSQL_MAJOR 8.0
-ENV MYSQL_VERSION 8.0.24-1debian10
+ENV MYSQL_VERSION 8.0.30-1debian10
 
-RUN echo "deb http://repo.mysql.com/apt/debian/ buster mysql-${MYSQL_MAJOR}" > /etc/apt/sources.list.d/mysql.list
+RUN echo 'deb [ signed-by=/etc/apt/keyrings/mysql.gpg ] http://repo.mysql.com/apt/debian/ buster mysql-8.0' > /etc/apt/sources.list.d/mysql.list
 
 # the "/var/lib/mysql" stuff here is because the mysql-server postinst doesn't have an explicit way to disable the mysql_install_db codepath besides having a database already "configured" (ie, stuff in /var/lib/mysql/mysql)
 # also, we set debconf keys to make APT a little quieter
@@ -29,13 +27,8 @@ RUN { \
 	} | debconf-set-selections \
 	&& apt-get update &&  DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install -y mysql-client="${MYSQL_VERSION}"  mysql-community-client="${MYSQL_VERSION}"  && rm -rf /var/lib/apt/lists/*
 
-RUN wget --no-check-certificate https://dev.mysql.com/get/mysql-apt-config_0.8.16-1_all.deb && dpkg -i mysql-apt-config_0.8.16-1_all.deb # Ref. https://dev.mysql.com/downloads/
-RUN apt-get update && apt-get install -y --no-install-recommends mysql-router && rm -rf /var/lib/apt/lists/*
-
-#ARG MYSQL_ROUTER_VERSION=8.0.18-1debian10_amd64
-#RUN wget --no-check-certificate https://downloads.mysql.com/archives/get/p/41/file/mysql-router-community_${MYSQL_ROUTER_VERSION}.deb \
-#    && dpkg -i mysql-router-community_${MYSQL_ROUTER_VERSION}.deb\
-#    && rm -rf  mysql-router-community_${MYSQL_ROUTER_VERSION}.deb
+RUN wget --no-check-certificate https://dev.mysql.com/get/mysql-apt-config_0.8.23-1_all.deb && dpkg -i mysql-apt-config_0.8.23-1_all.deb # Ref. https://dev.mysql.com/downloads/
+RUN apt-get update && apt-get install -y --no-install-recommends mysql-router && apt-get remove -y wget lsb-release gnupg dirmngr && apt autoremove -y && rm -rf /var/lib/apt/lists/*
 
 RUN rm -rf /etc/mysqlrouter # cleanup 
 

mysqlrouter/docker-entrypoint.sh

@@ -19,13 +19,13 @@ BASE_PATH=/app/mysqlrouter
 
 if [ "$1" = 'mysqlrouter' ]; then
     if [[ -z $MYSQL_HOST || -z $MYSQL_PORT || -z $MYSQL_USER || -z $MYSQL_PASSWORD ]]; then
-	    echo "We require all of"
-	    echo "    MYSQL_HOST"
-	    echo "    MYSQL_PORT"
-	    echo "    MYSQL_USER"
-	    echo "    MYSQL_PASSWORD"
-	    echo "to be set. Exiting."
-	    exit 1
+        echo "We require all of"
+        echo "    MYSQL_HOST"
+        echo "    MYSQL_PORT"
+        echo "    MYSQL_USER"
+        echo "    MYSQL_PASSWORD"
+        echo "to be set. Exiting."
+        exit 1
     fi
 
     PASSFILE=$(mktemp)
@@ -37,14 +37,14 @@ password="$MYSQL_PASSWORD"
 EOF
     unset MYSQL_PASSWORD
     until mysql --defaults-extra-file="$DEFAULTS_EXTRA_FILE" -h "$MYSQL_HOST" -P"$MYSQL_PORT" -u "$MYSQL_USER" -nsLNE -e 'exit'; do
-	  >&2 echo "MySQL is unavailable - sleeping"
-	  sleep 5
+      >&2 echo "MySQL is unavailable - sleeping"
+      sleep 5
     done
 
     echo "Succesfully contacted mysql server at $MYSQL_HOST. Checking for cluster state."
     if ! [[ "$(mysql --defaults-extra-file="$DEFAULTS_EXTRA_FILE" -u "$MYSQL_USER" -h "$MYSQL_HOST" -P "$MYSQL_PORT" -e "show status;" 2> /dev/null)" ]]; then
-	    echo "Can not connect to database. Exiting."
-	    exit 1
+        echo "Can not connect to database. Exiting."
+        exit 1
     fi
 
     echo "Check if config exist"
@@ -53,8 +53,19 @@ EOF
        echo "Start mysqlrouter"
        exec "$@" --config $BASE_PATH/mysqlrouter.conf
     else 
+        if [[ -z $MYSQL_ROUTER_ACCOUNT ]]; then
+            echo "MYSQL_ROUTER_ACCOUNT env var is not defined. mysqlrouter will bootstrap with a random user"
+        else
+            if [[ -z $MYSQL_ROUTER_PASSWORD ]]; then
+                echo "MYSQL_ROUTER_PASSWORD is required when MYSQL_ROUTER_ACCOUNT is defined"
+                exit 1
+            fi
+            echo $MYSQL_ROUTER_PASSWORD >> "$PASSFILE"
+            echo "bootstrap mysqlrouter with account $MYSQL_ROUTER_ACCOUNT"
+            ACCOUNT_PARAMETER="--account $MYSQL_ROUTER_ACCOUNT --account-create always"
+        fi
         echo "Succesfully contacted mysql server at $MYSQL_HOST. Trying to bootstrap."
-        mysqlrouter --bootstrap "$MYSQL_USER@$MYSQL_HOST:$MYSQL_PORT" --user=mysqlrouter --directory $BASE_PATH --force < "$PASSFILE"
+        mysqlrouter --bootstrap "$MYSQL_USER@$MYSQL_HOST:$MYSQL_PORT" --user=mysqlrouter --directory $BASE_PATH $ACCOUNT_PARAMETER --force < "$PASSFILE"
         sed -i -e 's/logging_folder=.*$/logging_folder=/' $BASE_PATH/mysqlrouter.conf
         echo "Starting mysql-router."
         exec "$@" --config $BASE_PATH/mysqlrouter.conf