From aa0795900ae839e45bc99b0babb10c4815391c8c Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 14 Jun 2020 18:41:58 +0200 Subject: [PATCH] Add full-archive deep link --- 2020.03/apache/Dockerfile | 9 +++++---- 2020.03/fpm-alpine/Dockerfile | 9 +++++---- 2020.03/fpm/Dockerfile | 9 +++++---- 2020.06-dev/apache/Dockerfile | 2 ++ 2020.06-dev/fpm-alpine/Dockerfile | 2 ++ 2020.06-dev/fpm/Dockerfile | 2 ++ 2020.06-rc/apache/Dockerfile | 2 ++ 2020.06-rc/fpm-alpine/Dockerfile | 2 ++ 2020.06-rc/fpm/Dockerfile | 2 ++ Dockerfile-alpine.template | 2 ++ Dockerfile-debian.template | 2 ++ update.sh | 7 ++++++- 12 files changed, 37 insertions(+), 13 deletions(-) diff --git a/2020.03/apache/Dockerfile b/2020.03/apache/Dockerfile index f3be4fe..765bf0a 100644 --- a/2020.03/apache/Dockerfile +++ b/2020.03/apache/Dockerfile @@ -131,22 +131,23 @@ RUN set -ex;\ a2enconf remoteip ENV FRIENDICA_VERSION 2020.03 +ENV FRIENDICA_VERSION_YEAR 2020 +ENV FRIENDICA_VERSION_MONTH 03 ENV FRIENDICA_ADDONS 2020.03 RUN set -ex; \ curl -fsSL -o friendica.tar.gz \ - "https://github.com/friendica/friendica/archive/${FRIENDICA_VERSION}.tar.gz"; \ + "https://friendi.ca/wp-content/uploads/${FRIENDICA_VERSION_YEAR}/${FRIENDICA_VERSION_MONTH}/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \ tar -xzf friendica.tar.gz -C /usr/src/; \ rm friendica.tar.gz; \ - mv -f /usr/src/friendica-${FRIENDICA_VERSION}/ /usr/src/friendica; \ + mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica; \ chmod 777 /usr/src/friendica/view/smarty3; \ curl -fsSL -o friendica_addons.tar.gz \ "https://github.com/friendica/friendica-addons/archive/${FRIENDICA_ADDONS}.tar.gz"; \ mkdir -p /usr/src/friendica/proxy; \ mkdir -p /usr/src/friendica/addon; \ tar -xzf friendica_addons.tar.gz -C /usr/src/friendica/addon --strip-components=1; \ - rm friendica_addons.tar.gz; \ - /usr/src/friendica/bin/composer.phar install --no-dev -d /usr/src/friendica; + rm friendica_addons.tar.gz; COPY *.sh upgrade.exclude / COPY config/* /usr/src/friendica/config/ diff --git a/2020.03/fpm-alpine/Dockerfile b/2020.03/fpm-alpine/Dockerfile index 31ac14f..e65423a 100644 --- a/2020.03/fpm-alpine/Dockerfile +++ b/2020.03/fpm-alpine/Dockerfile @@ -99,22 +99,23 @@ VOLUME /var/www/html ENV FRIENDICA_VERSION 2020.03 +ENV FRIENDICA_VERSION_YEAR 2020 +ENV FRIENDICA_VERSION_MONTH 03 ENV FRIENDICA_ADDONS 2020.03 RUN set -ex; \ curl -fsSL -o friendica.tar.gz \ - "https://github.com/friendica/friendica/archive/${FRIENDICA_VERSION}.tar.gz"; \ + "https://friendi.ca/wp-content/uploads/${FRIENDICA_VERSION_YEAR}/${FRIENDICA_VERSION_MONTH}/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \ tar -xzf friendica.tar.gz -C /usr/src/; \ rm friendica.tar.gz; \ - mv -f /usr/src/friendica-${FRIENDICA_VERSION}/ /usr/src/friendica; \ + mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica; \ chmod 777 /usr/src/friendica/view/smarty3; \ curl -fsSL -o friendica_addons.tar.gz \ "https://github.com/friendica/friendica-addons/archive/${FRIENDICA_ADDONS}.tar.gz"; \ mkdir -p /usr/src/friendica/proxy; \ mkdir -p /usr/src/friendica/addon; \ tar -xzf friendica_addons.tar.gz -C /usr/src/friendica/addon --strip-components=1; \ - rm friendica_addons.tar.gz; \ - /usr/src/friendica/bin/composer.phar install --no-dev -d /usr/src/friendica; + rm friendica_addons.tar.gz; COPY *.sh upgrade.exclude / COPY config/* /usr/src/friendica/config/ diff --git a/2020.03/fpm/Dockerfile b/2020.03/fpm/Dockerfile index 546a408..709f697 100644 --- a/2020.03/fpm/Dockerfile +++ b/2020.03/fpm/Dockerfile @@ -122,22 +122,23 @@ VOLUME /var/www/html ENV FRIENDICA_VERSION 2020.03 +ENV FRIENDICA_VERSION_YEAR 2020 +ENV FRIENDICA_VERSION_MONTH 03 ENV FRIENDICA_ADDONS 2020.03 RUN set -ex; \ curl -fsSL -o friendica.tar.gz \ - "https://github.com/friendica/friendica/archive/${FRIENDICA_VERSION}.tar.gz"; \ + "https://friendi.ca/wp-content/uploads/${FRIENDICA_VERSION_YEAR}/${FRIENDICA_VERSION_MONTH}/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \ tar -xzf friendica.tar.gz -C /usr/src/; \ rm friendica.tar.gz; \ - mv -f /usr/src/friendica-${FRIENDICA_VERSION}/ /usr/src/friendica; \ + mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica; \ chmod 777 /usr/src/friendica/view/smarty3; \ curl -fsSL -o friendica_addons.tar.gz \ "https://github.com/friendica/friendica-addons/archive/${FRIENDICA_ADDONS}.tar.gz"; \ mkdir -p /usr/src/friendica/proxy; \ mkdir -p /usr/src/friendica/addon; \ tar -xzf friendica_addons.tar.gz -C /usr/src/friendica/addon --strip-components=1; \ - rm friendica_addons.tar.gz; \ - /usr/src/friendica/bin/composer.phar install --no-dev -d /usr/src/friendica; + rm friendica_addons.tar.gz; COPY *.sh upgrade.exclude / COPY config/* /usr/src/friendica/config/ diff --git a/2020.06-dev/apache/Dockerfile b/2020.06-dev/apache/Dockerfile index 985fdac..66a2500 100644 --- a/2020.06-dev/apache/Dockerfile +++ b/2020.06-dev/apache/Dockerfile @@ -131,6 +131,8 @@ RUN set -ex;\ a2enconf remoteip ENV FRIENDICA_VERSION 2020.06-dev +ENV FRIENDICA_VERSION_YEAR 2020 +ENV FRIENDICA_VERSION_MONTH 06-dev ENV FRIENDICA_ADDONS 2020.06-dev diff --git a/2020.06-dev/fpm-alpine/Dockerfile b/2020.06-dev/fpm-alpine/Dockerfile index 23d4bdd..a9f4450 100644 --- a/2020.06-dev/fpm-alpine/Dockerfile +++ b/2020.06-dev/fpm-alpine/Dockerfile @@ -99,6 +99,8 @@ VOLUME /var/www/html ENV FRIENDICA_VERSION 2020.06-dev +ENV FRIENDICA_VERSION_YEAR 2020 +ENV FRIENDICA_VERSION_MONTH 06-dev ENV FRIENDICA_ADDONS 2020.06-dev diff --git a/2020.06-dev/fpm/Dockerfile b/2020.06-dev/fpm/Dockerfile index 09db36e..e6e91db 100644 --- a/2020.06-dev/fpm/Dockerfile +++ b/2020.06-dev/fpm/Dockerfile @@ -122,6 +122,8 @@ VOLUME /var/www/html ENV FRIENDICA_VERSION 2020.06-dev +ENV FRIENDICA_VERSION_YEAR 2020 +ENV FRIENDICA_VERSION_MONTH 06-dev ENV FRIENDICA_ADDONS 2020.06-dev diff --git a/2020.06-rc/apache/Dockerfile b/2020.06-rc/apache/Dockerfile index 390045b..2166e88 100644 --- a/2020.06-rc/apache/Dockerfile +++ b/2020.06-rc/apache/Dockerfile @@ -131,6 +131,8 @@ RUN set -ex;\ a2enconf remoteip ENV FRIENDICA_VERSION 2020.06-rc +ENV FRIENDICA_VERSION_YEAR 2020 +ENV FRIENDICA_VERSION_MONTH 06-rc ENV FRIENDICA_ADDONS 2020.06-rc diff --git a/2020.06-rc/fpm-alpine/Dockerfile b/2020.06-rc/fpm-alpine/Dockerfile index 330d4b6..ebeb993 100644 --- a/2020.06-rc/fpm-alpine/Dockerfile +++ b/2020.06-rc/fpm-alpine/Dockerfile @@ -99,6 +99,8 @@ VOLUME /var/www/html ENV FRIENDICA_VERSION 2020.06-rc +ENV FRIENDICA_VERSION_YEAR 2020 +ENV FRIENDICA_VERSION_MONTH 06-rc ENV FRIENDICA_ADDONS 2020.06-rc diff --git a/2020.06-rc/fpm/Dockerfile b/2020.06-rc/fpm/Dockerfile index 0fa88ae..ff04dc9 100644 --- a/2020.06-rc/fpm/Dockerfile +++ b/2020.06-rc/fpm/Dockerfile @@ -122,6 +122,8 @@ VOLUME /var/www/html ENV FRIENDICA_VERSION 2020.06-rc +ENV FRIENDICA_VERSION_YEAR 2020 +ENV FRIENDICA_VERSION_MONTH 06-rc ENV FRIENDICA_ADDONS 2020.06-rc diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index f2bb765..af0552b 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -98,6 +98,8 @@ VOLUME /var/www/html %%VARIANT_EXTRAS%% ENV FRIENDICA_VERSION %%VERSION%% +ENV FRIENDICA_VERSION_YEAR %%VERSION_YEAR%% +ENV FRIENDICA_VERSION_MONTH %%VERSION_MONTH%% ENV FRIENDICA_ADDONS %%VERSION%% %%INSTALL_EXTRAS%% diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 2828a03..26622dd 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -121,6 +121,8 @@ VOLUME /var/www/html %%VARIANT_EXTRAS%% ENV FRIENDICA_VERSION %%VERSION%% +ENV FRIENDICA_VERSION_YEAR %%VERSION_YEAR%% +ENV FRIENDICA_VERSION_MONTH %%VERSION_MONTH%% ENV FRIENDICA_ADDONS %%VERSION%% %%INSTALL_EXTRAS%% diff --git a/update.sh b/update.sh index daf55de..dc4ee8f 100755 --- a/update.sh +++ b/update.sh @@ -82,7 +82,7 @@ declare -A pecl_versions=( ) declare -A install_extras=( - ['stable']='\nRUN set -ex; \\\n curl -fsSL -o friendica.tar.gz \\\n "https://github.com/friendica/friendica/archive/${FRIENDICA_VERSION}.tar.gz"; \\\n tar -xzf friendica.tar.gz -C /usr/src/; \\\n rm friendica.tar.gz; \\\n mv -f /usr/src/friendica-${FRIENDICA_VERSION}/ /usr/src/friendica; \\\n chmod 777 /usr/src/friendica/view/smarty3; \\\n curl -fsSL -o friendica_addons.tar.gz \\\n "https://github.com/friendica/friendica-addons/archive/${FRIENDICA_ADDONS}.tar.gz"; \\\n mkdir -p /usr/src/friendica/proxy; \\\n mkdir -p /usr/src/friendica/addon; \\\n tar -xzf friendica_addons.tar.gz -C /usr/src/friendica/addon --strip-components=1; \\\n rm friendica_addons.tar.gz; \\\n /usr/src/friendica/bin/composer.phar install --no-dev -d /usr/src/friendica;' + ['stable']='\nRUN set -ex; \\\n curl -fsSL -o friendica.tar.gz \\\n "https://friendi.ca/wp-content/uploads/${FRIENDICA_VERSION_YEAR}/${FRIENDICA_VERSION_MONTH}/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \\\n tar -xzf friendica.tar.gz -C /usr/src/; \\\n rm friendica.tar.gz; \\\n mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica; \\\n chmod 777 /usr/src/friendica/view/smarty3; \\\n curl -fsSL -o friendica_addons.tar.gz \\\n "https://github.com/friendica/friendica-addons/archive/${FRIENDICA_ADDONS}.tar.gz"; \\\n mkdir -p /usr/src/friendica/proxy; \\\n mkdir -p /usr/src/friendica/addon; \\\n tar -xzf friendica_addons.tar.gz -C /usr/src/friendica/addon --strip-components=1; \\\n rm friendica_addons.tar.gz;' ['develop']='' ) @@ -118,6 +118,9 @@ function create_variant() { install_type='develop' fi + # Get Year / Month of the Version string + VERSION_PARTS=(${1//./ }) + echo "updating $1 [$install_type] $variant" # Replace the variables. @@ -125,6 +128,8 @@ function create_variant() { s/%%PHP_VERSION%%/'"${php_version[$version]-${php_version[default]}}"'/g; s/%%VARIANT%%/'"$variant"'/g; s/%%VERSION%%/'"$1"'/g; + s/%%VERSION_YEAR%%/'"${VERSION_PARTS[0]}"'/g; + s/%%VERSION_MONTH%%/'"${VERSION_PARTS[1]}"'/g; s/%%CMD%%/'"${cmd[$variant]}"'/g; s|%%VARIANT_EXTRAS%%|'"${extras[$variant]}"'|g; s|%%INSTALL_EXTRAS%%|'"${install_extras[$install_type]}"'|g;