From 2e38177e2e53641655d78f7bbdedf134c5645198 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 12 Jul 2020 22:20:07 +0200 Subject: [PATCH] [Hotfix] Switch full archive path --- 2020.07/apache/Dockerfile | 4 +--- 2020.07/fpm-alpine/Dockerfile | 4 +--- 2020.07/fpm/Dockerfile | 4 +--- 2020.09-dev/apache/Dockerfile | 2 -- 2020.09-dev/fpm-alpine/Dockerfile | 2 -- 2020.09-dev/fpm/Dockerfile | 2 -- Dockerfile-alpine.template | 2 -- Dockerfile-debian.template | 2 -- update.sh | 7 +------ 9 files changed, 4 insertions(+), 25 deletions(-) diff --git a/2020.07/apache/Dockerfile b/2020.07/apache/Dockerfile index dd19954..2facd20 100644 --- a/2020.07/apache/Dockerfile +++ b/2020.07/apache/Dockerfile @@ -133,13 +133,11 @@ RUN set -ex;\ a2enconf remoteip ENV FRIENDICA_VERSION 2020.07 -ENV FRIENDICA_VERSION_YEAR 2020 -ENV FRIENDICA_VERSION_MONTH 07 ENV FRIENDICA_ADDONS 2020.07 RUN set -ex; \ curl -fsSL -o friendica.tar.gz \ - "https://friendi.ca/wp-content/uploads/${FRIENDICA_VERSION_YEAR}/${FRIENDICA_VERSION_MONTH}/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \ + "https://github.com/friendica/friendica/releases/download/${FRIENDICA_VERSION}/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \ tar -xzf friendica.tar.gz -C /usr/src/; \ rm friendica.tar.gz; \ mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica; \ diff --git a/2020.07/fpm-alpine/Dockerfile b/2020.07/fpm-alpine/Dockerfile index 0373ed6..39d2309 100644 --- a/2020.07/fpm-alpine/Dockerfile +++ b/2020.07/fpm-alpine/Dockerfile @@ -99,13 +99,11 @@ VOLUME /var/www/html ENV FRIENDICA_VERSION 2020.07 -ENV FRIENDICA_VERSION_YEAR 2020 -ENV FRIENDICA_VERSION_MONTH 07 ENV FRIENDICA_ADDONS 2020.07 RUN set -ex; \ curl -fsSL -o friendica.tar.gz \ - "https://friendi.ca/wp-content/uploads/${FRIENDICA_VERSION_YEAR}/${FRIENDICA_VERSION_MONTH}/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \ + "https://github.com/friendica/friendica/releases/download/${FRIENDICA_VERSION}/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \ tar -xzf friendica.tar.gz -C /usr/src/; \ rm friendica.tar.gz; \ mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica; \ diff --git a/2020.07/fpm/Dockerfile b/2020.07/fpm/Dockerfile index e799353..26d9244 100644 --- a/2020.07/fpm/Dockerfile +++ b/2020.07/fpm/Dockerfile @@ -124,13 +124,11 @@ VOLUME /var/www/html ENV FRIENDICA_VERSION 2020.07 -ENV FRIENDICA_VERSION_YEAR 2020 -ENV FRIENDICA_VERSION_MONTH 07 ENV FRIENDICA_ADDONS 2020.07 RUN set -ex; \ curl -fsSL -o friendica.tar.gz \ - "https://friendi.ca/wp-content/uploads/${FRIENDICA_VERSION_YEAR}/${FRIENDICA_VERSION_MONTH}/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \ + "https://github.com/friendica/friendica/releases/download/${FRIENDICA_VERSION}/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \ tar -xzf friendica.tar.gz -C /usr/src/; \ rm friendica.tar.gz; \ mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica; \ diff --git a/2020.09-dev/apache/Dockerfile b/2020.09-dev/apache/Dockerfile index 43a9806..a6fe2a5 100644 --- a/2020.09-dev/apache/Dockerfile +++ b/2020.09-dev/apache/Dockerfile @@ -133,8 +133,6 @@ RUN set -ex;\ a2enconf remoteip ENV FRIENDICA_VERSION 2020.09-dev -ENV FRIENDICA_VERSION_YEAR 2020 -ENV FRIENDICA_VERSION_MONTH 09-dev ENV FRIENDICA_ADDONS 2020.09-dev diff --git a/2020.09-dev/fpm-alpine/Dockerfile b/2020.09-dev/fpm-alpine/Dockerfile index ddd7d35..14d2d90 100644 --- a/2020.09-dev/fpm-alpine/Dockerfile +++ b/2020.09-dev/fpm-alpine/Dockerfile @@ -99,8 +99,6 @@ VOLUME /var/www/html ENV FRIENDICA_VERSION 2020.09-dev -ENV FRIENDICA_VERSION_YEAR 2020 -ENV FRIENDICA_VERSION_MONTH 09-dev ENV FRIENDICA_ADDONS 2020.09-dev diff --git a/2020.09-dev/fpm/Dockerfile b/2020.09-dev/fpm/Dockerfile index 3c0dfd4..c34cd5b 100644 --- a/2020.09-dev/fpm/Dockerfile +++ b/2020.09-dev/fpm/Dockerfile @@ -124,8 +124,6 @@ VOLUME /var/www/html ENV FRIENDICA_VERSION 2020.09-dev -ENV FRIENDICA_VERSION_YEAR 2020 -ENV FRIENDICA_VERSION_MONTH 09-dev ENV FRIENDICA_ADDONS 2020.09-dev diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 0b97bfd..b507c49 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -98,8 +98,6 @@ 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 55dd737..f5017fe 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -123,8 +123,6 @@ 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 68ada2d..aeb7b2a 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://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;' + ['stable']='\nRUN set -ex; \\\n curl -fsSL -o friendica.tar.gz \\\n "https://github.com/friendica/friendica/releases/download/${FRIENDICA_VERSION}/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']='' ) @@ -117,9 +117,6 @@ 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. @@ -127,8 +124,6 @@ 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;