From 60cab1cd7bd2a97b7105d0797b7ca7a83d7ad204 Mon Sep 17 00:00:00 2001
From: Ish West <ish@mySilverMachine.local>
Date: Sun, 12 Aug 2018 08:52:59 +0200
Subject: [PATCH 1/3] Added MYSQL_UID and MYSQL_GID optional arguments / env.
 variables

---
 8.0/Dockerfile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/8.0/Dockerfile b/8.0/Dockerfile
index 8dd69ee5a..08bfc3852 100644
--- a/8.0/Dockerfile
+++ b/8.0/Dockerfile
@@ -1,7 +1,12 @@
 FROM debian:stretch-slim
 
+ARG MYSQL_UID
+ENV MYSQL_UID ${MYSQL_UID:-}
+ARG MYSQL_GID
+ENV MYSQL_GID ${MYSQL_GID:-$MYSQL_UID}
+
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN groupadd -r mysql && useradd -r -g mysql mysql
+RUN groupadd -r ${MYSQL_GID:+-g $MYSQL_GID} mysql && useradd -r ${MYSQL_UID:+-u $MYSQL_UID} -g mysql mysql
 
 RUN apt-get update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/*
 

From 15177f5cb9b3fda8a958f3367262932d4ee5bc84 Mon Sep 17 00:00:00 2001
From: Ish West <ishwest@yandex.com>
Date: Sun, 12 Aug 2018 16:28:18 +0200
Subject: [PATCH 2/3] Added MYSQL_UID and MYSQL_GID to ver. 5.*

---
 5.5/Dockerfile | 7 ++++++-
 5.6/Dockerfile | 7 ++++++-
 5.7/Dockerfile | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/5.5/Dockerfile b/5.5/Dockerfile
index 25d1f568b..b44001529 100644
--- a/5.5/Dockerfile
+++ b/5.5/Dockerfile
@@ -1,7 +1,12 @@
 FROM debian:stretch-slim
 
+ARG MYSQL_UID
+ENV MYSQL_UID ${MYSQL_UID:-}
+ARG MYSQL_GID
+ENV MYSQL_GID ${MYSQL_GID:-$MYSQL_UID}
+
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN groupadd -r mysql && useradd -r -g mysql mysql
+RUN groupadd -r ${MYSQL_GID:+-g $MYSQL_GID} mysql && useradd -r ${MYSQL_UID:+-u $MYSQL_UID} -g mysql mysql
 
 RUN apt-get update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/*
 
diff --git a/5.6/Dockerfile b/5.6/Dockerfile
index 677d59f38..df0128175 100644
--- a/5.6/Dockerfile
+++ b/5.6/Dockerfile
@@ -1,7 +1,12 @@
 FROM debian:stretch-slim
 
+ARG MYSQL_UID
+ENV MYSQL_UID ${MYSQL_UID:-}
+ARG MYSQL_GID
+ENV MYSQL_GID ${MYSQL_GID:-$MYSQL_UID}
+
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN groupadd -r mysql && useradd -r -g mysql mysql
+RUN groupadd -r ${MYSQL_GID:+-g $MYSQL_GID} mysql && useradd -r ${MYSQL_UID:+-u $MYSQL_UID} -g mysql mysql
 
 RUN apt-get update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/*
 
diff --git a/5.7/Dockerfile b/5.7/Dockerfile
index 87aa7e48a..45afc446d 100644
--- a/5.7/Dockerfile
+++ b/5.7/Dockerfile
@@ -1,7 +1,12 @@
 FROM debian:stretch-slim
 
+ARG MYSQL_UID
+ENV MYSQL_UID ${MYSQL_UID:-}
+ARG MYSQL_GID
+ENV MYSQL_GID ${MYSQL_GID:-$MYSQL_UID}
+
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN groupadd -r mysql && useradd -r -g mysql mysql
+RUN groupadd -r ${MYSQL_GID:+-g $MYSQL_GID} mysql && useradd -r ${MYSQL_UID:+-u $MYSQL_UID} -g mysql mysql
 
 RUN apt-get update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/*
 

From 895d5e0b6a81eb888719f0504c518bcd5a5f73cf Mon Sep 17 00:00:00 2001
From: Ish West <ishwest@yandex.com>
Date: Mon, 13 Aug 2018 09:39:42 +0200
Subject: [PATCH 3/3] Tidying up aka forcing Travis Ci to re-check since it
 keeps failing on CDN timeouts

---
 5.5/Dockerfile | 3 +--
 5.6/Dockerfile | 3 +--
 5.7/Dockerfile | 3 +--
 8.0/Dockerfile | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/5.5/Dockerfile b/5.5/Dockerfile
index b44001529..d26a90336 100644
--- a/5.5/Dockerfile
+++ b/5.5/Dockerfile
@@ -1,11 +1,10 @@
 FROM debian:stretch-slim
 
+# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 ARG MYSQL_UID
 ENV MYSQL_UID ${MYSQL_UID:-}
 ARG MYSQL_GID
 ENV MYSQL_GID ${MYSQL_GID:-$MYSQL_UID}
-
-# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN groupadd -r ${MYSQL_GID:+-g $MYSQL_GID} mysql && useradd -r ${MYSQL_UID:+-u $MYSQL_UID} -g mysql mysql
 
 RUN apt-get update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/*
diff --git a/5.6/Dockerfile b/5.6/Dockerfile
index df0128175..5c4ec8537 100644
--- a/5.6/Dockerfile
+++ b/5.6/Dockerfile
@@ -1,11 +1,10 @@
 FROM debian:stretch-slim
 
+# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 ARG MYSQL_UID
 ENV MYSQL_UID ${MYSQL_UID:-}
 ARG MYSQL_GID
 ENV MYSQL_GID ${MYSQL_GID:-$MYSQL_UID}
-
-# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN groupadd -r ${MYSQL_GID:+-g $MYSQL_GID} mysql && useradd -r ${MYSQL_UID:+-u $MYSQL_UID} -g mysql mysql
 
 RUN apt-get update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/*
diff --git a/5.7/Dockerfile b/5.7/Dockerfile
index 45afc446d..f31e51d6c 100644
--- a/5.7/Dockerfile
+++ b/5.7/Dockerfile
@@ -1,11 +1,10 @@
 FROM debian:stretch-slim
 
+# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 ARG MYSQL_UID
 ENV MYSQL_UID ${MYSQL_UID:-}
 ARG MYSQL_GID
 ENV MYSQL_GID ${MYSQL_GID:-$MYSQL_UID}
-
-# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN groupadd -r ${MYSQL_GID:+-g $MYSQL_GID} mysql && useradd -r ${MYSQL_UID:+-u $MYSQL_UID} -g mysql mysql
 
 RUN apt-get update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/*
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
index 08bfc3852..8fcedd3bf 100644
--- a/8.0/Dockerfile
+++ b/8.0/Dockerfile
@@ -1,11 +1,10 @@
 FROM debian:stretch-slim
 
+# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 ARG MYSQL_UID
 ENV MYSQL_UID ${MYSQL_UID:-}
 ARG MYSQL_GID
 ENV MYSQL_GID ${MYSQL_GID:-$MYSQL_UID}
-
-# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN groupadd -r ${MYSQL_GID:+-g $MYSQL_GID} mysql && useradd -r ${MYSQL_UID:+-u $MYSQL_UID} -g mysql mysql
 
 RUN apt-get update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/*