aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-03-15 19:05:09 +01:00
Code Activity

On branch apache-ssl

Browse source 
Changes to be committed:
	modified:   13.0/apache/Dockerfile
	modified:   13.0/apache/entrypoint.sh
	modified:   13.0/fpm-alpine/entrypoint.sh
	modified:   13.0/fpm/Dockerfile
	modified:   13.0/fpm/entrypoint.sh
	modified:   14.0/apache/Dockerfile
	modified:   14.0/apache/entrypoint.sh
	modified:   14.0/fpm-alpine/entrypoint.sh
	modified:   14.0/fpm/Dockerfile
	modified:   14.0/fpm/entrypoint.sh
	modified:   15.0/apache/Dockerfile
	modified:   15.0/apache/entrypoint.sh
	modified:   15.0/fpm-alpine/entrypoint.sh
	modified:   15.0/fpm/Dockerfile
	modified:   15.0/fpm/entrypoint.sh
	modified:   Dockerfile-debian.template
	modified:   docker-entrypoint.sh

 Untracked files:
	.config/000-default.conf
	13.0/apache/config/000-default.conf
	13.0/fpm-alpine/config/000-default.conf
	13.0/fpm/config/000-default.conf
	14.0/apache/config/000-default.conf
	14.0/fpm-alpine/config/000-default.conf
	14.0/fpm/config/000-default.conf
	15.0/apache/config/000-default.conf
	15.0/fpm-alpine/config/000-default.conf
	15.0/fpm/config/000-default.conf

Signed-off-by: marceljd <support@dihosting.ch>
This commit is contained in:
marceljd 2019-02-07 14:42:44 +00:00
parent fb9aa3255f
commit 7594ff380a
17 changed files with 38 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
13.0/apache/Dockerfile
View file

@ -138,9 +138,12 @@ RUN set -ex; \
\ \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
\
mkdir -p /usr/src/apache
COPY *.sh upgrade.exclude / COPY *.sh upgrade.exclude /
COPY config/* /usr/src/nextcloud/config/ COPY config/*.php /usr/src/nextcloud/config/
COPY config/000-default.conf /usr/src/apache/
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["apache2-foreground"] CMD ["apache2-foreground"]

2
13.0/apache/entrypoint.sh
View file

@ -138,7 +138,7 @@ fi
openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
mkdir -p /etc/apache2/ssl mkdir -p /etc/apache2/ssl
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/ mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
## einde SSL toevoegingen ## einde SSL toevoegingen
exec "$@" exec "$@"

2
13.0/fpm-alpine/entrypoint.sh
View file

@ -138,7 +138,7 @@ fi
openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
mkdir -p /etc/apache2/ssl mkdir -p /etc/apache2/ssl
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/ mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
## einde SSL toevoegingen ## einde SSL toevoegingen
exec "$@" exec "$@"

5
13.0/fpm/Dockerfile
View file

@ -130,9 +130,12 @@ RUN set -ex; \
\ \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
\
mkdir -p /usr/src/apache
COPY *.sh upgrade.exclude / COPY *.sh upgrade.exclude /
COPY config/* /usr/src/nextcloud/config/ COPY config/*.php /usr/src/nextcloud/config/
COPY config/000-default.conf /usr/src/apache/
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["php-fpm"] CMD ["php-fpm"]

2
13.0/fpm/entrypoint.sh
View file

@ -138,7 +138,7 @@ fi
openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
mkdir -p /etc/apache2/ssl mkdir -p /etc/apache2/ssl
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/ mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
## einde SSL toevoegingen ## einde SSL toevoegingen
exec "$@" exec "$@"

5
14.0/apache/Dockerfile
View file

@ -138,9 +138,12 @@ RUN set -ex; \
\ \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
\
mkdir -p /usr/src/apache
COPY *.sh upgrade.exclude / COPY *.sh upgrade.exclude /
COPY config/* /usr/src/nextcloud/config/ COPY config/*.php /usr/src/nextcloud/config/
COPY config/000-default.conf /usr/src/apache/
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["apache2-foreground"] CMD ["apache2-foreground"]

2
14.0/apache/entrypoint.sh
View file

@ -138,7 +138,7 @@ fi
openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
mkdir -p /etc/apache2/ssl mkdir -p /etc/apache2/ssl
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/ mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
## einde SSL toevoegingen ## einde SSL toevoegingen
exec "$@" exec "$@"

2
14.0/fpm-alpine/entrypoint.sh
View file

@ -138,7 +138,7 @@ fi
openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
mkdir -p /etc/apache2/ssl mkdir -p /etc/apache2/ssl
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/ mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
## einde SSL toevoegingen ## einde SSL toevoegingen
exec "$@" exec "$@"

5
14.0/fpm/Dockerfile
View file

@ -130,9 +130,12 @@ RUN set -ex; \
\ \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
\
mkdir -p /usr/src/apache
COPY *.sh upgrade.exclude / COPY *.sh upgrade.exclude /
COPY config/* /usr/src/nextcloud/config/ COPY config/*.php /usr/src/nextcloud/config/
COPY config/000-default.conf /usr/src/apache/
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["php-fpm"] CMD ["php-fpm"]

2
14.0/fpm/entrypoint.sh
View file

@ -138,7 +138,7 @@ fi
openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
mkdir -p /etc/apache2/ssl mkdir -p /etc/apache2/ssl
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/ mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
## einde SSL toevoegingen ## einde SSL toevoegingen
exec "$@" exec "$@"

5
15.0/apache/Dockerfile
View file

@ -138,9 +138,12 @@ RUN set -ex; \
\ \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
\
mkdir -p /usr/src/apache
COPY *.sh upgrade.exclude / COPY *.sh upgrade.exclude /
COPY config/* /usr/src/nextcloud/config/ COPY config/*.php /usr/src/nextcloud/config/
COPY config/000-default.conf /usr/src/apache/
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["apache2-foreground"] CMD ["apache2-foreground"]

2
15.0/apache/entrypoint.sh
View file

@ -138,7 +138,7 @@ fi
openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
mkdir -p /etc/apache2/ssl mkdir -p /etc/apache2/ssl
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/ mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
## einde SSL toevoegingen ## einde SSL toevoegingen
exec "$@" exec "$@"

2
15.0/fpm-alpine/entrypoint.sh
View file

@ -138,7 +138,7 @@ fi
openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
mkdir -p /etc/apache2/ssl mkdir -p /etc/apache2/ssl
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/ mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
## einde SSL toevoegingen ## einde SSL toevoegingen
exec "$@" exec "$@"

5
15.0/fpm/Dockerfile
View file

@ -130,9 +130,12 @@ RUN set -ex; \
\ \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
\
mkdir -p /usr/src/apache
COPY *.sh upgrade.exclude / COPY *.sh upgrade.exclude /
COPY config/* /usr/src/nextcloud/config/ COPY config/*.php /usr/src/nextcloud/config/
COPY config/000-default.conf /usr/src/apache/
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["php-fpm"] CMD ["php-fpm"]

2
15.0/fpm/entrypoint.sh
View file

@ -138,7 +138,7 @@ fi
openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
mkdir -p /etc/apache2/ssl mkdir -p /etc/apache2/ssl
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/ mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
## einde SSL toevoegingen ## einde SSL toevoegingen
exec "$@" exec "$@"

5
Dockerfile-debian.template
View file

@ -130,9 +130,12 @@ RUN set -ex; \
\ \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
\
mkdir -p /usr/src/apache
COPY *.sh upgrade.exclude / COPY *.sh upgrade.exclude /
COPY config/* /usr/src/nextcloud/config/ COPY config/*.php /usr/src/nextcloud/config/
COPY config/000-default.conf /usr/src/apache/
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["%%CMD%%"] CMD ["%%CMD%%"]

2
docker-entrypoint.sh
View file

@ -138,7 +138,7 @@ fi
openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
mkdir -p /etc/apache2/ssl mkdir -p /etc/apache2/ssl
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/ mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
## einde SSL toevoegingen ## einde SSL toevoegingen
exec "$@" exec "$@"