Skip to content

Commit 05c1d56

Browse files
tymonxtymonx
committed
Updated all MariaDB versions
1 parent 27fd1ea commit 05c1d56

File tree

10 files changed

+70
-10
lines changed

10 files changed

+70
-10
lines changed

‎10.2/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN groupadd -r mysql && useradd -r -g mysql mysql
88
RUN set -ex; \
99
apt-get update; \
1010
if ! which gpg; then \
11-
apt-get install -y --no-install-recommends gnupg; \
11+
apt-get install -y --no-install-recommends gnupg2; \
1212
fi; \
1313
if ! gpg --version | grep -q '^gpg (GnuPG) 1\.'; then \
1414
# Ubuntu includes "gnupg" (not "gnupg2", but still 2.x), but not dirmngr, and gnupg 2.x requires dirmngr

‎10.2/docker-entrypoint.sh‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,19 @@ wsrep_enable_new_cluster() {
456456
local wsrepdir="$(mysql_get_config 'wsrep-data-home-dir' "$@")"
457457
local wsrepaddr="$(wsrep_address_normalize "$(mysql_get_config 'wsrep-node-address' "$@")")"
458458

459-
if [ -z "$address" ] || [ -n "$WSREP_SKIP_AUTO_BOOTSTRAP" ] || [ -s "$wsrepdir/gvwstate.dat" ]; then
459+
if [ -n "$WSREP_SKIP_AUTO_BOOTSTRAP" ]; then
460+
return 1
461+
fi
462+
463+
if [ -s "$wsrepdir/grastate.dat" ]; then
464+
if [[ "$(cat "$wsrepdir/grastate.dat" | grep -i safe_to_bootstrap)" =~ 1 ]]; then
465+
return 0
466+
fi
467+
468+
return 1
469+
fi
470+
471+
if [ -z "$address" ] || [ -s "$wsrepdir/gvwstate.dat" ]; then
460472
return 1
461473
fi
462474

‎10.3/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN groupadd -r mysql && useradd -r -g mysql mysql
88
RUN set -ex; \
99
apt-get update; \
1010
if ! which gpg; then \
11-
apt-get install -y --no-install-recommends gnupg; \
11+
apt-get install -y --no-install-recommends gnupg2; \
1212
fi; \
1313
if ! gpg --version | grep -q '^gpg (GnuPG) 1\.'; then \
1414
# Ubuntu includes "gnupg" (not "gnupg2", but still 2.x), but not dirmngr, and gnupg 2.x requires dirmngr

‎10.3/docker-entrypoint.sh‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,19 @@ wsrep_enable_new_cluster() {
456456
local wsrepdir="$(mysql_get_config 'wsrep-data-home-dir' "$@")"
457457
local wsrepaddr="$(wsrep_address_normalize "$(mysql_get_config 'wsrep-node-address' "$@")")"
458458

459-
if [ -z "$address" ] || [ -n "$WSREP_SKIP_AUTO_BOOTSTRAP" ] || [ -s "$wsrepdir/gvwstate.dat" ]; then
459+
if [ -n "$WSREP_SKIP_AUTO_BOOTSTRAP" ]; then
460+
return 1
461+
fi
462+
463+
if [ -s "$wsrepdir/grastate.dat" ]; then
464+
if [[ "$(cat "$wsrepdir/grastate.dat" | grep -i safe_to_bootstrap)" =~ 1 ]]; then
465+
return 0
466+
fi
467+
468+
return 1
469+
fi
470+
471+
if [ -z "$address" ] || [ -s "$wsrepdir/gvwstate.dat" ]; then
460472
return 1
461473
fi
462474

‎10.4/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN groupadd -r mysql && useradd -r -g mysql mysql
88
RUN set -ex; \
99
apt-get update; \
1010
if ! which gpg; then \
11-
apt-get install -y --no-install-recommends gnupg; \
11+
apt-get install -y --no-install-recommends gnupg2; \
1212
fi; \
1313
if ! gpg --version | grep -q '^gpg (GnuPG) 1\.'; then \
1414
# Ubuntu includes "gnupg" (not "gnupg2", but still 2.x), but not dirmngr, and gnupg 2.x requires dirmngr

‎10.4/docker-entrypoint.sh‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,19 @@ wsrep_enable_new_cluster() {
456456
local wsrepdir="$(mysql_get_config 'wsrep-data-home-dir' "$@")"
457457
local wsrepaddr="$(wsrep_address_normalize "$(mysql_get_config 'wsrep-node-address' "$@")")"
458458

459-
if [ -z "$address" ] || [ -n "$WSREP_SKIP_AUTO_BOOTSTRAP" ] || [ -s "$wsrepdir/gvwstate.dat" ]; then
459+
if [ -n "$WSREP_SKIP_AUTO_BOOTSTRAP" ]; then
460+
return 1
461+
fi
462+
463+
if [ -s "$wsrepdir/grastate.dat" ]; then
464+
if [[ "$(cat "$wsrepdir/grastate.dat" | grep -i safe_to_bootstrap)" =~ 1 ]]; then
465+
return 0
466+
fi
467+
468+
return 1
469+
fi
470+
471+
if [ -z "$address" ] || [ -s "$wsrepdir/gvwstate.dat" ]; then
460472
return 1
461473
fi
462474

‎10.5/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN groupadd -r mysql && useradd -r -g mysql mysql
88
RUN set -ex; \
99
apt-get update; \
1010
if ! which gpg; then \
11-
apt-get install -y --no-install-recommends gnupg; \
11+
apt-get install -y --no-install-recommends gnupg2; \
1212
fi; \
1313
if ! gpg --version | grep -q '^gpg (GnuPG) 1\.'; then \
1414
# Ubuntu includes "gnupg" (not "gnupg2", but still 2.x), but not dirmngr, and gnupg 2.x requires dirmngr

‎10.5/docker-entrypoint.sh‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,19 @@ wsrep_enable_new_cluster() {
456456
local wsrepdir="$(mysql_get_config 'wsrep-data-home-dir' "$@")"
457457
local wsrepaddr="$(wsrep_address_normalize "$(mysql_get_config 'wsrep-node-address' "$@")")"
458458

459-
if [ -z "$address" ] || [ -n "$WSREP_SKIP_AUTO_BOOTSTRAP" ] || [ -s "$wsrepdir/gvwstate.dat" ]; then
459+
if [ -n "$WSREP_SKIP_AUTO_BOOTSTRAP" ]; then
460+
return 1
461+
fi
462+
463+
if [ -s "$wsrepdir/grastate.dat" ]; then
464+
if [[ "$(cat "$wsrepdir/grastate.dat" | grep -i safe_to_bootstrap)" =~ 1 ]]; then
465+
return 0
466+
fi
467+
468+
return 1
469+
fi
470+
471+
if [ -z "$address" ] || [ -s "$wsrepdir/gvwstate.dat" ]; then
460472
return 1
461473
fi
462474

‎10.6/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN groupadd -r mysql && useradd -r -g mysql mysql
88
RUN set -ex; \
99
apt-get update; \
1010
if ! which gpg; then \
11-
apt-get install -y --no-install-recommends gnupg; \
11+
apt-get install -y --no-install-recommends gnupg2; \
1212
fi; \
1313
if ! gpg --version | grep -q '^gpg (GnuPG) 1\.'; then \
1414
# Ubuntu includes "gnupg" (not "gnupg2", but still 2.x), but not dirmngr, and gnupg 2.x requires dirmngr

‎10.6/docker-entrypoint.sh‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,19 @@ wsrep_enable_new_cluster() {
456456
local wsrepdir="$(mysql_get_config 'wsrep-data-home-dir' "$@")"
457457
local wsrepaddr="$(wsrep_address_normalize "$(mysql_get_config 'wsrep-node-address' "$@")")"
458458

459-
if [ -z "$address" ] || [ -n "$WSREP_SKIP_AUTO_BOOTSTRAP" ] || [ -s "$wsrepdir/gvwstate.dat" ]; then
459+
if [ -n "$WSREP_SKIP_AUTO_BOOTSTRAP" ]; then
460+
return 1
461+
fi
462+
463+
if [ -s "$wsrepdir/grastate.dat" ]; then
464+
if [[ "$(cat "$wsrepdir/grastate.dat" | grep -i safe_to_bootstrap)" =~ 1 ]]; then
465+
return 0
466+
fi
467+
468+
return 1
469+
fi
470+
471+
if [ -z "$address" ] || [ -s "$wsrepdir/gvwstate.dat" ]; then
460472
return 1
461473
fi
462474

0 commit comments

Comments
 (0)