diff --git a/2026.01/apache/Dockerfile b/2026.01/apache/Dockerfile index d38468e..bcc52ca 100644 --- a/2026.01/apache/Dockerfile +++ b/2026.01/apache/Dockerfile @@ -175,9 +175,7 @@ VOLUME /var/www/data # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_SYSLOG_FLAGS=39 ENV FRIENDICA_VERSION="2026.01" -ENV FRIENDICA_ADDONS="2026.01" ENV FRIENDICA_DOWNLOAD_SHA256 "49b51f67072ca2b121b76c7f6d4f61824347d06e2f4d9f2fb27649af70218add" -ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "fcc42e364c55ab953ff5e7bd31254dd3cc69c51d73711595dc8ec8476d5e4ab4" RUN set -ex; \ fetchDeps=" \ @@ -200,17 +198,6 @@ RUN set -ex; \ mv -f /usr/src/friendica-all-in-one-${FRIENDICA_VERSION}/ /usr/src/friendica; \ chmod 777 /usr/src/friendica/view/smarty3; \ \ - curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz \ - "https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz"; \ - curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc \ - "https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc"; \ - gpg --batch --verify friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc friendica-addons-${FRIENDICA_ADDONS}.tar.gz; \ - echo "${FRIENDICA_DOWNLOAD_ADDONS_SHA256} *friendica-addons-${FRIENDICA_ADDONS}.tar.gz" | sha256sum -c; \ - mkdir -p /usr/src/friendica/proxy; \ - mkdir -p /usr/src/friendica/addon; \ - tar -xzf friendica-addons-${FRIENDICA_ADDONS}.tar.gz -C /usr/src/friendica/addon --strip-components=1; \ - rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc; \ - \ gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ \ diff --git a/2026.01/fpm-alpine/Dockerfile b/2026.01/fpm-alpine/Dockerfile index a849859..ef83470 100644 --- a/2026.01/fpm-alpine/Dockerfile +++ b/2026.01/fpm-alpine/Dockerfile @@ -145,9 +145,7 @@ VOLUME /var/www/data # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_SYSLOG_FLAGS=39 ENV FRIENDICA_VERSION="2026.01" -ENV FRIENDICA_ADDONS="2026.01" ENV FRIENDICA_DOWNLOAD_SHA256 "49b51f67072ca2b121b76c7f6d4f61824347d06e2f4d9f2fb27649af70218add" -ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "fcc42e364c55ab953ff5e7bd31254dd3cc69c51d73711595dc8ec8476d5e4ab4" RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ @@ -168,17 +166,6 @@ RUN set -ex; \ mv -f /usr/src/friendica-all-in-one-${FRIENDICA_VERSION}/ /usr/src/friendica; \ chmod 777 /usr/src/friendica/view/smarty3; \ \ - curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz \ - "https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz"; \ - curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc \ - "https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc"; \ - gpg --batch --verify friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc friendica-addons-${FRIENDICA_ADDONS}.tar.gz; \ - echo "${FRIENDICA_DOWNLOAD_ADDONS_SHA256} *friendica-addons-${FRIENDICA_ADDONS}.tar.gz" | sha256sum -c; \ - mkdir -p /usr/src/friendica/proxy; \ - mkdir -p /usr/src/friendica/addon; \ - tar -xzf friendica-addons-${FRIENDICA_ADDONS}.tar.gz -C /usr/src/friendica/addon --strip-components=1; \ - rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc; \ - \ gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ \ diff --git a/2026.01/fpm/Dockerfile b/2026.01/fpm/Dockerfile index 1fc651e..3eaeb1a 100644 --- a/2026.01/fpm/Dockerfile +++ b/2026.01/fpm/Dockerfile @@ -167,9 +167,7 @@ VOLUME /var/www/data # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_SYSLOG_FLAGS=39 ENV FRIENDICA_VERSION="2026.01" -ENV FRIENDICA_ADDONS="2026.01" ENV FRIENDICA_DOWNLOAD_SHA256 "49b51f67072ca2b121b76c7f6d4f61824347d06e2f4d9f2fb27649af70218add" -ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "fcc42e364c55ab953ff5e7bd31254dd3cc69c51d73711595dc8ec8476d5e4ab4" RUN set -ex; \ fetchDeps=" \ @@ -192,17 +190,6 @@ RUN set -ex; \ mv -f /usr/src/friendica-all-in-one-${FRIENDICA_VERSION}/ /usr/src/friendica; \ chmod 777 /usr/src/friendica/view/smarty3; \ \ - curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz \ - "https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz"; \ - curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc \ - "https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc"; \ - gpg --batch --verify friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc friendica-addons-${FRIENDICA_ADDONS}.tar.gz; \ - echo "${FRIENDICA_DOWNLOAD_ADDONS_SHA256} *friendica-addons-${FRIENDICA_ADDONS}.tar.gz" | sha256sum -c; \ - mkdir -p /usr/src/friendica/proxy; \ - mkdir -p /usr/src/friendica/addon; \ - tar -xzf friendica-addons-${FRIENDICA_ADDONS}.tar.gz -C /usr/src/friendica/addon --strip-components=1; \ - rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc; \ - \ gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ \ diff --git a/2026.04-dev/apache/Dockerfile b/2026.04-dev/apache/Dockerfile index d95ef67..8af3467 100644 --- a/2026.04-dev/apache/Dockerfile +++ b/2026.04-dev/apache/Dockerfile @@ -175,7 +175,6 @@ VOLUME /var/www/data # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_SYSLOG_FLAGS=39 ENV FRIENDICA_VERSION="2026.04-dev" -ENV FRIENDICA_ADDONS="2026.04-dev" RUN set -ex; \ diff --git a/2026.04-dev/fpm-alpine/Dockerfile b/2026.04-dev/fpm-alpine/Dockerfile index fa60e58..e308a7e 100644 --- a/2026.04-dev/fpm-alpine/Dockerfile +++ b/2026.04-dev/fpm-alpine/Dockerfile @@ -145,7 +145,6 @@ VOLUME /var/www/data # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_SYSLOG_FLAGS=39 ENV FRIENDICA_VERSION="2026.04-dev" -ENV FRIENDICA_ADDONS="2026.04-dev" RUN set -ex; \ diff --git a/2026.04-dev/fpm/Dockerfile b/2026.04-dev/fpm/Dockerfile index f7c22f2..ab846b6 100644 --- a/2026.04-dev/fpm/Dockerfile +++ b/2026.04-dev/fpm/Dockerfile @@ -167,7 +167,6 @@ VOLUME /var/www/data # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_SYSLOG_FLAGS=39 ENV FRIENDICA_VERSION="2026.04-dev" -ENV FRIENDICA_ADDONS="2026.04-dev" RUN set -ex; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 10723cf..e3e021d 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -143,7 +143,6 @@ VOLUME /var/www/data # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_SYSLOG_FLAGS=39 ENV FRIENDICA_VERSION="%%VERSION%%" -ENV FRIENDICA_ADDONS="%%VERSION%%" %%DOWNLOAD_SHA256%% %%INSTALL_EXTRAS%% diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 7b35be6..684a3e1 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -165,7 +165,6 @@ VOLUME /var/www/data # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_SYSLOG_FLAGS=39 ENV FRIENDICA_VERSION="%%VERSION%%" -ENV FRIENDICA_ADDONS="%%VERSION%%" %%DOWNLOAD_SHA256%% %%INSTALL_EXTRAS%% diff --git a/update.sh b/update.sh index 9c650ed..ab3d777 100755 --- a/update.sh +++ b/update.sh @@ -115,17 +115,6 @@ declare -A install_extras=( mv -f /usr/src/friendica-all-in-one-${FRIENDICA_VERSION}/ /usr/src/friendica; \ chmod 777 /usr/src/friendica/view/smarty3; \ \ - curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz \ - "https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz"; \ - curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc \ - "https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc"; \ - gpg --batch --verify friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc friendica-addons-${FRIENDICA_ADDONS}.tar.gz; \ - echo "${FRIENDICA_DOWNLOAD_ADDONS_SHA256} *friendica-addons-${FRIENDICA_ADDONS}.tar.gz" \| sha256sum -c; \ - mkdir -p /usr/src/friendica/proxy; \ - mkdir -p /usr/src/friendica/addon; \ - tar -xzf friendica-addons-${FRIENDICA_ADDONS}.tar.gz -C /usr/src/friendica/addon --strip-components=1; \ - rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc; \ - \ gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ \ @@ -150,17 +139,6 @@ declare -A install_extras=( mv -f /usr/src/friendica-all-in-one-${FRIENDICA_VERSION}/ /usr/src/friendica; \ chmod 777 /usr/src/friendica/view/smarty3; \ \ - curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz \ - "https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz"; \ - curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc \ - "https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc"; \ - gpg --batch --verify friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc friendica-addons-${FRIENDICA_ADDONS}.tar.gz; \ - echo "${FRIENDICA_DOWNLOAD_ADDONS_SHA256} *friendica-addons-${FRIENDICA_ADDONS}.tar.gz" \| sha256sum -c; \ - mkdir -p /usr/src/friendica/proxy; \ - mkdir -p /usr/src/friendica/addon; \ - tar -xzf friendica-addons-${FRIENDICA_ADDONS}.tar.gz -C /usr/src/friendica/addon --strip-components=1; \ - rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc; \ - \ gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ \ @@ -200,7 +178,7 @@ function get_sha256_string() { if [[ $install_type == "develop" ]]; then echo "" else - echo "ENV FRIENDICA_DOWNLOAD_SHA256 \"$(curl -fsSL https://files.friendi.ca/friendica-all-in-one-${version}.tar.gz.sum256 | cut -d' ' -f1)\"\nENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 \"$(curl -fsSL https://files.friendi.ca/friendica-addons-${version}.tar.gz.sum256 | cut -d' ' -f1)\"" + echo "ENV FRIENDICA_DOWNLOAD_SHA256 \"$(curl -fsSL https://files.friendi.ca/friendica-all-in-one-${version}.tar.gz.sum256 | cut -d' ' -f1)\"" fi }