Skip to content
This repository was archived by the owner on Jan 30, 2020. It is now read-only.

Commit 19b9485

Browse files
tianontianon
committed
Allow arbitrary --user values
1 parent 6d4aa57 commit 19b9485

File tree

7 files changed

+145
-42
lines changed

7 files changed

+145
-42
lines changed

‎5.5/Dockerfile

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,25 @@ FROM debian:jessie
44
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
55
RUN groupadd -r mysql && useradd -r -g mysql mysql
66

7-
# install "pwgen" for randomizing passwords
8-
RUN apt-get update && apt-get install -y pwgen && rm -rf /var/lib/apt/lists/*
7+
# add gosu for easy step-down from root
8+
ENV GOSU_VERSION 1.7
9+
RUN set -x \
10+
&& apt-get update && apt-get install -y --no-install-recommends ca-certificates wget && rm -rf /var/lib/apt/lists/* \
11+
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
12+
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
13+
&& export GNUPGHOME="$(mktemp -d)" \
14+
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
15+
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
16+
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
17+
&& chmod +x /usr/local/bin/gosu \
18+
&& gosu nobody true \
19+
&& apt-get purge -y --auto-remove ca-certificates wget
920

1021
RUN mkdir /docker-entrypoint-initdb.d
1122

23+
# install "pwgen" for randomizing passwords
24+
RUN apt-get update && apt-get install -y pwgen && rm -rf /var/lib/apt/lists/*
25+
1226
RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A
1327

1428
RUN echo 'deb http://repo.percona.com/apt jessie main' > /etc/apt/sources.list.d/percona.list
@@ -26,8 +40,13 @@ RUN { \
2640
&& apt-get install -y \
2741
percona-server-server-$PERCONA_MAJOR=$PERCONA_VERSION \
2842
&& rm -rf /var/lib/apt/lists/* \
29-
&& rm -rf /var/lib/mysql \
30-
&& mkdir /var/lib/mysql
43+
# comment out any "user" entires in the MySQL config ("docker-entrypoint.sh" or "--user" will handle user switching)
44+
&& sed -ri 's/^user\s/#&/' /etc/mysql/my.cnf \
45+
# purge and re-create /var/lib/mysql with appropriate ownership
46+
&& rm -rf /var/lib/mysql && mkdir -p /var/lib/mysql /var/run/mysqld \
47+
&& chown -R mysql:mysql /var/lib/mysql /var/run/mysqld \
48+
# ensure that /var/run/mysqld (used for socket and lock files) is writable regardless of the UID our mysqld instance ends up having at runtime
49+
&& chmod 777 /var/run/mysqld
3150

3251
# comment out a few problematic configuration values
3352
# don't reverse lookup hostnames, they are usually another container
@@ -37,9 +56,9 @@ RUN sed -Ei 's/^(bind-address|log)/#&/' /etc/mysql/my.cnf \
3756

3857
VOLUME ["/var/lib/mysql", "/var/log/mysql"]
3958

40-
COPY docker-entrypoint.sh /
41-
42-
ENTRYPOINT ["/docker-entrypoint.sh"]
59+
COPY docker-entrypoint.sh /usr/local/bin/
60+
RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
61+
ENTRYPOINT ["docker-entrypoint.sh"]
4362

4463
EXPOSE 3306
4564
CMD ["mysqld"]

‎5.5/docker-entrypoint.sh

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,21 @@ for arg; do
1717
esac
1818
done
1919

20+
_datadir() {
21+
"$@" --verbose --help --log-bin-index=`mktemp -u` 2>/dev/null | awk '$1 == "datadir" { print $2; exit }'
22+
}
23+
24+
# allow the container to be started with `--user`
25+
if [ "$1" = 'mysqld' -a -z "$wantHelp" -a "$(id -u)" = '0' ]; then
26+
DATADIR="$(_datadir "$@")"
27+
mkdir -p "$DATADIR"
28+
chown -R mysql:mysql "$DATADIR"
29+
exec gosu mysql "$BASH_SOURCE" "$@"
30+
fi
31+
2032
if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
2133
# Get config
22-
DATADIR="$("$@" --verbose --help --log-bin-index=`mktemp -u` 2>/dev/null | awk '$1 == "datadir" { print $2; exit }')"
34+
DATADIR="$(_datadir "$@")"
2335

2436
if [ ! -d "$DATADIR/mysql" ]; then
2537
if [ -z "$MYSQL_ROOT_PASSWORD" -a -z "$MYSQL_ALLOW_EMPTY_PASSWORD" -a -z "$MYSQL_RANDOM_ROOT_PASSWORD" ]; then
@@ -29,10 +41,9 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
2941
fi
3042

3143
mkdir -p "$DATADIR"
32-
chown -R mysql:mysql "$DATADIR"
3344

3445
echo 'Initializing database'
35-
mysql_install_db --user=mysql --datadir="$DATADIR" --rpm
46+
mysql_install_db --datadir="$DATADIR" --rpm
3647
echo 'Database initialized'
3748

3849
"$@" --skip-networking &
@@ -112,8 +123,6 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
112123
echo 'MySQL init process done. Ready for start up.'
113124
echo
114125
fi
115-
116-
chown -R mysql:mysql "$DATADIR"
117126
fi
118127

119128
exec "$@"

‎5.6/Dockerfile

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,25 @@ FROM debian:jessie
44
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
55
RUN groupadd -r mysql && useradd -r -g mysql mysql
66

7-
# install "pwgen" for randomizing passwords
8-
RUN apt-get update && apt-get install -y pwgen && rm -rf /var/lib/apt/lists/*
7+
# add gosu for easy step-down from root
8+
ENV GOSU_VERSION 1.7
9+
RUN set -x \
10+
&& apt-get update && apt-get install -y --no-install-recommends ca-certificates wget && rm -rf /var/lib/apt/lists/* \
11+
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
12+
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
13+
&& export GNUPGHOME="$(mktemp -d)" \
14+
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
15+
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
16+
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
17+
&& chmod +x /usr/local/bin/gosu \
18+
&& gosu nobody true \
19+
&& apt-get purge -y --auto-remove ca-certificates wget
920

1021
RUN mkdir /docker-entrypoint-initdb.d
1122

23+
# install "pwgen" for randomizing passwords
24+
RUN apt-get update && apt-get install -y pwgen && rm -rf /var/lib/apt/lists/*
25+
1226
RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A
1327

1428
RUN echo 'deb http://repo.percona.com/apt jessie main' > /etc/apt/sources.list.d/percona.list
@@ -26,8 +40,13 @@ RUN { \
2640
&& apt-get install -y \
2741
percona-server-server-$PERCONA_MAJOR=$PERCONA_VERSION \
2842
&& rm -rf /var/lib/apt/lists/* \
29-
&& rm -rf /var/lib/mysql \
30-
&& mkdir /var/lib/mysql
43+
# comment out any "user" entires in the MySQL config ("docker-entrypoint.sh" or "--user" will handle user switching)
44+
&& sed -ri 's/^user\s/#&/' /etc/mysql/my.cnf \
45+
# purge and re-create /var/lib/mysql with appropriate ownership
46+
&& rm -rf /var/lib/mysql && mkdir -p /var/lib/mysql /var/run/mysqld \
47+
&& chown -R mysql:mysql /var/lib/mysql /var/run/mysqld \
48+
# ensure that /var/run/mysqld (used for socket and lock files) is writable regardless of the UID our mysqld instance ends up having at runtime
49+
&& chmod 777 /var/run/mysqld
3150

3251
# comment out a few problematic configuration values
3352
# don't reverse lookup hostnames, they are usually another container
@@ -37,9 +56,9 @@ RUN sed -Ei 's/^(bind-address|log)/#&/' /etc/mysql/my.cnf \
3756

3857
VOLUME ["/var/lib/mysql", "/var/log/mysql"]
3958

40-
COPY docker-entrypoint.sh /
41-
42-
ENTRYPOINT ["/docker-entrypoint.sh"]
59+
COPY docker-entrypoint.sh /usr/local/bin/
60+
RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
61+
ENTRYPOINT ["docker-entrypoint.sh"]
4362

4463
EXPOSE 3306
4564
CMD ["mysqld"]

‎5.6/docker-entrypoint.sh

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,21 @@ for arg; do
1717
esac
1818
done
1919

20+
_datadir() {
21+
"$@" --verbose --help --log-bin-index=`mktemp -u` 2>/dev/null | awk '$1 == "datadir" { print $2; exit }'
22+
}
23+
24+
# allow the container to be started with `--user`
25+
if [ "$1" = 'mysqld' -a -z "$wantHelp" -a "$(id -u)" = '0' ]; then
26+
DATADIR="$(_datadir "$@")"
27+
mkdir -p "$DATADIR"
28+
chown -R mysql:mysql "$DATADIR"
29+
exec gosu mysql "$BASH_SOURCE" "$@"
30+
fi
31+
2032
if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
2133
# Get config
22-
DATADIR="$("$@" --verbose --help --log-bin-index=`mktemp -u` 2>/dev/null | awk '$1 == "datadir" { print $2; exit }')"
34+
DATADIR="$(_datadir "$@")"
2335

2436
if [ ! -d "$DATADIR/mysql" ]; then
2537
if [ -z "$MYSQL_ROOT_PASSWORD" -a -z "$MYSQL_ALLOW_EMPTY_PASSWORD" -a -z "$MYSQL_RANDOM_ROOT_PASSWORD" ]; then
@@ -29,10 +41,9 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
2941
fi
3042

3143
mkdir -p "$DATADIR"
32-
chown -R mysql:mysql "$DATADIR"
3344

3445
echo 'Initializing database'
35-
mysql_install_db --user=mysql --datadir="$DATADIR" --rpm
46+
mysql_install_db --datadir="$DATADIR" --rpm
3647
echo 'Database initialized'
3748

3849
"$@" --skip-networking &
@@ -112,8 +123,6 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
112123
echo 'MySQL init process done. Ready for start up.'
113124
echo
114125
fi
115-
116-
chown -R mysql:mysql "$DATADIR"
117126
fi
118127

119128
exec "$@"

‎5.7/Dockerfile

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,25 @@ FROM debian:jessie
44
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
55
RUN groupadd -r mysql && useradd -r -g mysql mysql
66

7-
# install "pwgen" for randomizing passwords
8-
RUN apt-get update && apt-get install -y pwgen && rm -rf /var/lib/apt/lists/*
7+
# add gosu for easy step-down from root
8+
ENV GOSU_VERSION 1.7
9+
RUN set -x \
10+
&& apt-get update && apt-get install -y --no-install-recommends ca-certificates wget && rm -rf /var/lib/apt/lists/* \
11+
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
12+
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
13+
&& export GNUPGHOME="$(mktemp -d)" \
14+
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
15+
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
16+
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
17+
&& chmod +x /usr/local/bin/gosu \
18+
&& gosu nobody true \
19+
&& apt-get purge -y --auto-remove ca-certificates wget
920

1021
RUN mkdir /docker-entrypoint-initdb.d
1122

23+
# install "pwgen" for randomizing passwords
24+
RUN apt-get update && apt-get install -y pwgen && rm -rf /var/lib/apt/lists/*
25+
1226
RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A
1327

1428
RUN echo 'deb http://repo.percona.com/apt jessie main' > /etc/apt/sources.list.d/percona.list
@@ -26,8 +40,13 @@ RUN { \
2640
&& apt-get install -y \
2741
percona-server-server-$PERCONA_MAJOR=$PERCONA_VERSION \
2842
&& rm -rf /var/lib/apt/lists/* \
29-
&& rm -rf /var/lib/mysql \
30-
&& mkdir /var/lib/mysql
43+
# comment out any "user" entires in the MySQL config ("docker-entrypoint.sh" or "--user" will handle user switching)
44+
&& sed -ri 's/^user\s/#&/' /etc/mysql/my.cnf \
45+
# purge and re-create /var/lib/mysql with appropriate ownership
46+
&& rm -rf /var/lib/mysql && mkdir -p /var/lib/mysql /var/run/mysqld \
47+
&& chown -R mysql:mysql /var/lib/mysql /var/run/mysqld \
48+
# ensure that /var/run/mysqld (used for socket and lock files) is writable regardless of the UID our mysqld instance ends up having at runtime
49+
&& chmod 777 /var/run/mysqld
3150

3251
# comment out a few problematic configuration values
3352
# don't reverse lookup hostnames, they are usually another container
@@ -37,9 +56,9 @@ RUN sed -Ei 's/^(bind-address|log)/#&/' /etc/mysql/my.cnf \
3756

3857
VOLUME ["/var/lib/mysql", "/var/log/mysql"]
3958

40-
COPY docker-entrypoint.sh /
41-
42-
ENTRYPOINT ["/docker-entrypoint.sh"]
59+
COPY docker-entrypoint.sh /usr/local/bin/
60+
RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
61+
ENTRYPOINT ["docker-entrypoint.sh"]
4362

4463
EXPOSE 3306
4564
CMD ["mysqld"]

‎5.7/docker-entrypoint.sh

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,21 @@ for arg; do
1717
esac
1818
done
1919

20+
_datadir() {
21+
"$@" --verbose --help 2>/dev/null | awk '$1 == "datadir" { print $2; exit }'
22+
}
23+
24+
# allow the container to be started with `--user`
25+
if [ "$1" = 'mysqld' -a -z "$wantHelp" -a "$(id -u)" = '0' ]; then
26+
DATADIR="$(_datadir "$@")"
27+
mkdir -p "$DATADIR"
28+
chown -R mysql:mysql "$DATADIR"
29+
exec gosu mysql "$BASH_SOURCE" "$@"
30+
fi
31+
2032
if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
2133
# Get config
22-
DATADIR="$("$@" --verbose --help 2>/dev/null | awk '$1 == "datadir" { print $2; exit }')"
34+
DATADIR="$(_datadir "$@")"
2335

2436
if [ ! -d "$DATADIR/mysql" ]; then
2537
if [ -z "$MYSQL_ROOT_PASSWORD" -a -z "$MYSQL_ALLOW_EMPTY_PASSWORD" -a -z "$MYSQL_RANDOM_ROOT_PASSWORD" ]; then
@@ -29,7 +41,6 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
2941
fi
3042

3143
mkdir -p "$DATADIR"
32-
chown -R mysql:mysql "$DATADIR"
3344

3445
echo 'Initializing database'
3546
"$@" --initialize-insecure
@@ -117,8 +128,6 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
117128
echo 'MySQL init process done. Ready for start up.'
118129
echo
119130
fi
120-
121-
chown -R mysql:mysql "$DATADIR"
122131
fi
123132

124133
exec "$@"

‎Dockerfile.template

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,25 @@ FROM debian:jessie
44
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
55
RUN groupadd -r mysql && useradd -r -g mysql mysql
66

7-
# install "pwgen" for randomizing passwords
8-
RUN apt-get update && apt-get install -y pwgen && rm -rf /var/lib/apt/lists/*
7+
# add gosu for easy step-down from root
8+
ENV GOSU_VERSION 1.7
9+
RUN set -x \
10+
&& apt-get update && apt-get install -y --no-install-recommends ca-certificates wget && rm -rf /var/lib/apt/lists/* \
11+
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
12+
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
13+
&& export GNUPGHOME="$(mktemp -d)" \
14+
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
15+
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
16+
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
17+
&& chmod +x /usr/local/bin/gosu \
18+
&& gosu nobody true \
19+
&& apt-get purge -y --auto-remove ca-certificates wget
920

1021
RUN mkdir /docker-entrypoint-initdb.d
1122

23+
# install "pwgen" for randomizing passwords
24+
RUN apt-get update && apt-get install -y pwgen && rm -rf /var/lib/apt/lists/*
25+
1226
RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A
1327

1428
RUN echo 'deb http://repo.percona.com/apt jessie main' > /etc/apt/sources.list.d/percona.list
@@ -26,8 +40,13 @@ RUN { \
2640
&& apt-get install -y \
2741
percona-server-server-$PERCONA_MAJOR=$PERCONA_VERSION \
2842
&& rm -rf /var/lib/apt/lists/* \
29-
&& rm -rf /var/lib/mysql \
30-
&& mkdir /var/lib/mysql
43+
# comment out any "user" entires in the MySQL config ("docker-entrypoint.sh" or "--user" will handle user switching)
44+
&& sed -ri 's/^user\s/#&/' /etc/mysql/my.cnf \
45+
# purge and re-create /var/lib/mysql with appropriate ownership
46+
&& rm -rf /var/lib/mysql && mkdir -p /var/lib/mysql /var/run/mysqld \
47+
&& chown -R mysql:mysql /var/lib/mysql /var/run/mysqld \
48+
# ensure that /var/run/mysqld (used for socket and lock files) is writable regardless of the UID our mysqld instance ends up having at runtime
49+
&& chmod 777 /var/run/mysqld
3150

3251
# comment out a few problematic configuration values
3352
# don't reverse lookup hostnames, they are usually another container
@@ -37,9 +56,9 @@ RUN sed -Ei 's/^(bind-address|log)/#&/' /etc/mysql/my.cnf \
3756

3857
VOLUME ["/var/lib/mysql", "/var/log/mysql"]
3958

40-
COPY docker-entrypoint.sh /
41-
42-
ENTRYPOINT ["/docker-entrypoint.sh"]
59+
COPY docker-entrypoint.sh /usr/local/bin/
60+
RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
61+
ENTRYPOINT ["docker-entrypoint.sh"]
4362

4463
EXPOSE 3306
4564
CMD ["mysqld"]

0 commit comments

Comments
 (0)