Skip to content

Commit

Permalink
Merge pull request #342 from nextcloud/stretch-and-3.7
Browse files Browse the repository at this point in the history 
 Move to a debian stretch and alpine 3.7 based base image
  • Loading branch information
@tilosp
tilosp authored May 24, 2018
2 parents c07de51 + 7a5bf34 commit 81e5468
Show file tree
Hide file tree
Showing 8 changed files with 68 additions and 18 deletions.
16 changes: 13 additions & 3 deletions 12.0/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.1-apache
FROM php:7.1-apache-stretch

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down Expand Up @@ -30,7 +30,7 @@ RUN set -ex; \
libldap2-dev \
libmcrypt-dev \
libmemcached-dev \
libpng12-dev \
libpng-dev \
libpq-dev \
libxml2-dev \
; \
Expand Down Expand Up @@ -105,6 +105,13 @@ RUN a2enmod rewrite remoteip ;\
ENV NEXTCLOUD_VERSION 12.0.7

RUN set -ex; \
fetchDeps=" \
gnupg \
dirmngr \
"; \
apt-get update; \
apt-get install -y --no-install-recommends $fetchDeps; \
\
curl -fsSL -o nextcloud.tar.bz2 \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
curl -fsSL -o nextcloud.tar.bz2.asc \
Expand All @@ -119,7 +126,10 @@ RUN set -ex; \
rm -rf /usr/src/nextcloud/updater; \
mkdir -p /usr/src/nextcloud/data; \
mkdir -p /usr/src/nextcloud/custom_apps; \
chmod +x /usr/src/nextcloud/occ
chmod +x /usr/src/nextcloud/occ; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
rm -rf /var/lib/apt/lists/*

COPY *.sh /
COPY config/* /usr/src/nextcloud/config/
Expand Down
2 changes: 1 addition & 1 deletion 12.0/fpm-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
FROM php:7.1-fpm-alpine
FROM php:7.1-fpm-alpine3.7

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down
16 changes: 13 additions & 3 deletions 12.0/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.1-fpm
FROM php:7.1-fpm-stretch

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down Expand Up @@ -30,7 +30,7 @@ RUN set -ex; \
libldap2-dev \
libmcrypt-dev \
libmemcached-dev \
libpng12-dev \
libpng-dev \
libpq-dev \
libxml2-dev \
; \
Expand Down Expand Up @@ -97,6 +97,13 @@ VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 12.0.7

RUN set -ex; \
fetchDeps=" \
gnupg \
dirmngr \
"; \
apt-get update; \
apt-get install -y --no-install-recommends $fetchDeps; \
\
curl -fsSL -o nextcloud.tar.bz2 \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
curl -fsSL -o nextcloud.tar.bz2.asc \
Expand All @@ -111,7 +118,10 @@ RUN set -ex; \
rm -rf /usr/src/nextcloud/updater; \
mkdir -p /usr/src/nextcloud/data; \
mkdir -p /usr/src/nextcloud/custom_apps; \
chmod +x /usr/src/nextcloud/occ
chmod +x /usr/src/nextcloud/occ; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
rm -rf /var/lib/apt/lists/*

COPY *.sh /
COPY config/* /usr/src/nextcloud/config/
Expand Down
16 changes: 13 additions & 3 deletions 13.0/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.1-apache
FROM php:7.1-apache-stretch

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down Expand Up @@ -30,7 +30,7 @@ RUN set -ex; \
libldap2-dev \
libmcrypt-dev \
libmemcached-dev \
libpng12-dev \
libpng-dev \
libpq-dev \
libxml2-dev \
; \
Expand Down Expand Up @@ -105,6 +105,13 @@ RUN a2enmod rewrite remoteip ;\
ENV NEXTCLOUD_VERSION 13.0.2

RUN set -ex; \
fetchDeps=" \
gnupg \
dirmngr \
"; \
apt-get update; \
apt-get install -y --no-install-recommends $fetchDeps; \
\
curl -fsSL -o nextcloud.tar.bz2 \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
curl -fsSL -o nextcloud.tar.bz2.asc \
Expand All @@ -119,7 +126,10 @@ RUN set -ex; \
rm -rf /usr/src/nextcloud/updater; \
mkdir -p /usr/src/nextcloud/data; \
mkdir -p /usr/src/nextcloud/custom_apps; \
chmod +x /usr/src/nextcloud/occ
chmod +x /usr/src/nextcloud/occ; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
rm -rf /var/lib/apt/lists/*

COPY *.sh /
COPY config/* /usr/src/nextcloud/config/
Expand Down
2 changes: 1 addition & 1 deletion 13.0/fpm-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
FROM php:7.1-fpm-alpine
FROM php:7.1-fpm-alpine3.7

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down
16 changes: 13 additions & 3 deletions 13.0/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.1-fpm
FROM php:7.1-fpm-stretch

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down Expand Up @@ -30,7 +30,7 @@ RUN set -ex; \
libldap2-dev \
libmcrypt-dev \
libmemcached-dev \
libpng12-dev \
libpng-dev \
libpq-dev \
libxml2-dev \
; \
Expand Down Expand Up @@ -97,6 +97,13 @@ VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 13.0.2

RUN set -ex; \
fetchDeps=" \
gnupg \
dirmngr \
"; \
apt-get update; \
apt-get install -y --no-install-recommends $fetchDeps; \
\
curl -fsSL -o nextcloud.tar.bz2 \
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
curl -fsSL -o nextcloud.tar.bz2.asc \
Expand All @@ -111,7 +118,10 @@ RUN set -ex; \
rm -rf /usr/src/nextcloud/updater; \
mkdir -p /usr/src/nextcloud/data; \
mkdir -p /usr/src/nextcloud/custom_apps; \
chmod +x /usr/src/nextcloud/occ
chmod +x /usr/src/nextcloud/occ; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
rm -rf /var/lib/apt/lists/*

COPY *.sh /
COPY config/* /usr/src/nextcloud/config/
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-alpine.template
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:%%PHP_VERSION%%-%%VARIANT%%
FROM php:%%PHP_VERSION%%-%%VARIANT%%3.7

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down
16 changes: 13 additions & 3 deletions Dockerfile-debian.template
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:%%PHP_VERSION%%-%%VARIANT%%
FROM php:%%PHP_VERSION%%-%%VARIANT%%-stretch

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down Expand Up @@ -29,7 +29,7 @@ RUN set -ex; \
libldap2-dev \
libmcrypt-dev \
libmemcached-dev \
libpng12-dev \
libpng-dev \
libpq-dev \
libxml2-dev \
; \
Expand Down Expand Up @@ -96,6 +96,13 @@ VOLUME /var/www/html
ENV NEXTCLOUD_VERSION %%VERSION%%

RUN set -ex; \
fetchDeps=" \
gnupg \
dirmngr \
"; \
apt-get update; \
apt-get install -y --no-install-recommends $fetchDeps; \
\
curl -fsSL -o nextcloud.tar.bz2 \
"%%BASE_DOWNLOAD_URL%%/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
curl -fsSL -o nextcloud.tar.bz2.asc \
Expand All @@ -110,7 +117,10 @@ RUN set -ex; \
rm -rf /usr/src/nextcloud/updater; \
mkdir -p /usr/src/nextcloud/data; \
mkdir -p /usr/src/nextcloud/custom_apps; \
chmod +x /usr/src/nextcloud/occ
chmod +x /usr/src/nextcloud/occ; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
rm -rf /var/lib/apt/lists/*

COPY *.sh /
COPY config/* /usr/src/nextcloud/config/
Expand Down

0 comments on commit 81e5468

Please sign in to comment.