From ecb0bb08157142fcd7c0decc0874ea331ed0cbf4 Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Wed, 14 Jan 2015 15:14:22 +0000 Subject: [PATCH] Reorganize some files and import some others --- .gitignore | 1 + bin/build | 2 +- build/Makefile | 31 ++++++++++++++--------- build/config | 5 ++++ build/make/lighttpd-php.mk | 2 ++ build/make/lighttpd.mk | 3 +++ build/make/mysql.mk | 3 +++ build/make/php.mk | 2 ++ build/runit/lighttpd | 7 ++++++ build/runit/mysql | 2 +- build/runit/redis | 1 - build/scripts/cleanup.sh | 2 +- build/scripts/hosts.sh | 6 +++++ build/scripts/lighttpd-php.sh | 8 ++++++ build/scripts/lighttpd.sh | 18 ++++++++++++++ build/scripts/mysql.sh | 19 ++++++++++++++ build/scripts/php.sh | 27 ++++++++++++++++++++ build/scripts/prepare.sh | 6 ++++- build/scripts/utilities.sh | 3 ++- images/{base/Makefile => base.mk} | 0 images/base/Dockerfile | 25 ------------------- images/base/bin/app | 19 -------------- images/base/bin/run | 7 ------ images/base/bin/ssh | 24 ------------------ images/lighttpd/Dockerfile | 41 ------------------------------- images/mysql.mk | 6 +++++ images/mysql/Dockerfile | 25 ------------------- images/phpmyadmin/config.inc.php | 8 ++++++ images/webserver.mk | 6 +++++ 29 files changed, 151 insertions(+), 158 deletions(-) create mode 100644 build/make/lighttpd-php.mk create mode 100644 build/make/lighttpd.mk create mode 100644 build/make/mysql.mk create mode 100644 build/make/php.mk create mode 100644 build/runit/lighttpd create mode 100644 build/scripts/lighttpd-php.sh create mode 100644 build/scripts/lighttpd.sh create mode 100644 build/scripts/mysql.sh create mode 100644 build/scripts/php.sh rename images/{base/Makefile => base.mk} (100%) delete mode 100644 images/base/Dockerfile delete mode 100644 images/base/bin/app delete mode 100644 images/base/bin/run delete mode 100644 images/base/bin/ssh delete mode 100644 images/lighttpd/Dockerfile create mode 100644 images/mysql.mk delete mode 100644 images/mysql/Dockerfile create mode 100644 images/phpmyadmin/config.inc.php create mode 100644 images/webserver.mk diff --git a/.gitignore b/.gitignore index 440ca53..531a271 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ maestro.yaml setup README.md +/build/Dockerfile diff --git a/bin/build b/bin/build index 5107be5..13f438e 100644 --- a/bin/build +++ b/bin/build @@ -1 +1 @@ -make -f $DOCKER_HOME/images/$1/Makefile build +make -f $DOCKER_HOME/images/$1.mk build diff --git a/build/Makefile b/build/Makefile index 41f9758..96f08c4 100644 --- a/build/Makefile +++ b/build/Makefile @@ -1,11 +1,11 @@ +RANDOM = $(shell bash -c 'echo $$RANDOM') HOME = $(DOCKER_HOME) BASE = $(HOME)/build -DIR = $(HOME)/images/$(NAME) -FILE = $(DIR)/Dockerfile +FILE = $(BASE)/Dockerfile FROM = ubuntu:trusty PORT = 8001 MODE = minimal -ARGS = --no-cache --rm=true +ARGS = --rm=true #--no-cache include $(wildcard $(HOME)/build/make/*.mk) @@ -17,27 +17,35 @@ define execute $(call download,-O -,$(1),| bash) endef -define script - $(call execute,scripts/$(1).sh) -endef - define boot $(call download,-O /opt/init.d/$(1)_$(2),boot/$(2).sh) + @echo 'RUN chmod +x /opt/init.d/$(1)_$(2)' >> ${FILE} endef define runit @echo 'RUN mkdir -p /etc/service/$(1)' >> ${FILE} $(call download,-O /etc/service/$(1)/run,runit/$(1)) + @echo 'RUN chmod +x /etc/service/$(1)/run' >> ${FILE} +endef + +define script + $(call execute,scripts/$(1).sh) +endef + +define script_force + $(call execute,scripts/$(1).sh?random=$(RANDOM)) endef all: build bin service clean build: prepare $(call script,cleanup) + @echo 'RUN chmod +x /opt/init.d/*' >> ${FILE} @echo 'CMD ["/opt/init"]' >> ${FILE} @$(shell cd ${BASE} && python -m SimpleHTTPServer $(PORT) > /dev/null &) - @docker build -t $(NAME):$(VERSION) $(ARGS) ${DIR} - @kill -9 $(lsof -i tcp:8001 -t) + @sleep 2 + @docker build -t $(NAME):$(VERSION) $(ARGS) ${BASE} + @kill -9 $(lsof -i tcp:$(PORT) -t) prepare: @echo FROM $(FROM) > ${FILE} @@ -46,8 +54,9 @@ prepare: @echo ENV HOST_ADDR $(HOST_ADDR) >> ${FILE} @echo ENV HOST_PORT $(PORT) >> ${FILE} @echo 'RUN apt-get install -y wget' >> ${FILE} - $(call download,-P /build,config,) - $(call download,-P /build,init) + $(call download,-P /build,config) + $(call download,-P /opt,init) + @echo 'RUN chmod +x /opt/init' >> ${FILE} $(call script,prepare) service: diff --git a/build/config b/build/config index b5b857d..1317ad2 100644 --- a/build/config +++ b/build/config @@ -11,4 +11,9 @@ apt_get_install_permanent() { apt_get_install_temporary() { echo $@ >> /build/temporary $apt_get_install "$@" +} + +export_env() { + export $1="$2" + echo -n $2 > /etc/container_environment/$1 } \ No newline at end of file diff --git a/build/make/lighttpd-php.mk b/build/make/lighttpd-php.mk new file mode 100644 index 0000000..37ae70f --- /dev/null +++ b/build/make/lighttpd-php.mk @@ -0,0 +1,2 @@ +lighttpd-php: php lighttpd + $(call script_force,$@) \ No newline at end of file diff --git a/build/make/lighttpd.mk b/build/make/lighttpd.mk new file mode 100644 index 0000000..80cb077 --- /dev/null +++ b/build/make/lighttpd.mk @@ -0,0 +1,3 @@ +lighttpd: + $(call script_force,$@) + $(call runit,$@) \ No newline at end of file diff --git a/build/make/mysql.mk b/build/make/mysql.mk new file mode 100644 index 0000000..46a69cf --- /dev/null +++ b/build/make/mysql.mk @@ -0,0 +1,3 @@ +mysql: + $(call script_force,$@) + $(call runit,$@) \ No newline at end of file diff --git a/build/make/php.mk b/build/make/php.mk new file mode 100644 index 0000000..0647c1d --- /dev/null +++ b/build/make/php.mk @@ -0,0 +1,2 @@ +php: + $(call script_force,$@) \ No newline at end of file diff --git a/build/runit/lighttpd b/build/runit/lighttpd new file mode 100644 index 0000000..01ea02b --- /dev/null +++ b/build/runit/lighttpd @@ -0,0 +1,7 @@ +#!/bin/bash +mkdir -p `dirname $LIGHTTPD_LOG` $LIGHTTPD_DOMAINS +chown www-data:www-data `dirname $LIGHTTPD_LOG` +if [[ ! -e $LIGHTTPD_DOMAINS ]]; then + touch $LIGHTTPD_DOMAINS/empty.conf +fi +/usr/sbin/lighttpd -D -f $LIGHTTPD_CONFIG \ No newline at end of file diff --git a/build/runit/mysql b/build/runit/mysql index 4439345..861a8f4 100644 --- a/build/runit/mysql +++ b/build/runit/mysql @@ -13,6 +13,6 @@ if [[ -n "$MYSQL_SETUP" ]]; then until [[ -n $(netstat -an | grep 3306) ]]; do sleep 1 done - mysqladmin -u root password kreeft + mysqladmin -u root password dummy fg fi diff --git a/build/runit/redis b/build/runit/redis index b9195c8..f06c514 100644 --- a/build/runit/redis +++ b/build/runit/redis @@ -1,5 +1,4 @@ #!/bin/sh -echo "$HOST_ADDR host" >> /tmp/hosts mkdir -p `dirname $REDIS_LOG` $REDIS_DATA sysctl vm.overcommit_memory=1 /usr/bin/redis-server $REDIS_CONFIG diff --git a/build/scripts/cleanup.sh b/build/scripts/cleanup.sh index 4d03651..09806d1 100644 --- a/build/scripts/cleanup.sh +++ b/build/scripts/cleanup.sh @@ -5,7 +5,7 @@ set -x ## Remove temporary packages for minimal builds if [ $MODE == "minimal" ]; then - cat /build/temporary | xargs apt-get -y autoremove + cat /build/temporary | xargs apt-get -y --purge autoremove fi ## Clean apt files diff --git a/build/scripts/hosts.sh b/build/scripts/hosts.sh index 2a23e9b..36a5806 100644 --- a/build/scripts/hosts.sh +++ b/build/scripts/hosts.sh @@ -9,5 +9,11 @@ mkdir -p $LD_LIBRARY_PATH cp /lib/x86_64-linux-gnu/libnss_files.so.2 $LD_LIBRARY_PATH sed -i 's,/etc/hosts,/tmp/hosts,' $LD_LIBRARY_PATH/libnss_files.so.2 +## Other commands +# ENV LD_LIBRARY_PATH /root/lib +# RUN mkdir $LD_LIBRARY_PATH +# RUN cp /lib/x86_64-linux-gnu/libnss_files.so.2 $LD_LIBRARY_PATH +# RUN perl -pi -e 's:/etc/hosts:/tmp/hosts:g' $LD_LIBRARY_PATH/libnss_files.so.2 + ## Environment variable echo -n $LD_LIBRARY_PATH > /etc/container_environment/LD_LIBRARY_PATH \ No newline at end of file diff --git a/build/scripts/lighttpd-php.sh b/build/scripts/lighttpd-php.sh new file mode 100644 index 0000000..c4349f5 --- /dev/null +++ b/build/scripts/lighttpd-php.sh @@ -0,0 +1,8 @@ +#!/bin/bash +set -e +source /build/config +set -x + +## Enable configuration PHP in Lighttpd +ln -s /etc/lighttpd/conf-available/10-fastcgi.conf /etc/lighttpd/conf-enabled/10-fastcgi.conf +ln -s /etc/lighttpd/conf-available/15-fastcgi-php.conf /etc/lighttpd/conf-enabled/15-fastcgi-php.conf diff --git a/build/scripts/lighttpd.sh b/build/scripts/lighttpd.sh new file mode 100644 index 0000000..8357cd2 --- /dev/null +++ b/build/scripts/lighttpd.sh @@ -0,0 +1,18 @@ +#!/bin/bash +set -e +source /build/config +set -x + +## Lighthttpd +apt_get_install_permanent lighttpd + +## Environment +export_env LIGHTTPD_CONFIG /etc/lighttpd/lighttpd.conf +export_env LIGHTTPD_DOMAINS /host/etc/lighttpd +export_env LIGHTTPD_LOG /host/var/log/lighttpd/error.log +export_env LIGHTTPD_DATA /host/var/www/global + +## Configuration +sed -i "s,^\(server.errorlog\s*=\s*\).*$,\1\"$LIGHTTPD_LOG\"," $LIGHTTPD_CONFIG +sed -i "s,^\(server.document-root\s*=\s*\).*$,\1\"$LIGHTTPD_DATA\"," $LIGHTTPD_CONFIG +echo "include_shell \"cat $LIGHTTPD_DOMAINS/*.conf\"" >> $LIGHTTPD_CONFIG diff --git a/build/scripts/mysql.sh b/build/scripts/mysql.sh new file mode 100644 index 0000000..f27c657 --- /dev/null +++ b/build/scripts/mysql.sh @@ -0,0 +1,19 @@ +#!/bin/bash +set -e +source /build/config +set -x + +## MySQL +debconf-set-selections <<< 'mysql-server mysql-server/root_password password dummy' +debconf-set-selections <<< 'mysql-server mysql-server/root_password_again password dummy' +apt_get_install_permanent mysql-server + +## Environment +export_env MYSQL_CONFIG /etc/mysql/my.cnf +export_env MYSQL_LOG /host/var/log/mysql/error.log +export_env MYSQL_DATA /host/var/lib/mysql + +## Configuration +sed -i "s,^\(log_error\s*=\s*\).*$,\1$MYSQL_LOG," $MYSQL_CONFIG +sed -i "s,^\(datadir\s*=\s*\).*$,\1$MYSQL_DATA," $MYSQL_CONFIG +sed -i "s,^\(bind-address\s*=\s*\).*$,\10.0.0.0," $MYSQL_CONFIG diff --git a/build/scripts/php.sh b/build/scripts/php.sh new file mode 100644 index 0000000..1a013fc --- /dev/null +++ b/build/scripts/php.sh @@ -0,0 +1,27 @@ +#!/bin/bash +set -e +source /build/config +set -x + +## Environment +export_env PHP_VERSION 5.6.4 +export_env PHP_CONFIG /usr/local/lib/php.ini +export_env PHP_TIMEZONE Europe/Amsterdam + +## PHP +apt_get_install_temporary gcc make +cd /opt +#wget http://ftp.us.debian.org/debian/pool/main/l/linux/linux-libc-dev_3.2.54-2_amd64.deb +#dpkg -i linux-libc-dev_3.2.54-2_amd64.deb +apt_get_install_permanent libxml2-dev libcurl4-openssl-dev libbz2-dev libjpeg-dev libpng12-dev libmcrypt-dev +wget http://uk1.php.net/get/php-$PHP_VERSION.tar.gz/from/this/mirror -O php-$PHP_VERSION.tar.gz && \ +tar xzf php-$PHP_VERSION.tar.gz && \ +cd php-$PHP_VERSION +./configure --enable-calendar --enable-bcmath --with-bz2 --enable-ctype --without-gdbm --with-iconv --enable-exif --enable-ftp --with-gettext --enable-mbstring --enable-sockets --with-zlib --enable-soap --enable-zip --with-mhash --with-curl --with-gd --with-mysql --with-jpeg-dir --with-openssl --with-mysqli --with-mcrypt +make +make install + +## Configuration +cp /opt/php-$PHP_VERSION/php.ini-production $PHP_CONFIG +sed -i "s,^;\(date\.timezone\s*=\s*\)$,\1 $PHP_TIMEZONE," $PHP_CONFIG +ln -s /usr/local/bin/php-cgi /usr/bin/php-cgi \ No newline at end of file diff --git a/build/scripts/prepare.sh b/build/scripts/prepare.sh index a3f5f7d..63a1c7c 100644 --- a/build/scripts/prepare.sh +++ b/build/scripts/prepare.sh @@ -30,11 +30,15 @@ ln -sf /bin/true /sbin/initctl dpkg-divert --local --rename --add /usr/bin/ischroot ln -sf /bin/true /usr/bin/ischroot +## Fix known issue with user accounts +## https://github.com/docker/docker/issues/6345#issuecomment-49245365 +ln -sf /bin/true /usr/bin/chfn + ## Install HTTPS support for APT apt_get_install_permanent apt-transport-https ## Upgrade all packages -#apt-get dist-upgrade -y --no-install-recommends +apt-get dist-upgrade -y --no-install-recommends ## Fix locale apt_get_install_permanent language-pack-en diff --git a/build/scripts/utilities.sh b/build/scripts/utilities.sh index 8191f80..d9570a6 100644 --- a/build/scripts/utilities.sh +++ b/build/scripts/utilities.sh @@ -4,7 +4,8 @@ source /build/config set -x ## Often used tools -apt_get_install_temporary curl python-pip git inetutils-ping telnet +apt_get_install_permanent curl python-pip git +apt_get_install_temporary inetutils-ping telnet ## Often used python modules pip install argparse diff --git a/images/base/Makefile b/images/base.mk similarity index 100% rename from images/base/Makefile rename to images/base.mk diff --git a/images/base/Dockerfile b/images/base/Dockerfile deleted file mode 100644 index 447f28b..0000000 --- a/images/base/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM ubuntu:trusty -ENV MODE minimal -ENV HOST_ADDR 10.0.2.15 -ENV HOST_PORT 8001 -RUN apt-get install -y wget -RUN wget -q -P /build $HOST_ADDR:$HOST_PORT/config -RUN wget -q -P /build $HOST_ADDR:$HOST_PORT/init -RUN wget -q -O - $HOST_ADDR:$HOST_PORT/scripts/prepare.sh | bash -RUN wget -q -O - $HOST_ADDR:$HOST_PORT/scripts/cron.sh | bash -RUN mkdir -p /etc/service/cron -RUN wget -q -O /etc/service/cron/run $HOST_ADDR:$HOST_PORT/runit/cron -RUN wget -q -O - $HOST_ADDR:$HOST_PORT/scripts/syslog.sh | bash -RUN mkdir -p /etc/service/syslog -RUN wget -q -O /etc/service/syslog/run $HOST_ADDR:$HOST_PORT/runit/syslog -RUN wget -q -O - $HOST_ADDR:$HOST_PORT/scripts/sshd.sh | bash -RUN mkdir -p /etc/service/sshd -RUN wget -q -O /etc/service/sshd/run $HOST_ADDR:$HOST_PORT/runit/sshd -RUN wget -q -O - $HOST_ADDR:$HOST_PORT/scripts/hosts.sh | bash -RUN wget -q -O /opt/init.d/01_hosts $HOST_ADDR:$HOST_PORT/boot/hosts.sh -RUN wget -q -O - $HOST_ADDR:$HOST_PORT/scripts/init.sh | bash -RUN wget -q -O - $HOST_ADDR:$HOST_PORT/scripts/runit.sh | bash -RUN wget -q -O - $HOST_ADDR:$HOST_PORT/scripts/logrotate.sh | bash -RUN wget -q -O - $HOST_ADDR:$HOST_PORT/scripts/utilities.sh | bash -RUN wget -q -O - $HOST_ADDR:$HOST_PORT/scripts/cleanup.sh | bash -CMD ["/opt/init"] diff --git a/images/base/bin/app b/images/base/bin/app deleted file mode 100644 index 8c823a5..0000000 --- a/images/base/bin/app +++ /dev/null @@ -1,19 +0,0 @@ -ARGS="-v /root/.config/pulse:/root/.config/pulse" -DIR=`dirname $0` -DIR=`readlink -e $DIR` -BASE=`basename $DIR` -IFS='/' read -ra ADDR <<< "$DIR" -CONTAINER=${ADDR[-2]} -while : ; do - ID=`docker ps --no-trunc | grep $CONTAINER: | cut -d' ' -f1` - if [ -n "$ID" ]; then - break - fi - if [ ! -n "$STARTED" ]; then - echo "Starting container." - /opt/docker/bin/run $CONTAINER & - STARTED=yes - sleep 10 - fi -done -/opt/docker/bin/ssh $CONTAINER $1 "source .profile; /opt/$CONTAINER" diff --git a/images/base/bin/run b/images/base/bin/run deleted file mode 100644 index edb24cf..0000000 --- a/images/base/bin/run +++ /dev/null @@ -1,7 +0,0 @@ -ARGS="" -DIR=`dirname $0` -DIR=`readlink -e $DIR` -BASE=`basename $DIR` -IFS='/' read -ra ADDR <<< "$DIR" -CONTAINER=${ADDR[-2]} -/opt/docker/bin/run -t $CONTAINER "$ARGS" $1 "$2" diff --git a/images/base/bin/ssh b/images/base/bin/ssh deleted file mode 100644 index 14a9c00..0000000 --- a/images/base/bin/ssh +++ /dev/null @@ -1,24 +0,0 @@ -ARGS="" -DIR=`dirname $0` -DIR=`readlink -e $DIR` -BASE=`basename $DIR` -IFS='/' read -ra ADDR <<< "$DIR" -CONTAINER=${ADDR[-2]} -ID=`docker ps --no-trunc | grep $CONTAINER: | cut -d' ' -f1` -if [ -n "$ID" ]; then - IP=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' $ID` - COMMAND="ssh -X -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i id_rsa $ARGS root@$IP" - if [ ! -e id_rsa ]; then - docker cp $ID:/opt/id_rsa . - fi - if [ ! -z "$1" ] && [ "$1" == "-l" ]; then - DISPLAY=:0 - chmod 0666 id_rsa - su user -c "$COMMAND \"$2\"" - else - chmod 0600 id_rsa - eval "$COMMAND \"$1\"" - fi -else - echo "Container is not running." -fi \ No newline at end of file diff --git a/images/lighttpd/Dockerfile b/images/lighttpd/Dockerfile deleted file mode 100644 index cddd56d..0000000 --- a/images/lighttpd/Dockerfile +++ /dev/null @@ -1,41 +0,0 @@ -FROM ubuntu:precise - -RUN apt-get update -RUN apt-get install -y wget gcc make - -RUN wget http://ftp.us.debian.org/debian/pool/main/l/linux/linux-libc-dev_3.2.54-2_amd64.deb -RUN dpkg -i linux-libc-dev_3.2.54-2_amd64.deb - -RUN apt-get install -y libxml2-dev libcurl4-openssl-dev libbz2-dev libjpeg-dev libpng12-dev libmcrypt-dev - -ENV PHP_VERSION 5.5.9 - -RUN cd /opt && \ - wget http://uk1.php.net/get/php-$PHP_VERSION.tar.gz/from/this/mirror -O php-$PHP_VERSION.tar.gz && \ - tar xzf php-$PHP_VERSION.tar.gz && \ - cd php-$PHP_VERSION && \ - ./configure --enable-calendar --enable-bcmath --with-bz2 --enable-ctype --without-gdbm --with-iconv --enable-exif --enable-ftp --with-gettext --enable-mbstring --enable-sockets --with-zlib --enable-soap --enable-zip --with-mhash --with-curl --with-gd --with-mysql --with-jpeg-dir --with-openssl --with-mysqli --with-mcrypt && \ - make && \ - make install - -#RUN chmod +x /opt/redis-$PHP_VERSION/src/redis-server - -#ENV REDIS_CONFIG /etc/redis/redis-server.conf -#ENV REDIS_LOG /host/var/log/redis/redis-server.log -#ENV REDIS_DATA /host/var/lib/redis - -#RUN mkdir -p `dirname $REDIS_CONFIG` -#RUN cp /opt/redis-$PHP_VERSION/redis.conf $REDIS_CONFIG -#RUN sed -i "s,^\(logfile\s*\).*$,\1$REDIS_LOG," $REDIS_CONFIG -#RUN sed -i "s,^\(dir\s*\).*$,\1$REDIS_DATA," $REDIS_CONFIG - -VOLUME [ "/host" ] -#EXPOSE 80 - -ENV LD_LIBRARY_PATH /root/lib -RUN mkdir $LD_LIBRARY_PATH -RUN cp /lib/x86_64-linux-gnu/libnss_files.so.2 $LD_LIBRARY_PATH -RUN perl -pi -e 's:/etc/hosts:/tmp/hosts:g' $LD_LIBRARY_PATH/libnss_files.so.2 - -#CMD /host/bin/run -CMD top \ No newline at end of file diff --git a/images/mysql.mk b/images/mysql.mk new file mode 100644 index 0000000..f43e552 --- /dev/null +++ b/images/mysql.mk @@ -0,0 +1,6 @@ +include $(DOCKER_HOME)/build/Makefile + +NAME = mysql +VERSION = latest + +build: base mysql \ No newline at end of file diff --git a/images/mysql/Dockerfile b/images/mysql/Dockerfile deleted file mode 100644 index 76d7338..0000000 --- a/images/mysql/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM ubuntu:precise - -RUN apt-get update -RUN apt-get install -y mysql-server - -ENV VERSION stable - -#RUN chmod +x /opt/redis-$VERSION/src/redis-server - -ENV MYSQL_CONFIG /etc/mysql/my.cnf -ENV MYSQL_LOG /host/var/log/mysql/error.log -ENV MYSQL_DATA /host/var/lib/mysql - -RUN sed -i "s,^\(log_error\s*=\s*\).*$,\1$MYSQL_LOG," $MYSQL_CONFIG -RUN sed -i "s,^\(datadir\s*=\s*\).*$,\1$MYSQL_DATA," $MYSQL_CONFIG - -VOLUME [ "/host" ] -EXPOSE 3306 - -ENV LD_LIBRARY_PATH /root/lib -RUN mkdir $LD_LIBRARY_PATH -RUN cp /lib/x86_64-linux-gnu/libnss_files.so.2 $LD_LIBRARY_PATH -RUN perl -pi -e 's:/etc/hosts:/tmp/hosts:g' $LD_LIBRARY_PATH/libnss_files.so.2 - -CMD /host/bin/run \ No newline at end of file diff --git a/images/phpmyadmin/config.inc.php b/images/phpmyadmin/config.inc.php new file mode 100644 index 0000000..48fc95d --- /dev/null +++ b/images/phpmyadmin/config.inc.php @@ -0,0 +1,8 @@ +