From e5f935f6ec8e1d473c0efd58078fcea250b5db73 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 6 Feb 2022 21:57:05 +0100 Subject: [PATCH] Friendica Release 2022.02 --- 2021.12-rc/apache/entrypoint-dev.sh | 54 ------------------- 2021.12-rc/fpm-alpine/entrypoint-dev.sh | 54 ------------------- 2021.12-rc/fpm/entrypoint-dev.sh | 54 ------------------- {2021.12-rc => 2022.02}/apache/Dockerfile | 41 ++++++++++++-- .../apache/config/00apcu.config.php | 0 .../apache/config/01redis.config.php | 0 .../apache/config/zz-docker.config.php | 0 {2021.12-dev => 2022.02}/apache/cron.sh | 0 {2021.12-dev => 2022.02}/apache/entrypoint.sh | 0 .../apache/setup_msmtp.sh | 0 .../apache/upgrade.exclude | 0 .../fpm-alpine/Dockerfile | 40 ++++++++++++-- .../fpm-alpine/config/00apcu.config.php | 0 .../fpm-alpine/config/01redis.config.php | 0 .../fpm-alpine/config/zz-docker.config.php | 0 {2021.12-dev => 2022.02}/fpm-alpine/cron.sh | 0 .../fpm-alpine/entrypoint.sh | 0 .../fpm-alpine/setup_msmtp.sh | 0 .../fpm-alpine/upgrade.exclude | 0 {2021.12-dev => 2022.02}/fpm/Dockerfile | 41 ++++++++++++-- .../fpm/config/00apcu.config.php | 0 .../fpm/config/01redis.config.php | 0 .../fpm/config/zz-docker.config.php | 0 {2021.12-dev => 2022.02}/fpm/cron.sh | 0 {2021.12-dev => 2022.02}/fpm/entrypoint.sh | 0 {2021.12-dev => 2022.02}/fpm/setup_msmtp.sh | 0 {2021.12-dev => 2022.02}/fpm/upgrade.exclude | 0 .../apache/Dockerfile | 4 +- .../apache/config/00apcu.config.php | 0 .../apache/config/01redis.config.php | 0 .../apache/config/zz-docker.config.php | 0 {2021.12-rc => 2022.05-dev}/apache/cron.sh | 0 .../apache/entrypoint-dev.sh | 0 .../apache/entrypoint.sh | 0 .../apache/setup_msmtp.sh | 0 .../apache/upgrade.exclude | 0 .../fpm-alpine/Dockerfile | 4 +- .../fpm-alpine/config/00apcu.config.php | 0 .../fpm-alpine/config/01redis.config.php | 0 .../fpm-alpine/config/zz-docker.config.php | 0 .../fpm-alpine/cron.sh | 0 .../fpm-alpine/entrypoint-dev.sh | 0 .../fpm-alpine/entrypoint.sh | 0 .../fpm-alpine/setup_msmtp.sh | 0 .../fpm-alpine/upgrade.exclude | 0 {2021.12-rc => 2022.05-dev}/fpm/Dockerfile | 4 +- .../fpm/config/00apcu.config.php | 0 .../fpm/config/01redis.config.php | 0 .../fpm/config/zz-docker.config.php | 0 {2021.12-rc => 2022.05-dev}/fpm/cron.sh | 0 .../fpm/entrypoint-dev.sh | 0 {2021.12-rc => 2022.05-dev}/fpm/entrypoint.sh | 0 .../fpm/setup_msmtp.sh | 0 .../fpm/upgrade.exclude | 0 develop.txt | 2 +- latest.txt | 2 +- 56 files changed, 118 insertions(+), 182 deletions(-) delete mode 100755 2021.12-rc/apache/entrypoint-dev.sh delete mode 100755 2021.12-rc/fpm-alpine/entrypoint-dev.sh delete mode 100755 2021.12-rc/fpm/entrypoint-dev.sh rename {2021.12-rc => 2022.02}/apache/Dockerfile (69%) rename {2021.12-dev => 2022.02}/apache/config/00apcu.config.php (100%) rename {2021.12-dev => 2022.02}/apache/config/01redis.config.php (100%) rename {2021.12-dev => 2022.02}/apache/config/zz-docker.config.php (100%) rename {2021.12-dev => 2022.02}/apache/cron.sh (100%) rename {2021.12-dev => 2022.02}/apache/entrypoint.sh (100%) rename {2021.12-dev => 2022.02}/apache/setup_msmtp.sh (100%) rename {2021.12-dev => 2022.02}/apache/upgrade.exclude (100%) rename {2021.12-dev => 2022.02}/fpm-alpine/Dockerfile (64%) rename {2021.12-dev => 2022.02}/fpm-alpine/config/00apcu.config.php (100%) rename {2021.12-dev => 2022.02}/fpm-alpine/config/01redis.config.php (100%) rename {2021.12-dev => 2022.02}/fpm-alpine/config/zz-docker.config.php (100%) rename {2021.12-dev => 2022.02}/fpm-alpine/cron.sh (100%) rename {2021.12-dev => 2022.02}/fpm-alpine/entrypoint.sh (100%) rename {2021.12-dev => 2022.02}/fpm-alpine/setup_msmtp.sh (100%) rename {2021.12-dev => 2022.02}/fpm-alpine/upgrade.exclude (100%) rename {2021.12-dev => 2022.02}/fpm/Dockerfile (67%) rename {2021.12-dev => 2022.02}/fpm/config/00apcu.config.php (100%) rename {2021.12-dev => 2022.02}/fpm/config/01redis.config.php (100%) rename {2021.12-dev => 2022.02}/fpm/config/zz-docker.config.php (100%) rename {2021.12-dev => 2022.02}/fpm/cron.sh (100%) rename {2021.12-dev => 2022.02}/fpm/entrypoint.sh (100%) rename {2021.12-dev => 2022.02}/fpm/setup_msmtp.sh (100%) rename {2021.12-dev => 2022.02}/fpm/upgrade.exclude (100%) rename {2021.12-dev => 2022.05-dev}/apache/Dockerfile (98%) rename {2021.12-rc => 2022.05-dev}/apache/config/00apcu.config.php (100%) rename {2021.12-rc => 2022.05-dev}/apache/config/01redis.config.php (100%) rename {2021.12-rc => 2022.05-dev}/apache/config/zz-docker.config.php (100%) rename {2021.12-rc => 2022.05-dev}/apache/cron.sh (100%) rename {2021.12-dev => 2022.05-dev}/apache/entrypoint-dev.sh (100%) rename {2021.12-rc => 2022.05-dev}/apache/entrypoint.sh (100%) rename {2021.12-rc => 2022.05-dev}/apache/setup_msmtp.sh (100%) rename {2021.12-rc => 2022.05-dev}/apache/upgrade.exclude (100%) rename {2021.12-rc => 2022.05-dev}/fpm-alpine/Dockerfile (98%) rename {2021.12-rc => 2022.05-dev}/fpm-alpine/config/00apcu.config.php (100%) rename {2021.12-rc => 2022.05-dev}/fpm-alpine/config/01redis.config.php (100%) rename {2021.12-rc => 2022.05-dev}/fpm-alpine/config/zz-docker.config.php (100%) rename {2021.12-rc => 2022.05-dev}/fpm-alpine/cron.sh (100%) rename {2021.12-dev => 2022.05-dev}/fpm-alpine/entrypoint-dev.sh (100%) rename {2021.12-rc => 2022.05-dev}/fpm-alpine/entrypoint.sh (100%) rename {2021.12-rc => 2022.05-dev}/fpm-alpine/setup_msmtp.sh (100%) rename {2021.12-rc => 2022.05-dev}/fpm-alpine/upgrade.exclude (100%) rename {2021.12-rc => 2022.05-dev}/fpm/Dockerfile (98%) rename {2021.12-rc => 2022.05-dev}/fpm/config/00apcu.config.php (100%) rename {2021.12-rc => 2022.05-dev}/fpm/config/01redis.config.php (100%) rename {2021.12-rc => 2022.05-dev}/fpm/config/zz-docker.config.php (100%) rename {2021.12-rc => 2022.05-dev}/fpm/cron.sh (100%) rename {2021.12-dev => 2022.05-dev}/fpm/entrypoint-dev.sh (100%) rename {2021.12-rc => 2022.05-dev}/fpm/entrypoint.sh (100%) rename {2021.12-rc => 2022.05-dev}/fpm/setup_msmtp.sh (100%) rename {2021.12-rc => 2022.05-dev}/fpm/upgrade.exclude (100%) diff --git a/2021.12-rc/apache/entrypoint-dev.sh b/2021.12-rc/apache/entrypoint-dev.sh deleted file mode 100755 index 8b34c21..0000000 --- a/2021.12-rc/apache/entrypoint-dev.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -set -eu - -# just check if we execute apache or php-fpm -if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then - curl -fsSL -o "/usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256" - curl -fsSL -o "/usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_ADDONS}.tar.gz.sum256" - - # Don't download already latest sources - if [ -f "/usr/src/friendica.tar.gz.sum256" ] && [ -f "/usr/src/friendica-addons.tar.gz.sum256" ] && \ - cmp -s "/usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256" "/usr/src/friendica.tar.gz.sum256" && \ - cmp -s "/usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256" "/usr/src/friendica-addons.tar.gz.sum256"; then - echo "Already latest sources - skipped download" - else - - echo "Download sources for ${FRIENDICA_VERSION} (Addon: ${FRIENDICA_ADDONS})" - - # Removing the whole directory first - rm -fr /usr/src/friendica - export GNUPGHOME="$(mktemp -d)" - - gpg --batch --logger-fd=1 --no-tty --quiet --keyserver keyserver.ubuntu.com --recv-keys 08656443618E6567A39524083EE197EF3F9E4287 - - curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz" - curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz.asc "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.asc"; - gpg --batch --logger-fd=1 --no-tty --quiet --verify friendica-full-${FRIENDICA_VERSION}.tar.gz.asc friendica-full-${FRIENDICA_VERSION}.tar.gz - echo "Core sources (${FRIENDICA_VERSION}) verified" - - tar -xzf friendica-full-${FRIENDICA_VERSION}.tar.gz -C /usr/src/ - rm friendica-full-${FRIENDICA_VERSION}.tar.gz friendica-full-${FRIENDICA_VERSION}.tar.gz.asc - mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica - echo "Core sources (${FRIENDICA_VERSION}) extracted" - - 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 --logger-fd=1 --no-tty --quiet --verify friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc friendica-addons-${FRIENDICA_ADDONS}.tar.gz - echo "Addon sources (${FRIENDICA_ADDONS}) verified" - - 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 - echo "Addon sources (${FRIENDICA_ADDONS}) extracted" - - gpgconf --kill all - rm -rf "$GNUPGHOME" - - mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256 /usr/src/friendica.tar.gz.sum256 - mv -f /usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256 /usr/src/friendica-addons.tar.gz.sum256 - fi -fi - -exec /entrypoint.sh "$@" diff --git a/2021.12-rc/fpm-alpine/entrypoint-dev.sh b/2021.12-rc/fpm-alpine/entrypoint-dev.sh deleted file mode 100755 index 8b34c21..0000000 --- a/2021.12-rc/fpm-alpine/entrypoint-dev.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -set -eu - -# just check if we execute apache or php-fpm -if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then - curl -fsSL -o "/usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256" - curl -fsSL -o "/usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_ADDONS}.tar.gz.sum256" - - # Don't download already latest sources - if [ -f "/usr/src/friendica.tar.gz.sum256" ] && [ -f "/usr/src/friendica-addons.tar.gz.sum256" ] && \ - cmp -s "/usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256" "/usr/src/friendica.tar.gz.sum256" && \ - cmp -s "/usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256" "/usr/src/friendica-addons.tar.gz.sum256"; then - echo "Already latest sources - skipped download" - else - - echo "Download sources for ${FRIENDICA_VERSION} (Addon: ${FRIENDICA_ADDONS})" - - # Removing the whole directory first - rm -fr /usr/src/friendica - export GNUPGHOME="$(mktemp -d)" - - gpg --batch --logger-fd=1 --no-tty --quiet --keyserver keyserver.ubuntu.com --recv-keys 08656443618E6567A39524083EE197EF3F9E4287 - - curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz" - curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz.asc "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.asc"; - gpg --batch --logger-fd=1 --no-tty --quiet --verify friendica-full-${FRIENDICA_VERSION}.tar.gz.asc friendica-full-${FRIENDICA_VERSION}.tar.gz - echo "Core sources (${FRIENDICA_VERSION}) verified" - - tar -xzf friendica-full-${FRIENDICA_VERSION}.tar.gz -C /usr/src/ - rm friendica-full-${FRIENDICA_VERSION}.tar.gz friendica-full-${FRIENDICA_VERSION}.tar.gz.asc - mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica - echo "Core sources (${FRIENDICA_VERSION}) extracted" - - 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 --logger-fd=1 --no-tty --quiet --verify friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc friendica-addons-${FRIENDICA_ADDONS}.tar.gz - echo "Addon sources (${FRIENDICA_ADDONS}) verified" - - 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 - echo "Addon sources (${FRIENDICA_ADDONS}) extracted" - - gpgconf --kill all - rm -rf "$GNUPGHOME" - - mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256 /usr/src/friendica.tar.gz.sum256 - mv -f /usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256 /usr/src/friendica-addons.tar.gz.sum256 - fi -fi - -exec /entrypoint.sh "$@" diff --git a/2021.12-rc/fpm/entrypoint-dev.sh b/2021.12-rc/fpm/entrypoint-dev.sh deleted file mode 100755 index 8b34c21..0000000 --- a/2021.12-rc/fpm/entrypoint-dev.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -set -eu - -# just check if we execute apache or php-fpm -if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then - curl -fsSL -o "/usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256" - curl -fsSL -o "/usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_ADDONS}.tar.gz.sum256" - - # Don't download already latest sources - if [ -f "/usr/src/friendica.tar.gz.sum256" ] && [ -f "/usr/src/friendica-addons.tar.gz.sum256" ] && \ - cmp -s "/usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256" "/usr/src/friendica.tar.gz.sum256" && \ - cmp -s "/usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256" "/usr/src/friendica-addons.tar.gz.sum256"; then - echo "Already latest sources - skipped download" - else - - echo "Download sources for ${FRIENDICA_VERSION} (Addon: ${FRIENDICA_ADDONS})" - - # Removing the whole directory first - rm -fr /usr/src/friendica - export GNUPGHOME="$(mktemp -d)" - - gpg --batch --logger-fd=1 --no-tty --quiet --keyserver keyserver.ubuntu.com --recv-keys 08656443618E6567A39524083EE197EF3F9E4287 - - curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz" - curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz.asc "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.asc"; - gpg --batch --logger-fd=1 --no-tty --quiet --verify friendica-full-${FRIENDICA_VERSION}.tar.gz.asc friendica-full-${FRIENDICA_VERSION}.tar.gz - echo "Core sources (${FRIENDICA_VERSION}) verified" - - tar -xzf friendica-full-${FRIENDICA_VERSION}.tar.gz -C /usr/src/ - rm friendica-full-${FRIENDICA_VERSION}.tar.gz friendica-full-${FRIENDICA_VERSION}.tar.gz.asc - mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica - echo "Core sources (${FRIENDICA_VERSION}) extracted" - - 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 --logger-fd=1 --no-tty --quiet --verify friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc friendica-addons-${FRIENDICA_ADDONS}.tar.gz - echo "Addon sources (${FRIENDICA_ADDONS}) verified" - - 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 - echo "Addon sources (${FRIENDICA_ADDONS}) extracted" - - gpgconf --kill all - rm -rf "$GNUPGHOME" - - mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256 /usr/src/friendica.tar.gz.sum256 - mv -f /usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256 /usr/src/friendica-addons.tar.gz.sum256 - fi -fi - -exec /entrypoint.sh "$@" diff --git a/2021.12-rc/apache/Dockerfile b/2022.02/apache/Dockerfile similarity index 69% rename from 2021.12-rc/apache/Dockerfile rename to 2022.02/apache/Dockerfile index a94317a..60a0b8e 100644 --- a/2021.12-rc/apache/Dockerfile +++ b/2022.02/apache/Dockerfile @@ -162,18 +162,51 @@ RUN set -ex;\ # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_SYSLOG_FLAGS 39 -ENV FRIENDICA_VERSION "2021.12-rc" -ENV FRIENDICA_ADDONS "2021.12-rc" +ENV FRIENDICA_VERSION "2022.02" +ENV FRIENDICA_ADDONS "2022.02" +ENV FRIENDICA_DOWNLOAD_SHA256 "032be1a8c7e1a82d34eebc95b5bd2f2564a9114834eff45e6b4daa240eab22e8" +ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "146240e7215d15d743bee4e0d3c084315b5a1778493f400284e80ff84e3cd1ce" RUN set -ex; \ fetchDeps=" \ gnupg \ "; \ apt-get update; \ - apt-get install -y --no-install-recommends $fetchDeps; + apt-get install -y --no-install-recommends $fetchDeps; \ + \ + export GNUPGHOME="$(mktemp -d)"; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 08656443618E6567A39524083EE197EF3F9E4287; \ + \ + curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz \ + "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \ + curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz.asc \ + "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.asc"; \ + gpg --batch --verify friendica-full-${FRIENDICA_VERSION}.tar.gz.asc friendica-full-${FRIENDICA_VERSION}.tar.gz; \ + echo "${FRIENDICA_DOWNLOAD_SHA256} *friendica-full-${FRIENDICA_VERSION}.tar.gz" | sha256sum -c; \ + tar -xzf friendica-full-${FRIENDICA_VERSION}.tar.gz -C /usr/src/; \ + rm friendica-full-${FRIENDICA_VERSION}.tar.gz friendica-full-${FRIENDICA_VERSION}.tar.gz.asc; \ + mv -f /usr/src/friendica-full-${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"; \ + \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ + rm -rf /var/lib/apt/lists/* COPY *.sh upgrade.exclude / COPY config/* /usr/src/friendica/config/ -ENTRYPOINT ["/entrypoint-dev.sh"] +ENTRYPOINT ["/entrypoint.sh"] CMD ["apache2-foreground"] diff --git a/2021.12-dev/apache/config/00apcu.config.php b/2022.02/apache/config/00apcu.config.php similarity index 100% rename from 2021.12-dev/apache/config/00apcu.config.php rename to 2022.02/apache/config/00apcu.config.php diff --git a/2021.12-dev/apache/config/01redis.config.php b/2022.02/apache/config/01redis.config.php similarity index 100% rename from 2021.12-dev/apache/config/01redis.config.php rename to 2022.02/apache/config/01redis.config.php diff --git a/2021.12-dev/apache/config/zz-docker.config.php b/2022.02/apache/config/zz-docker.config.php similarity index 100% rename from 2021.12-dev/apache/config/zz-docker.config.php rename to 2022.02/apache/config/zz-docker.config.php diff --git a/2021.12-dev/apache/cron.sh b/2022.02/apache/cron.sh similarity index 100% rename from 2021.12-dev/apache/cron.sh rename to 2022.02/apache/cron.sh diff --git a/2021.12-dev/apache/entrypoint.sh b/2022.02/apache/entrypoint.sh similarity index 100% rename from 2021.12-dev/apache/entrypoint.sh rename to 2022.02/apache/entrypoint.sh diff --git a/2021.12-dev/apache/setup_msmtp.sh b/2022.02/apache/setup_msmtp.sh similarity index 100% rename from 2021.12-dev/apache/setup_msmtp.sh rename to 2022.02/apache/setup_msmtp.sh diff --git a/2021.12-dev/apache/upgrade.exclude b/2022.02/apache/upgrade.exclude similarity index 100% rename from 2021.12-dev/apache/upgrade.exclude rename to 2022.02/apache/upgrade.exclude diff --git a/2021.12-dev/fpm-alpine/Dockerfile b/2022.02/fpm-alpine/Dockerfile similarity index 64% rename from 2021.12-dev/fpm-alpine/Dockerfile rename to 2022.02/fpm-alpine/Dockerfile index cafb431..3862c63 100644 --- a/2021.12-dev/fpm-alpine/Dockerfile +++ b/2022.02/fpm-alpine/Dockerfile @@ -134,16 +134,48 @@ VOLUME /var/www/html # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_SYSLOG_FLAGS 39 -ENV FRIENDICA_VERSION "2021.12-dev" -ENV FRIENDICA_ADDONS "2021.12-dev" +ENV FRIENDICA_VERSION "2022.02" +ENV FRIENDICA_ADDONS "2022.02" +ENV FRIENDICA_DOWNLOAD_SHA256 "032be1a8c7e1a82d34eebc95b5bd2f2564a9114834eff45e6b4daa240eab22e8" +ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "146240e7215d15d743bee4e0d3c084315b5a1778493f400284e80ff84e3cd1ce" RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ gnupg \ - ; + ; \ + \ + export GNUPGHOME="$(mktemp -d)"; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 08656443618E6567A39524083EE197EF3F9E4287; \ + \ + curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz \ + "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \ + curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz.asc \ + "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.asc"; \ + gpg --batch --verify friendica-full-${FRIENDICA_VERSION}.tar.gz.asc friendica-full-${FRIENDICA_VERSION}.tar.gz; \ + echo "${FRIENDICA_DOWNLOAD_SHA256} *friendica-full-${FRIENDICA_VERSION}.tar.gz" | sha256sum -c; \ + tar -xzf friendica-full-${FRIENDICA_VERSION}.tar.gz -C /usr/src/; \ + rm friendica-full-${FRIENDICA_VERSION}.tar.gz friendica-full-${FRIENDICA_VERSION}.tar.gz.asc; \ + mv -f /usr/src/friendica-full-${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"; \ + \ + apk del .fetch-deps COPY *.sh upgrade.exclude / COPY config/* /usr/src/friendica/config/ -ENTRYPOINT ["/entrypoint-dev.sh"] +ENTRYPOINT ["/entrypoint.sh"] CMD ["php-fpm"] diff --git a/2021.12-dev/fpm-alpine/config/00apcu.config.php b/2022.02/fpm-alpine/config/00apcu.config.php similarity index 100% rename from 2021.12-dev/fpm-alpine/config/00apcu.config.php rename to 2022.02/fpm-alpine/config/00apcu.config.php diff --git a/2021.12-dev/fpm-alpine/config/01redis.config.php b/2022.02/fpm-alpine/config/01redis.config.php similarity index 100% rename from 2021.12-dev/fpm-alpine/config/01redis.config.php rename to 2022.02/fpm-alpine/config/01redis.config.php diff --git a/2021.12-dev/fpm-alpine/config/zz-docker.config.php b/2022.02/fpm-alpine/config/zz-docker.config.php similarity index 100% rename from 2021.12-dev/fpm-alpine/config/zz-docker.config.php rename to 2022.02/fpm-alpine/config/zz-docker.config.php diff --git a/2021.12-dev/fpm-alpine/cron.sh b/2022.02/fpm-alpine/cron.sh similarity index 100% rename from 2021.12-dev/fpm-alpine/cron.sh rename to 2022.02/fpm-alpine/cron.sh diff --git a/2021.12-dev/fpm-alpine/entrypoint.sh b/2022.02/fpm-alpine/entrypoint.sh similarity index 100% rename from 2021.12-dev/fpm-alpine/entrypoint.sh rename to 2022.02/fpm-alpine/entrypoint.sh diff --git a/2021.12-dev/fpm-alpine/setup_msmtp.sh b/2022.02/fpm-alpine/setup_msmtp.sh similarity index 100% rename from 2021.12-dev/fpm-alpine/setup_msmtp.sh rename to 2022.02/fpm-alpine/setup_msmtp.sh diff --git a/2021.12-dev/fpm-alpine/upgrade.exclude b/2022.02/fpm-alpine/upgrade.exclude similarity index 100% rename from 2021.12-dev/fpm-alpine/upgrade.exclude rename to 2022.02/fpm-alpine/upgrade.exclude diff --git a/2021.12-dev/fpm/Dockerfile b/2022.02/fpm/Dockerfile similarity index 67% rename from 2021.12-dev/fpm/Dockerfile rename to 2022.02/fpm/Dockerfile index 5c3f8a1..bb581e5 100644 --- a/2021.12-dev/fpm/Dockerfile +++ b/2022.02/fpm/Dockerfile @@ -153,18 +153,51 @@ VOLUME /var/www/html # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_SYSLOG_FLAGS 39 -ENV FRIENDICA_VERSION "2021.12-dev" -ENV FRIENDICA_ADDONS "2021.12-dev" +ENV FRIENDICA_VERSION "2022.02" +ENV FRIENDICA_ADDONS "2022.02" +ENV FRIENDICA_DOWNLOAD_SHA256 "032be1a8c7e1a82d34eebc95b5bd2f2564a9114834eff45e6b4daa240eab22e8" +ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "146240e7215d15d743bee4e0d3c084315b5a1778493f400284e80ff84e3cd1ce" RUN set -ex; \ fetchDeps=" \ gnupg \ "; \ apt-get update; \ - apt-get install -y --no-install-recommends $fetchDeps; + apt-get install -y --no-install-recommends $fetchDeps; \ + \ + export GNUPGHOME="$(mktemp -d)"; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 08656443618E6567A39524083EE197EF3F9E4287; \ + \ + curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz \ + "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \ + curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz.asc \ + "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.asc"; \ + gpg --batch --verify friendica-full-${FRIENDICA_VERSION}.tar.gz.asc friendica-full-${FRIENDICA_VERSION}.tar.gz; \ + echo "${FRIENDICA_DOWNLOAD_SHA256} *friendica-full-${FRIENDICA_VERSION}.tar.gz" | sha256sum -c; \ + tar -xzf friendica-full-${FRIENDICA_VERSION}.tar.gz -C /usr/src/; \ + rm friendica-full-${FRIENDICA_VERSION}.tar.gz friendica-full-${FRIENDICA_VERSION}.tar.gz.asc; \ + mv -f /usr/src/friendica-full-${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"; \ + \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ + rm -rf /var/lib/apt/lists/* COPY *.sh upgrade.exclude / COPY config/* /usr/src/friendica/config/ -ENTRYPOINT ["/entrypoint-dev.sh"] +ENTRYPOINT ["/entrypoint.sh"] CMD ["php-fpm"] diff --git a/2021.12-dev/fpm/config/00apcu.config.php b/2022.02/fpm/config/00apcu.config.php similarity index 100% rename from 2021.12-dev/fpm/config/00apcu.config.php rename to 2022.02/fpm/config/00apcu.config.php diff --git a/2021.12-dev/fpm/config/01redis.config.php b/2022.02/fpm/config/01redis.config.php similarity index 100% rename from 2021.12-dev/fpm/config/01redis.config.php rename to 2022.02/fpm/config/01redis.config.php diff --git a/2021.12-dev/fpm/config/zz-docker.config.php b/2022.02/fpm/config/zz-docker.config.php similarity index 100% rename from 2021.12-dev/fpm/config/zz-docker.config.php rename to 2022.02/fpm/config/zz-docker.config.php diff --git a/2021.12-dev/fpm/cron.sh b/2022.02/fpm/cron.sh similarity index 100% rename from 2021.12-dev/fpm/cron.sh rename to 2022.02/fpm/cron.sh diff --git a/2021.12-dev/fpm/entrypoint.sh b/2022.02/fpm/entrypoint.sh similarity index 100% rename from 2021.12-dev/fpm/entrypoint.sh rename to 2022.02/fpm/entrypoint.sh diff --git a/2021.12-dev/fpm/setup_msmtp.sh b/2022.02/fpm/setup_msmtp.sh similarity index 100% rename from 2021.12-dev/fpm/setup_msmtp.sh rename to 2022.02/fpm/setup_msmtp.sh diff --git a/2021.12-dev/fpm/upgrade.exclude b/2022.02/fpm/upgrade.exclude similarity index 100% rename from 2021.12-dev/fpm/upgrade.exclude rename to 2022.02/fpm/upgrade.exclude diff --git a/2021.12-dev/apache/Dockerfile b/2022.05-dev/apache/Dockerfile similarity index 98% rename from 2021.12-dev/apache/Dockerfile rename to 2022.05-dev/apache/Dockerfile index 3fb765b..db618f1 100644 --- a/2021.12-dev/apache/Dockerfile +++ b/2022.05-dev/apache/Dockerfile @@ -162,8 +162,8 @@ RUN set -ex;\ # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_SYSLOG_FLAGS 39 -ENV FRIENDICA_VERSION "2021.12-dev" -ENV FRIENDICA_ADDONS "2021.12-dev" +ENV FRIENDICA_VERSION "2022.05-dev" +ENV FRIENDICA_ADDONS "2022.05-dev" RUN set -ex; \ fetchDeps=" \ diff --git a/2021.12-rc/apache/config/00apcu.config.php b/2022.05-dev/apache/config/00apcu.config.php similarity index 100% rename from 2021.12-rc/apache/config/00apcu.config.php rename to 2022.05-dev/apache/config/00apcu.config.php diff --git a/2021.12-rc/apache/config/01redis.config.php b/2022.05-dev/apache/config/01redis.config.php similarity index 100% rename from 2021.12-rc/apache/config/01redis.config.php rename to 2022.05-dev/apache/config/01redis.config.php diff --git a/2021.12-rc/apache/config/zz-docker.config.php b/2022.05-dev/apache/config/zz-docker.config.php similarity index 100% rename from 2021.12-rc/apache/config/zz-docker.config.php rename to 2022.05-dev/apache/config/zz-docker.config.php diff --git a/2021.12-rc/apache/cron.sh b/2022.05-dev/apache/cron.sh similarity index 100% rename from 2021.12-rc/apache/cron.sh rename to 2022.05-dev/apache/cron.sh diff --git a/2021.12-dev/apache/entrypoint-dev.sh b/2022.05-dev/apache/entrypoint-dev.sh similarity index 100% rename from 2021.12-dev/apache/entrypoint-dev.sh rename to 2022.05-dev/apache/entrypoint-dev.sh diff --git a/2021.12-rc/apache/entrypoint.sh b/2022.05-dev/apache/entrypoint.sh similarity index 100% rename from 2021.12-rc/apache/entrypoint.sh rename to 2022.05-dev/apache/entrypoint.sh diff --git a/2021.12-rc/apache/setup_msmtp.sh b/2022.05-dev/apache/setup_msmtp.sh similarity index 100% rename from 2021.12-rc/apache/setup_msmtp.sh rename to 2022.05-dev/apache/setup_msmtp.sh diff --git a/2021.12-rc/apache/upgrade.exclude b/2022.05-dev/apache/upgrade.exclude similarity index 100% rename from 2021.12-rc/apache/upgrade.exclude rename to 2022.05-dev/apache/upgrade.exclude diff --git a/2021.12-rc/fpm-alpine/Dockerfile b/2022.05-dev/fpm-alpine/Dockerfile similarity index 98% rename from 2021.12-rc/fpm-alpine/Dockerfile rename to 2022.05-dev/fpm-alpine/Dockerfile index 1d2d24a..2a9d914 100644 --- a/2021.12-rc/fpm-alpine/Dockerfile +++ b/2022.05-dev/fpm-alpine/Dockerfile @@ -134,8 +134,8 @@ VOLUME /var/www/html # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_SYSLOG_FLAGS 39 -ENV FRIENDICA_VERSION "2021.12-rc" -ENV FRIENDICA_ADDONS "2021.12-rc" +ENV FRIENDICA_VERSION "2022.05-dev" +ENV FRIENDICA_ADDONS "2022.05-dev" RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ diff --git a/2021.12-rc/fpm-alpine/config/00apcu.config.php b/2022.05-dev/fpm-alpine/config/00apcu.config.php similarity index 100% rename from 2021.12-rc/fpm-alpine/config/00apcu.config.php rename to 2022.05-dev/fpm-alpine/config/00apcu.config.php diff --git a/2021.12-rc/fpm-alpine/config/01redis.config.php b/2022.05-dev/fpm-alpine/config/01redis.config.php similarity index 100% rename from 2021.12-rc/fpm-alpine/config/01redis.config.php rename to 2022.05-dev/fpm-alpine/config/01redis.config.php diff --git a/2021.12-rc/fpm-alpine/config/zz-docker.config.php b/2022.05-dev/fpm-alpine/config/zz-docker.config.php similarity index 100% rename from 2021.12-rc/fpm-alpine/config/zz-docker.config.php rename to 2022.05-dev/fpm-alpine/config/zz-docker.config.php diff --git a/2021.12-rc/fpm-alpine/cron.sh b/2022.05-dev/fpm-alpine/cron.sh similarity index 100% rename from 2021.12-rc/fpm-alpine/cron.sh rename to 2022.05-dev/fpm-alpine/cron.sh diff --git a/2021.12-dev/fpm-alpine/entrypoint-dev.sh b/2022.05-dev/fpm-alpine/entrypoint-dev.sh similarity index 100% rename from 2021.12-dev/fpm-alpine/entrypoint-dev.sh rename to 2022.05-dev/fpm-alpine/entrypoint-dev.sh diff --git a/2021.12-rc/fpm-alpine/entrypoint.sh b/2022.05-dev/fpm-alpine/entrypoint.sh similarity index 100% rename from 2021.12-rc/fpm-alpine/entrypoint.sh rename to 2022.05-dev/fpm-alpine/entrypoint.sh diff --git a/2021.12-rc/fpm-alpine/setup_msmtp.sh b/2022.05-dev/fpm-alpine/setup_msmtp.sh similarity index 100% rename from 2021.12-rc/fpm-alpine/setup_msmtp.sh rename to 2022.05-dev/fpm-alpine/setup_msmtp.sh diff --git a/2021.12-rc/fpm-alpine/upgrade.exclude b/2022.05-dev/fpm-alpine/upgrade.exclude similarity index 100% rename from 2021.12-rc/fpm-alpine/upgrade.exclude rename to 2022.05-dev/fpm-alpine/upgrade.exclude diff --git a/2021.12-rc/fpm/Dockerfile b/2022.05-dev/fpm/Dockerfile similarity index 98% rename from 2021.12-rc/fpm/Dockerfile rename to 2022.05-dev/fpm/Dockerfile index 7f73ff2..8a6917e 100644 --- a/2021.12-rc/fpm/Dockerfile +++ b/2022.05-dev/fpm/Dockerfile @@ -153,8 +153,8 @@ VOLUME /var/www/html # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR ENV FRIENDICA_SYSLOG_FLAGS 39 -ENV FRIENDICA_VERSION "2021.12-rc" -ENV FRIENDICA_ADDONS "2021.12-rc" +ENV FRIENDICA_VERSION "2022.05-dev" +ENV FRIENDICA_ADDONS "2022.05-dev" RUN set -ex; \ fetchDeps=" \ diff --git a/2021.12-rc/fpm/config/00apcu.config.php b/2022.05-dev/fpm/config/00apcu.config.php similarity index 100% rename from 2021.12-rc/fpm/config/00apcu.config.php rename to 2022.05-dev/fpm/config/00apcu.config.php diff --git a/2021.12-rc/fpm/config/01redis.config.php b/2022.05-dev/fpm/config/01redis.config.php similarity index 100% rename from 2021.12-rc/fpm/config/01redis.config.php rename to 2022.05-dev/fpm/config/01redis.config.php diff --git a/2021.12-rc/fpm/config/zz-docker.config.php b/2022.05-dev/fpm/config/zz-docker.config.php similarity index 100% rename from 2021.12-rc/fpm/config/zz-docker.config.php rename to 2022.05-dev/fpm/config/zz-docker.config.php diff --git a/2021.12-rc/fpm/cron.sh b/2022.05-dev/fpm/cron.sh similarity index 100% rename from 2021.12-rc/fpm/cron.sh rename to 2022.05-dev/fpm/cron.sh diff --git a/2021.12-dev/fpm/entrypoint-dev.sh b/2022.05-dev/fpm/entrypoint-dev.sh similarity index 100% rename from 2021.12-dev/fpm/entrypoint-dev.sh rename to 2022.05-dev/fpm/entrypoint-dev.sh diff --git a/2021.12-rc/fpm/entrypoint.sh b/2022.05-dev/fpm/entrypoint.sh similarity index 100% rename from 2021.12-rc/fpm/entrypoint.sh rename to 2022.05-dev/fpm/entrypoint.sh diff --git a/2021.12-rc/fpm/setup_msmtp.sh b/2022.05-dev/fpm/setup_msmtp.sh similarity index 100% rename from 2021.12-rc/fpm/setup_msmtp.sh rename to 2022.05-dev/fpm/setup_msmtp.sh diff --git a/2021.12-rc/fpm/upgrade.exclude b/2022.05-dev/fpm/upgrade.exclude similarity index 100% rename from 2021.12-rc/fpm/upgrade.exclude rename to 2022.05-dev/fpm/upgrade.exclude diff --git a/develop.txt b/develop.txt index 9fb7221..5866fa5 100644 --- a/develop.txt +++ b/develop.txt @@ -1 +1 @@ -2021.12-dev +2022.05-dev diff --git a/latest.txt b/latest.txt index 76c052b..67093d3 100644 --- a/latest.txt +++ b/latest.txt @@ -1 +1 @@ -2021.09 +2022.02