From f03a438ee5b4ee0edfd7da7b77f42b0689bc2b7b Mon Sep 17 00:00:00 2001 From: El RIDO Date: Mon, 28 May 2018 06:44:54 +0200 Subject: [PATCH] deploying PrivateBin with changed path, to keep code and data out of the document root --- Dockerfile | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0806061..dab2b1f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,8 +14,8 @@ RUN \ --with-freetype-dir=/usr/include/ \ --with-png-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \ - && docker-php-ext-install -j$(nproc) gd \ - && apk del --no-cache freetype-dev libpng-dev libjpeg-turbo-dev \ + && docker-php-ext-install -j$(nproc) gd \ + && apk del --no-cache freetype-dev libpng-dev libjpeg-turbo-dev \ # Remove (some of the) default nginx config && rm -f /etc/nginx.conf \ && rm -f /etc/nginx/conf.d/default.conf \ @@ -28,17 +28,27 @@ RUN \ # Create folder where the user hook into our default configs && mkdir -p /etc/nginx/server.d/ \ && mkdir -p /etc/nginx/location.d/ \ -# Remove default content from the default $DOCUMENT_ROOT ... - && rm -rf /var/www \ -# ... but ensure it exists with the right owner - && mkdir -p /var/www \ - && echo " /var/www/index.php \ - && chown -R www-data.www-data /var/www \ # Bring php-fpm configs into a more controallable state && rm /usr/local/etc/php-fpm.d/www.conf.default \ && mv /usr/local/etc/php-fpm.d/docker.conf /usr/local/etc/php-fpm.d/00-docker.conf \ && mv /usr/local/etc/php-fpm.d/www.conf /usr/local/etc/php-fpm.d/10-www.conf \ - && mv /usr/local/etc/php-fpm.d/zz-docker.conf /usr/local/etc/php-fpm.d/20-docker.conf + && mv /usr/local/etc/php-fpm.d/zz-docker.conf /usr/local/etc/php-fpm.d/20-docker.conf \ +# Install PrivateBin + && apk add --no-cache gnupg \ + && cd /tmp \ + && curl -s https://codeload.github.com/PrivateBin/PrivateBin/tar.gz/1.1.1 | tar -xzf - \ + && rm -rf /var/www \ + && mv /tmp/PrivateBin-1.1.1 /var/www \ + && cd /var/www \ + && rm *.md \ + && mv cfg /srv \ + && mv lib /srv \ + && mv tpl /srv \ + && mv vendor /srv \ + && mkdir -p /srv/data \ + && sed -i "s#define('PATH', '');#define('PATH', '/srv/');#" index.php \ + && chown -R www-data.www-data /var/www /srv/* \ + && apk del --no-cache gnupg WORKDIR /var/www @@ -46,7 +56,7 @@ ADD etc/ /etc/ ADD usr/ /usr/ # mark dirs as volumes that need to be writable, allows running the container --read-only -VOLUME /tmp /var/tmp /var/run /var/log +VOLUME /srv/data /srv/cfg/conf.php /tmp /var/tmp /var/run /var/log EXPOSE 80