Skip to content

Commit 61c4739

Browse files
committed
Removed non-working mariadb-server
1 parent fa3bce8 commit 61c4739

File tree

1 file changed

+3
-34
lines changed

1 file changed

+3
-34
lines changed

Dockerfile

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,10 @@ FROM php:7.2
22

33
RUN apt update && apt install gnupg -y
44

5-
ARG DEBIAN_FRONTEND=noninteractive
6-
7-
# Install MariaDB, partly taken from https://github.com/docker-library/mariadb/blob/master/10.3/Dockerfile
8-
RUN groupadd -r mysql && useradd -r -g mysql mysql
95
ENV APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1
106
RUN apt install software-properties-common dirmngr -y \
117
&& apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8 \
12-
&& add-apt-repository 'deb [arch=amd64,i386,ppc64el] http://ftp.ddg.lth.se/mariadb/repo/10.3/debian stretch main' \
13-
&& { \
14-
echo 'Package: *'; \
15-
echo 'Pin: release o=MariaDB'; \
16-
echo 'Pin-Priority: 999'; \
17-
} > /etc/apt/preferences.d/mariadb
18-
RUN { \
19-
echo "mariadb-server-10.3" mysql-server/root_password password 'docker'; \
20-
echo "mariadb-server-10.3" mysql-server/root_password_again password 'docker'; \
21-
} | debconf-set-selections \
22-
&& apt-get update \
23-
&& apt-get install -y \
24-
mariadb-server \
25-
mariadb-client \
26-
mysql-common \
27-
libmariadbclient18 \
28-
libmariadb3 \
29-
socat \
30-
# purge and re-create /var/lib/mysql with appropriate ownership
31-
&& rm -rf /var/lib/mysql && mkdir -p /var/lib/mysql /var/run/mysqld \
32-
&& chown -R mysql:mysql /var/lib/mysql /var/run/mysqld \
33-
# 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
34-
&& chmod 777 /var/run/mysqld \
35-
# comment out a few problematic configuration values
36-
&& find /etc/mysql/ -name '*.cnf' -print0 \
37-
| xargs -0 grep -lZE '^(bind-address|log)' \
38-
| xargs -rt -0 sed -Ei 's/^(bind-address|log)/#&/' \
39-
# don't reverse lookup hostnames, they are usually another container
40-
&& echo '[mysqld]\nskip-host-cache\nskip-name-resolve' > /etc/mysql/conf.d/docker.cnf
8+
&& add-apt-repository 'deb [arch=amd64,i386,ppc64el] http://ftp.ddg.lth.se/mariadb/repo/10.3/debian stretch main'
419

4210
RUN curl -sL https://deb.nodesource.com/setup_7.x | bash -
4311
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
@@ -46,7 +14,7 @@ RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources
4614
RUN echo "deb https://artifacts.elastic.co/packages/6.x/apt stable main" | tee -a /etc/apt/sources.list.d/elastic-6.x.list
4715

4816
RUN apt update && apt upgrade -y && mkdir -p /usr/share/man/man1 && apt install openjdk-8-jre -y
49-
RUN apt install git zlibc zlib1g zlib1g-dev libicu-dev libpng-dev nodejs yarn libpcre3-dev optipng elasticsearch -y
17+
RUN apt install mariadb-client git zlibc zlib1g zlib1g-dev libicu-dev libpng-dev nodejs yarn libpcre3-dev optipng elasticsearch -y
5018

5119
RUN mkdir -p /usr/share/man/man1 \
5220
&& apt install procps openjdk-8-jre-headless -yqq \
@@ -84,3 +52,4 @@ RUN echo "date.timezone = Europe/Stockholm" >> /usr/local/etc/php/php.ini \
8452
&& echo "apc.enabled = 1" >> /usr/local/etc/php/php.ini \
8553
&& echo "apc.enable_cli = 1" >> /usr/local/etc/php/php.ini \
8654
&& echo /usr/local/etc/php/php.ini
55+

0 commit comments

Comments
 (0)