From 0f130d2ee9a6988243eb5690930370586f416be7 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Tue, 22 Jan 2019 12:42:13 +0100 Subject: [PATCH 1/3] Use official php image as base --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c98bcfe..d205a7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,9 +3,9 @@ ARG DOMAIN=welcome.ecloud.global LABEL maintainer "thilo@e.email" RUN mkdir -p /home/www-data/.ssh && chown www-data:www-data /home/www-data/ -R \ && chmod 700 /home/www-data/.ssh -COPY scripts/createAccount.sh /var/script +COPY scripts/createAccount.sh /var/script/ COPY htdocs /var/www/${DOMAIN}/htdocs RUN chown www-data:www-data /var/script /var/www -R && chmod +x /var/script/createAccount.sh && \ mkdir -p /home/www-data/.ssh && chown www-data:www-data /home/www-data/ -R \ && chmod 700 /home/www-data/.ssh -RUN apt-get install php-pear && pear install mail && pear install Net_SMTP && pear install Auth_SASL && pear install mail_mime +RUN pear install mail && pear install Net_SMTP && pear install Auth_SASL && pear install mail_mime -- GitLab From a95b7572c48303ee70b64ee588305e520ea5453b Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Wed, 23 Jan 2019 09:47:52 +0100 Subject: [PATCH 2/3] Actually change base image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d205a7d..d5a13f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.e.foundation:5000/e/infra/docker-phpbase +FROM php:7.3.1-apache-stretch ARG DOMAIN=welcome.ecloud.global LABEL maintainer "thilo@e.email" RUN mkdir -p /home/www-data/.ssh && chown www-data:www-data /home/www-data/ -R \ -- GitLab From 2447933215566f3ae0cd93cc6e5d00bbf8d93f69 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Thu, 24 Jan 2019 10:32:25 +0100 Subject: [PATCH 3/3] only specify major version for base image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d5a13f0..94f8d29 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.3.1-apache-stretch +FROM php:7-apache-stretch ARG DOMAIN=welcome.ecloud.global LABEL maintainer "thilo@e.email" RUN mkdir -p /home/www-data/.ssh && chown www-data:www-data /home/www-data/ -R \ -- GitLab