friendica/docker
2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2024-11-15 18:59:27 +01:00
Code Issues Releases Wiki Activity

Friendica Release 2022.02

Browse source
This commit is contained in:
Philipp Holzer 2022-02-06 21:57:05 +01:00
parent a06442fb86
commit e5f935f6ec
Signed by: nupplaPhil
GPG key ID: 24A7501396EB5432
56 changed files with 118 additions and 182 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
2021.12-rc/apache/entrypoint-dev.sh
View file

@ -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 "$@"

54
2021.12-rc/fpm-alpine/entrypoint-dev.sh
View file

@ -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 "$@"

54
2021.12-rc/fpm/entrypoint-dev.sh
View file

@ -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 "$@"

41
2021.12-rc/apache/Dockerfile → 2022.02/apache/Dockerfile
View file

@ -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"]

0
2021.12-dev/apache/config/00apcu.config.php → 2022.02/apache/config/00apcu.config.php
View file

0
2021.12-dev/apache/config/01redis.config.php → 2022.02/apache/config/01redis.config.php
View file

0
2021.12-dev/apache/config/zz-docker.config.php → 2022.02/apache/config/zz-docker.config.php
View file

0
2021.12-dev/apache/cron.sh → 2022.02/apache/cron.sh
View file

0
2021.12-dev/apache/entrypoint.sh → 2022.02/apache/entrypoint.sh
View file

0
2021.12-dev/apache/setup_msmtp.sh → 2022.02/apache/setup_msmtp.sh
View file

0
2021.12-dev/apache/upgrade.exclude → 2022.02/apache/upgrade.exclude
View file

40
2021.12-dev/fpm-alpine/Dockerfile → 2022.02/fpm-alpine/Dockerfile
View file

@ -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"]

0
2021.12-dev/fpm-alpine/config/00apcu.config.php → 2022.02/fpm-alpine/config/00apcu.config.php
View file

0
2021.12-dev/fpm-alpine/config/01redis.config.php → 2022.02/fpm-alpine/config/01redis.config.php
View file

0
2021.12-dev/fpm-alpine/config/zz-docker.config.php → 2022.02/fpm-alpine/config/zz-docker.config.php
View file

0
2021.12-dev/fpm-alpine/cron.sh → 2022.02/fpm-alpine/cron.sh
View file

0
2021.12-dev/fpm-alpine/entrypoint.sh → 2022.02/fpm-alpine/entrypoint.sh
View file

0
2021.12-dev/fpm-alpine/setup_msmtp.sh → 2022.02/fpm-alpine/setup_msmtp.sh
View file

0
2021.12-dev/fpm-alpine/upgrade.exclude → 2022.02/fpm-alpine/upgrade.exclude
View file

41
2021.12-dev/fpm/Dockerfile → 2022.02/fpm/Dockerfile
View file

@ -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"]

0
2021.12-dev/fpm/config/00apcu.config.php → 2022.02/fpm/config/00apcu.config.php
View file

0
2021.12-dev/fpm/config/01redis.config.php → 2022.02/fpm/config/01redis.config.php
View file

0
2021.12-dev/fpm/config/zz-docker.config.php → 2022.02/fpm/config/zz-docker.config.php
View file

0
2021.12-dev/fpm/cron.sh → 2022.02/fpm/cron.sh
View file

0
2021.12-dev/fpm/entrypoint.sh → 2022.02/fpm/entrypoint.sh
View file

0
2021.12-dev/fpm/setup_msmtp.sh → 2022.02/fpm/setup_msmtp.sh
View file

0
2021.12-dev/fpm/upgrade.exclude → 2022.02/fpm/upgrade.exclude
View file

4
2021.12-dev/apache/Dockerfile → 2022.05-dev/apache/Dockerfile
View file

@ -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=" \

0
2021.12-rc/apache/config/00apcu.config.php → 2022.05-dev/apache/config/00apcu.config.php
View file

0
2021.12-rc/apache/config/01redis.config.php → 2022.05-dev/apache/config/01redis.config.php
View file

0
2021.12-rc/apache/config/zz-docker.config.php → 2022.05-dev/apache/config/zz-docker.config.php
View file

0
2021.12-rc/apache/cron.sh → 2022.05-dev/apache/cron.sh
View file

0
2021.12-dev/apache/entrypoint-dev.sh → 2022.05-dev/apache/entrypoint-dev.sh
View file

0
2021.12-rc/apache/entrypoint.sh → 2022.05-dev/apache/entrypoint.sh
View file

0
2021.12-rc/apache/setup_msmtp.sh → 2022.05-dev/apache/setup_msmtp.sh
View file

0
2021.12-rc/apache/upgrade.exclude → 2022.05-dev/apache/upgrade.exclude
View file

4
2021.12-rc/fpm-alpine/Dockerfile → 2022.05-dev/fpm-alpine/Dockerfile
View file

@ -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 \

0
2021.12-rc/fpm-alpine/config/00apcu.config.php → 2022.05-dev/fpm-alpine/config/00apcu.config.php
View file

0
2021.12-rc/fpm-alpine/config/01redis.config.php → 2022.05-dev/fpm-alpine/config/01redis.config.php
View file

0
2021.12-rc/fpm-alpine/config/zz-docker.config.php → 2022.05-dev/fpm-alpine/config/zz-docker.config.php
View file

0
2021.12-rc/fpm-alpine/cron.sh → 2022.05-dev/fpm-alpine/cron.sh
View file

0
2021.12-dev/fpm-alpine/entrypoint-dev.sh → 2022.05-dev/fpm-alpine/entrypoint-dev.sh
View file

0
2021.12-rc/fpm-alpine/entrypoint.sh → 2022.05-dev/fpm-alpine/entrypoint.sh
View file

0
2021.12-rc/fpm-alpine/setup_msmtp.sh → 2022.05-dev/fpm-alpine/setup_msmtp.sh
View file

0
2021.12-rc/fpm-alpine/upgrade.exclude → 2022.05-dev/fpm-alpine/upgrade.exclude
View file

4
2021.12-rc/fpm/Dockerfile → 2022.05-dev/fpm/Dockerfile
View file

@ -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=" \

0
2021.12-rc/fpm/config/00apcu.config.php → 2022.05-dev/fpm/config/00apcu.config.php
View file

0
2021.12-rc/fpm/config/01redis.config.php → 2022.05-dev/fpm/config/01redis.config.php
View file

0
2021.12-rc/fpm/config/zz-docker.config.php → 2022.05-dev/fpm/config/zz-docker.config.php
View file

0
2021.12-rc/fpm/cron.sh → 2022.05-dev/fpm/cron.sh
View file

0
2021.12-dev/fpm/entrypoint-dev.sh → 2022.05-dev/fpm/entrypoint-dev.sh
View file

0
2021.12-rc/fpm/entrypoint.sh → 2022.05-dev/fpm/entrypoint.sh
View file

0
2021.12-rc/fpm/setup_msmtp.sh → 2022.05-dev/fpm/setup_msmtp.sh
View file

0
2021.12-rc/fpm/upgrade.exclude → 2022.05-dev/fpm/upgrade.exclude
View file

2
develop.txt
View file

@ -1 +1 @@
2021.12-dev
2022.05-dev

2
latest.txt
View file

@ -1 +1 @@
2021.09
2022.02