Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Friendica Release 2024.12 #274

Merged
merged 2 commits into from
Jan 1, 2025
Merged

Friendica Release 2024.12 #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5182608
Friendica Release 2024.12
nupplaphil Jan 1, 2025
898e27d
Friendica Release 2024.12
nupplaphil Jan 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 0 additions & 54 deletions 2024.12-dev/apache/entrypoint-dev.sh
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions 2024.12-dev/fpm-alpine/entrypoint-dev.sh
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions 2024.12-dev/fpm/entrypoint-dev.sh
View file
Open in desktop

This file was deleted.

41 changes: 37 additions & 4 deletions 2024.12-dev/apache/Dockerfile → 2024.12/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,18 +169,51 @@ RUN set -ex;\

# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39
ENV FRIENDICA_VERSION "2024.12-dev"
ENV FRIENDICA_ADDONS "2024.12-dev"
ENV FRIENDICA_VERSION "2024.12"
ENV FRIENDICA_ADDONS "2024.12"
ENV FRIENDICA_DOWNLOAD_SHA256 "37bb0fad549c955fced70059b62cd4f3364e344363011a2d054f1b6c425cfb9e"
ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "fbbece635dfaec9d2365581aaafb913cec00128e5815087c9d9b8a46d8dc7ed5"

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 2024.09-rc/apache/config/00apcu.config.php → 2024.12/apache/config/00apcu.config.php
View file
Open in desktop
File renamed without changes.
0 2024.09-rc/apache/config/01redis.config.php → 2024.12/apache/config/01redis.config.php
View file
Open in desktop
File renamed without changes.
0 ....09-rc/apache/config/zz-docker.config.php → 2024.12/apache/config/zz-docker.config.php
View file
Open in desktop
File renamed without changes.
0 2024.09-rc/apache/cron.sh → 2024.12/apache/cron.sh
View file
Open in desktop
File renamed without changes.
0 2024.09-rc/apache/entrypoint.sh → 2024.12/apache/entrypoint.sh
View file
Open in desktop
File renamed without changes.
0 2024.09-rc/apache/setup_msmtp.sh → 2024.12/apache/setup_msmtp.sh
View file
Open in desktop
File renamed without changes.
0 2024.09-rc/apache/upgrade.exclude → 2024.12/apache/upgrade.exclude
View file
Open in desktop
File renamed without changes.
40 changes: 36 additions & 4 deletions 2024.12-dev/fpm-alpine/Dockerfile → 2024.12/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,16 +139,48 @@ VOLUME /var/www/html

# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39
ENV FRIENDICA_VERSION "2024.12-dev"
ENV FRIENDICA_ADDONS "2024.12-dev"
ENV FRIENDICA_VERSION "2024.12"
ENV FRIENDICA_ADDONS "2024.12"
ENV FRIENDICA_DOWNLOAD_SHA256 "37bb0fad549c955fced70059b62cd4f3364e344363011a2d054f1b6c425cfb9e"
ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "fbbece635dfaec9d2365581aaafb913cec00128e5815087c9d9b8a46d8dc7ed5"

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 ...09-rc/fpm-alpine/config/00apcu.config.php → 2024.12/fpm-alpine/config/00apcu.config.php
View file
Open in desktop
File renamed without changes.
0 ...9-rc/fpm-alpine/config/01redis.config.php → 2024.12/fpm-alpine/config/01redis.config.php
View file
Open in desktop
File renamed without changes.
0 ...rc/fpm-alpine/config/zz-docker.config.php → ...12/fpm-alpine/config/zz-docker.config.php
View file
Open in desktop
File renamed without changes.
0 2024.09-rc/fpm-alpine/cron.sh → 2024.12/fpm-alpine/cron.sh
View file
Open in desktop
File renamed without changes.
0 2024.09-rc/fpm-alpine/entrypoint.sh → 2024.12/fpm-alpine/entrypoint.sh
View file
Open in desktop
File renamed without changes.
0 2024.09-rc/fpm-alpine/setup_msmtp.sh → 2024.12/fpm-alpine/setup_msmtp.sh
View file
Open in desktop
File renamed without changes.
0 2024.09-rc/fpm-alpine/upgrade.exclude → 2024.12/fpm-alpine/upgrade.exclude
View file
Open in desktop
File renamed without changes.
41 changes: 37 additions & 4 deletions 2024.09-rc/fpm/Dockerfile → 2024.12/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,18 +160,51 @@ VOLUME /var/www/html

# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39
ENV FRIENDICA_VERSION "2024.09-rc"
ENV FRIENDICA_ADDONS "2024.09-rc"
ENV FRIENDICA_VERSION "2024.12"
ENV FRIENDICA_ADDONS "2024.12"
ENV FRIENDICA_DOWNLOAD_SHA256 "37bb0fad549c955fced70059b62cd4f3364e344363011a2d054f1b6c425cfb9e"
ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "fbbece635dfaec9d2365581aaafb913cec00128e5815087c9d9b8a46d8dc7ed5"

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 2024.09-rc/fpm/config/00apcu.config.php → 2024.12/fpm/config/00apcu.config.php
View file
Open in desktop
File renamed without changes.
0 2024.09-rc/fpm/config/01redis.config.php → 2024.12/fpm/config/01redis.config.php
View file
Open in desktop
File renamed without changes.
0 2024.09-rc/fpm/config/zz-docker.config.php → 2024.12/fpm/config/zz-docker.config.php
View file
Open in desktop
File renamed without changes.
0 2024.09-rc/fpm/cron.sh → 2024.12/fpm/cron.sh
View file
Open in desktop
File renamed without changes.
0 2024.09-rc/fpm/entrypoint.sh → 2024.12/fpm/entrypoint.sh
View file
Open in desktop
File renamed without changes.
0 2024.09-rc/fpm/setup_msmtp.sh → 2024.12/fpm/setup_msmtp.sh
View file
Open in desktop
File renamed without changes.
0 2024.09-rc/fpm/upgrade.exclude → 2024.12/fpm/upgrade.exclude
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions 2024.09-rc/apache/Dockerfile → 2025.02-dev/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ RUN set -ex;\

# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39
ENV FRIENDICA_VERSION "2024.09-rc"
ENV FRIENDICA_ADDONS "2024.09-rc"
ENV FRIENDICA_VERSION "2025.02-dev"
ENV FRIENDICA_ADDONS "2025.02-dev"

RUN set -ex; \
fetchDeps=" \
Expand Down
0 2024.12-dev/apache/config/00apcu.config.php → 2025.02-dev/apache/config/00apcu.config.php
View file
Open in desktop
File renamed without changes.
0 2024.12-dev/apache/config/01redis.config.php → 2025.02-dev/apache/config/01redis.config.php
View file
Open in desktop
File renamed without changes.
0 ...12-dev/apache/config/zz-docker.config.php → ...02-dev/apache/config/zz-docker.config.php
View file
Open in desktop
File renamed without changes.
0 2024.12-dev/apache/cron.sh → 2025.02-dev/apache/cron.sh
View file
Open in desktop
File renamed without changes.
0 2024.09-rc/apache/entrypoint-dev.sh → 2025.02-dev/apache/entrypoint-dev.sh
View file
Open in desktop
File renamed without changes.
0 2024.12-dev/apache/entrypoint.sh → 2025.02-dev/apache/entrypoint.sh
View file
Open in desktop
File renamed without changes.
0 2024.12-dev/apache/setup_msmtp.sh → 2025.02-dev/apache/setup_msmtp.sh
View file
Open in desktop
File renamed without changes.
0 2024.12-dev/apache/upgrade.exclude → 2025.02-dev/apache/upgrade.exclude
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions 2024.09-rc/fpm-alpine/Dockerfile → 2025.02-dev/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ VOLUME /var/www/html

# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39
ENV FRIENDICA_VERSION "2024.09-rc"
ENV FRIENDICA_ADDONS "2024.09-rc"
ENV FRIENDICA_VERSION "2025.02-dev"
ENV FRIENDICA_ADDONS "2025.02-dev"

RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
Expand Down
0 ...2-dev/fpm-alpine/config/00apcu.config.php → ...2-dev/fpm-alpine/config/00apcu.config.php
View file
Open in desktop
File renamed without changes.
0 ...-dev/fpm-alpine/config/01redis.config.php → ...-dev/fpm-alpine/config/01redis.config.php
View file
Open in desktop
File renamed without changes.
0 ...ev/fpm-alpine/config/zz-docker.config.php → ...ev/fpm-alpine/config/zz-docker.config.php
View file
Open in desktop
File renamed without changes.
0 2024.12-dev/fpm-alpine/cron.sh → 2025.02-dev/fpm-alpine/cron.sh
View file
Open in desktop
File renamed without changes.
0 2024.09-rc/fpm-alpine/entrypoint-dev.sh → 2025.02-dev/fpm-alpine/entrypoint-dev.sh
View file
Open in desktop
File renamed without changes.
0 2024.12-dev/fpm-alpine/entrypoint.sh → 2025.02-dev/fpm-alpine/entrypoint.sh
View file
Open in desktop
File renamed without changes.
0 2024.12-dev/fpm-alpine/setup_msmtp.sh → 2025.02-dev/fpm-alpine/setup_msmtp.sh
View file
Open in desktop
File renamed without changes.
0 2024.12-dev/fpm-alpine/upgrade.exclude → 2025.02-dev/fpm-alpine/upgrade.exclude
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions 2024.12-dev/fpm/Dockerfile → 2025.02-dev/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ VOLUME /var/www/html

# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39
ENV FRIENDICA_VERSION "2024.12-dev"
ENV FRIENDICA_ADDONS "2024.12-dev"
ENV FRIENDICA_VERSION "2025.02-dev"
ENV FRIENDICA_ADDONS "2025.02-dev"

RUN set -ex; \
fetchDeps=" \
Expand Down
0 2024.12-dev/fpm/config/00apcu.config.php → 2025.02-dev/fpm/config/00apcu.config.php
View file
Open in desktop
File renamed without changes.
0 2024.12-dev/fpm/config/01redis.config.php → 2025.02-dev/fpm/config/01redis.config.php
View file
Open in desktop
File renamed without changes.
0 2024.12-dev/fpm/config/zz-docker.config.php → 2025.02-dev/fpm/config/zz-docker.config.php
View file
Open in desktop
File renamed without changes.
0 2024.12-dev/fpm/cron.sh → 2025.02-dev/fpm/cron.sh
View file
Open in desktop
File renamed without changes.
0 2024.09-rc/fpm/entrypoint-dev.sh → 2025.02-dev/fpm/entrypoint-dev.sh
View file
Open in desktop
File renamed without changes.
0 2024.12-dev/fpm/entrypoint.sh → 2025.02-dev/fpm/entrypoint.sh
View file
Open in desktop
File renamed without changes.
0 2024.12-dev/fpm/setup_msmtp.sh → 2025.02-dev/fpm/setup_msmtp.sh
View file
Open in desktop
File renamed without changes.
0 2024.12-dev/fpm/upgrade.exclude → 2025.02-dev/fpm/upgrade.exclude
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion develop.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024.12-dev
2025.02-dev
2 changes: 1 addition & 1 deletion latest.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024.08
2024.12
Loading