From e794a963e8092889c25fd52c9640d3542eb5b107 Mon Sep 17 00:00:00 2001 From: bkraul Date: Thu, 10 Oct 2019 16:56:20 -0500 Subject: [PATCH] Split versions --- fpm-alpine/{ => 16}/Dockerfile | 4 ++-- fpm-alpine/16/build | 6 ++++++ fpm-alpine/16/push | 4 ++++ fpm-alpine/{ => 16}/push-local | 0 fpm-alpine/{ => 16}/redis.config.php | 0 fpm-alpine/{ => 16}/tag-local | 0 fpm-alpine/17/Dockerfile | 22 ++++++++++++++++++++++ fpm-alpine/{ => 17}/build | 3 ++- fpm-alpine/{ => 17}/push | 1 + fpm-alpine/17/push-local | 5 +++++ fpm-alpine/17/redis.config.php | 8 ++++++++ fpm-alpine/17/tag-local | 2 ++ 12 files changed, 52 insertions(+), 3 deletions(-) rename fpm-alpine/{ => 16}/Dockerfile (93%) create mode 100755 fpm-alpine/16/build create mode 100755 fpm-alpine/16/push rename fpm-alpine/{ => 16}/push-local (100%) rename fpm-alpine/{ => 16}/redis.config.php (100%) rename fpm-alpine/{ => 16}/tag-local (100%) create mode 100644 fpm-alpine/17/Dockerfile rename fpm-alpine/{ => 17}/build (56%) rename fpm-alpine/{ => 17}/push (67%) create mode 100755 fpm-alpine/17/push-local create mode 100644 fpm-alpine/17/redis.config.php create mode 100755 fpm-alpine/17/tag-local diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/16/Dockerfile similarity index 93% rename from fpm-alpine/Dockerfile rename to fpm-alpine/16/Dockerfile index 1244f03..9b35f3f 100644 --- a/fpm-alpine/Dockerfile +++ b/fpm-alpine/16/Dockerfile @@ -1,4 +1,4 @@ -FROM nextcloud:fpm-alpine +FROM nextcloud:16-fpm-alpine RUN set -ex; \ apk add --no-cache --virtual .build-deps \ @@ -19,4 +19,4 @@ RUN set -ex; \ apk add --no-cache sudo; \ apk del .build-deps -COPY redis.config.php /usr/src/nextcloud/config/redis.config.php \ No newline at end of file +COPY redis.config.php /usr/src/nextcloud/config/redis.config.php diff --git a/fpm-alpine/16/build b/fpm-alpine/16/build new file mode 100755 index 0000000..d7891c0 --- /dev/null +++ b/fpm-alpine/16/build @@ -0,0 +1,6 @@ +#!/bin/sh + +docker pull nextcloud:16-fpm-alpine +docker build $1\ + -t bkraul/nextcloud:16-fpm-alpine \ + . diff --git a/fpm-alpine/16/push b/fpm-alpine/16/push new file mode 100755 index 0000000..8d5750a --- /dev/null +++ b/fpm-alpine/16/push @@ -0,0 +1,4 @@ +#!/bin/sh + +docker push bkraul/nextcloud:16-fpm-alpine + diff --git a/fpm-alpine/push-local b/fpm-alpine/16/push-local similarity index 100% rename from fpm-alpine/push-local rename to fpm-alpine/16/push-local diff --git a/fpm-alpine/redis.config.php b/fpm-alpine/16/redis.config.php similarity index 100% rename from fpm-alpine/redis.config.php rename to fpm-alpine/16/redis.config.php diff --git a/fpm-alpine/tag-local b/fpm-alpine/16/tag-local similarity index 100% rename from fpm-alpine/tag-local rename to fpm-alpine/16/tag-local diff --git a/fpm-alpine/17/Dockerfile b/fpm-alpine/17/Dockerfile new file mode 100644 index 0000000..feec892 --- /dev/null +++ b/fpm-alpine/17/Dockerfile @@ -0,0 +1,22 @@ +FROM nextcloud:17-fpm-alpine + +RUN set -ex; \ + apk add --no-cache --virtual .build-deps \ + autoconf \ + automake \ + file \ + g++ \ + gcc \ + make \ + php7-dev \ + re2c \ + samba-dev \ + zlib-dev; \ + apk add --no-cache libsmbclient; \ + pecl install smbclient; \ + docker-php-ext-enable smbclient; \ + apk add --no-cache imagemagick; \ + apk add --no-cache sudo; \ + apk del .build-deps + +COPY redis.config.php /usr/src/nextcloud/config/redis.config.php diff --git a/fpm-alpine/build b/fpm-alpine/17/build similarity index 56% rename from fpm-alpine/build rename to fpm-alpine/17/build index 303e43e..8e0d02e 100755 --- a/fpm-alpine/build +++ b/fpm-alpine/17/build @@ -1,7 +1,8 @@ #!/bin/sh -docker pull nextcloud:fpm-alpine +docker pull nextcloud:17-fpm-alpine docker build $1\ -t bkraul/nextcloud:latest \ -t bkraul/nextcloud:fpm-alpine \ + -t bkraul/nextcloud:17-fpm-alpine \ . diff --git a/fpm-alpine/push b/fpm-alpine/17/push similarity index 67% rename from fpm-alpine/push rename to fpm-alpine/17/push index 88081d0..852a4a4 100755 --- a/fpm-alpine/push +++ b/fpm-alpine/17/push @@ -2,4 +2,5 @@ docker push bkraul/nextcloud:latest docker push bkraul/nextcloud:fpm-alpine +docker push bkraul/nextcloud:17-fpm-alpine diff --git a/fpm-alpine/17/push-local b/fpm-alpine/17/push-local new file mode 100755 index 0000000..6d77042 --- /dev/null +++ b/fpm-alpine/17/push-local @@ -0,0 +1,5 @@ +#!/bin/sh + +docker push docker-registry.belmankraul.com/bkraul/nextcloud:latest +docker push docker-registry.belmankraul.com/bkraul/nextcloud:fpm-alpine + diff --git a/fpm-alpine/17/redis.config.php b/fpm-alpine/17/redis.config.php new file mode 100644 index 0000000..b0cebe3 --- /dev/null +++ b/fpm-alpine/17/redis.config.php @@ -0,0 +1,8 @@ + '\OC\Memcache\Redis', + 'redis' => array( + 'host' => 'redis', + 'port' => 6379, + ), +); diff --git a/fpm-alpine/17/tag-local b/fpm-alpine/17/tag-local new file mode 100755 index 0000000..f159b9d --- /dev/null +++ b/fpm-alpine/17/tag-local @@ -0,0 +1,2 @@ +docker tag bkraul/nextcloud:latest docker-registry.belmankraul.com/bkraul/nextcloud:latest +docker tag bkraul/nextcloud:fpm-alpine docker-registry.belmankraul.com/bkraul/nextcloud:fpm-alpine