Merge pull request #60 from nupplaphil/Hotfix_2019.04

Hotfix 2019.04
2024-12-29 12:52:11 +01:00 · 2019-04-29 08:06:58 +02:00 · 2019-04-29 08:06:58 +02:00 · 729496e322
commit 729496e322
parent c23f0fbbba 527e0b7d3a
15 changed files with 19 additions and 19 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -53,20 +53,20 @@ jobs:
        - ./generate-stackbrew-library.sh

    - stage: test images (amd64)
-      env: VERSION=2019.03 VARIANT=fpm-alpine ARCH=amd64
-    - env: VERSION=2019.03 VARIANT=fpm ARCH=amd64
-    - env: VERSION=2019.03 VARIANT=apache ARCH=amd64
+      env: VERSION=2019.04 VARIANT=fpm-alpine ARCH=amd64
+    - env: VERSION=2019.04 VARIANT=fpm ARCH=amd64
+    - env: VERSION=2019.04 VARIANT=apache ARCH=amd64
    - env: VERSION=2019.06-dev VARIANT=fpm-alpine ARCH=amd64
    - env: VERSION=2019.06-dev VARIANT=fpm ARCH=amd64
    - env: VERSION=2019.06-dev VARIANT=apache ARCH=amd64

    - stage: test images (full)
-      env: VERSION=2019.03 VARIANT=fpm-alpine ARCH=amd64
-    - env: VERSION=2019.03 VARIANT=fpm-alpine ARCH=i386
-    - env: VERSION=2019.03 VARIANT=fpm ARCH=amd64
-    - env: VERSION=2019.03 VARIANT=fpm ARCH=i386
-    - env: VERSION=2019.03 VARIANT=apache ARCH=amd64
-    - env: VERSION=2019.03 VARIANT=apache ARCH=i386
+      env: VERSION=2019.04 VARIANT=fpm-alpine ARCH=amd64
+    - env: VERSION=2019.04 VARIANT=fpm-alpine ARCH=i386
+    - env: VERSION=2019.04 VARIANT=fpm ARCH=amd64
+    - env: VERSION=2019.04 VARIANT=fpm ARCH=i386
+    - env: VERSION=2019.04 VARIANT=apache ARCH=amd64
+    - env: VERSION=2019.04 VARIANT=apache ARCH=i386
    - env: VERSION=2019.06-dev VARIANT=fpm-alpine ARCH=amd64
    - env: VERSION=2019.06-dev VARIANT=fpm-alpine ARCH=i386
    - env: VERSION=2019.06-dev VARIANT=fpm ARCH=amd64
--- a/2019.04/apache/Dockerfile
+++ b/2019.04/apache/Dockerfile
@ -106,8 +106,8 @@ RUN {\
 COPY *.sh upgrade.exclude /
 RUN chmod +x /*.sh

-ENV FRIENDICA_VERSION 2019.03
-ENV FRIENDICA_ADDONS 2019.03
+ENV FRIENDICA_VERSION 2019.04
+ENV FRIENDICA_ADDONS 2019.04

 RUN set -ex; \
    curl -fsSL -o friendica.tar.gz \
--- a/2019.04/apache/cron.sh
+++ b/2019.04/apache/cron.sh
--- a/2019.04/apache/entrypoint.sh
+++ b/2019.04/apache/entrypoint.sh
--- a/2019.04/apache/upgrade.exclude
+++ b/2019.04/apache/upgrade.exclude
--- a/2019.04/fpm-alpine/Dockerfile
+++ b/2019.04/fpm-alpine/Dockerfile
@ -89,8 +89,8 @@ RUN {\
 COPY *.sh upgrade.exclude /
 RUN chmod +x /*.sh

-ENV FRIENDICA_VERSION 2019.03
-ENV FRIENDICA_ADDONS 2019.03
+ENV FRIENDICA_VERSION 2019.04
+ENV FRIENDICA_ADDONS 2019.04

 RUN set -ex; \
    curl -fsSL -o friendica.tar.gz \
--- a/2019.04/fpm-alpine/cron.sh
+++ b/2019.04/fpm-alpine/cron.sh
--- a/2019.04/fpm-alpine/entrypoint.sh
+++ b/2019.04/fpm-alpine/entrypoint.sh
--- a/2019.04/fpm-alpine/upgrade.exclude
+++ b/2019.04/fpm-alpine/upgrade.exclude
--- a/2019.04/fpm/Dockerfile
+++ b/2019.04/fpm/Dockerfile
@ -98,8 +98,8 @@ RUN {\
 COPY *.sh upgrade.exclude /
 RUN chmod +x /*.sh

-ENV FRIENDICA_VERSION 2019.03
-ENV FRIENDICA_ADDONS 2019.03
+ENV FRIENDICA_VERSION 2019.04
+ENV FRIENDICA_ADDONS 2019.04

 RUN set -ex; \
    curl -fsSL -o friendica.tar.gz \
--- a/2019.04/fpm/cron.sh
+++ b/2019.04/fpm/cron.sh
--- a/2019.04/fpm/entrypoint.sh
+++ b/2019.04/fpm/entrypoint.sh
--- a/2019.04/fpm/upgrade.exclude
+++ b/2019.04/fpm/upgrade.exclude
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@ -2,9 +2,9 @@
 set -Eeuo pipefail

 declare -A release_channel=(
-	[production]='2019.03'
-	[stable]='2019.03'
-	[latest]='2019.03'
+	[production]='2019.04'
+	[stable]='2019.04'
+	[latest]='2019.04'
 )

 self="$(basename "$BASH_SOURCE")"
--- a/update.sh
+++ b/update.sh
@ -42,7 +42,7 @@ variants=(

 versions=(
    2019.06-dev
-    2019.03
+    2019.04
 )

 travisEnv=