-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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.
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 2021.06 RC #10213
Merged
Merged
Friendica Release 2021.06 RC #10213
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff for 1e8670b:diff --git a/_bashbrew-cat b/_bashbrew-cat
index aa28f16..f6d6ba9 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -60,3 +60,18 @@ Tags: 2021.06-dev-fpm-alpine, dev-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 9e22de455afc8ba9a39b3b17316f613e2b4d0df8
Directory: 2021.06-dev/fpm-alpine
+
+Tags: 2021.06-rc-apache, rc-apache, 2021.06-rc, rc
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 0efa3647e8b4efa2994501c5470345f29faa5bc5
+Directory: 2021.06-rc/apache
+
+Tags: 2021.06-rc-fpm, rc-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 0efa3647e8b4efa2994501c5470345f29faa5bc5
+Directory: 2021.06-rc/fpm
+
+Tags: 2021.06-rc-fpm-alpine, rc-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 0efa3647e8b4efa2994501c5470345f29faa5bc5
+Directory: 2021.06-rc/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 0d299b6..52c9f0b 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -14,6 +14,10 @@ friendica:2021.06-dev
friendica:2021.06-dev-apache
friendica:2021.06-dev-fpm
friendica:2021.06-dev-fpm-alpine
+friendica:2021.06-rc
+friendica:2021.06-rc-apache
+friendica:2021.06-rc-fpm
+friendica:2021.06-rc-fpm-alpine
friendica:apache
friendica:dev
friendica:dev-apache
@@ -22,6 +26,10 @@ friendica:dev-fpm-alpine
friendica:fpm
friendica:fpm-alpine
friendica:latest
+friendica:rc
+friendica:rc-apache
+friendica:rc-fpm
+friendica:rc-fpm-alpine
friendica:stable
friendica:stable-apache
friendica:stable-fpm
diff --git a/friendica_dev-fpm-alpine/Dockerfile b/friendica_rc-fpm-alpine/Dockerfile
similarity index 97%
copy from friendica_dev-fpm-alpine/Dockerfile
copy to friendica_rc-fpm-alpine/Dockerfile
index 53be791..d00af2a 100644
--- a/friendica_dev-fpm-alpine/Dockerfile
+++ b/friendica_rc-fpm-alpine/Dockerfile
@@ -98,8 +98,8 @@ RUN set -ex; \
VOLUME /var/www/html
-ENV FRIENDICA_VERSION "2021.06-dev"
-ENV FRIENDICA_ADDONS "2021.06-dev"
+ENV FRIENDICA_VERSION "2021.06-rc"
+ENV FRIENDICA_ADDONS "2021.06-rc"
COPY *.sh upgrade.exclude /
diff --git a/friendica_2020.09-fpm-alpine/config/00apcu.config.php b/friendica_rc-fpm-alpine/config/00apcu.config.php
similarity index 100%
copy from friendica_2020.09-fpm-alpine/config/00apcu.config.php
copy to friendica_rc-fpm-alpine/config/00apcu.config.php
diff --git a/friendica_2020.09-fpm-alpine/config/01redis.config.php b/friendica_rc-fpm-alpine/config/01redis.config.php
similarity index 100%
copy from friendica_2020.09-fpm-alpine/config/01redis.config.php
copy to friendica_rc-fpm-alpine/config/01redis.config.php
diff --git a/friendica_2020.09-fpm-alpine/config/zz-docker.config.php b/friendica_rc-fpm-alpine/config/zz-docker.config.php
similarity index 100%
copy from friendica_2020.09-fpm-alpine/config/zz-docker.config.php
copy to friendica_rc-fpm-alpine/config/zz-docker.config.php
diff --git a/friendica_2020.09-fpm-alpine/cron.sh b/friendica_rc-fpm-alpine/cron.sh
similarity index 100%
copy from friendica_2020.09-fpm-alpine/cron.sh
copy to friendica_rc-fpm-alpine/cron.sh
diff --git a/friendica_dev-fpm-alpine/entrypoint-dev.sh b/friendica_rc-fpm-alpine/entrypoint-dev.sh
similarity index 100%
copy from friendica_dev-fpm-alpine/entrypoint-dev.sh
copy to friendica_rc-fpm-alpine/entrypoint-dev.sh
diff --git a/friendica_2020.09-fpm-alpine/entrypoint.sh b/friendica_rc-fpm-alpine/entrypoint.sh
similarity index 100%
copy from friendica_2020.09-fpm-alpine/entrypoint.sh
copy to friendica_rc-fpm-alpine/entrypoint.sh
diff --git a/friendica_2020.09-fpm-alpine/setup_msmtp.sh b/friendica_rc-fpm-alpine/setup_msmtp.sh
similarity index 100%
copy from friendica_2020.09-fpm-alpine/setup_msmtp.sh
copy to friendica_rc-fpm-alpine/setup_msmtp.sh
diff --git a/friendica_2020.09-fpm-alpine/upgrade.exclude b/friendica_rc-fpm-alpine/upgrade.exclude
similarity index 100%
copy from friendica_2020.09-fpm-alpine/upgrade.exclude
copy to friendica_rc-fpm-alpine/upgrade.exclude
diff --git a/friendica_dev-fpm/Dockerfile b/friendica_rc-fpm/Dockerfile
similarity index 98%
copy from friendica_dev-fpm/Dockerfile
copy to friendica_rc-fpm/Dockerfile
index d0c66b6..43d2ede 100644
--- a/friendica_dev-fpm/Dockerfile
+++ b/friendica_rc-fpm/Dockerfile
@@ -123,8 +123,8 @@ RUN set -ex; \
VOLUME /var/www/html
-ENV FRIENDICA_VERSION "2021.06-dev"
-ENV FRIENDICA_ADDONS "2021.06-dev"
+ENV FRIENDICA_VERSION "2021.06-rc"
+ENV FRIENDICA_ADDONS "2021.06-rc"
COPY *.sh upgrade.exclude /
diff --git a/friendica_2020.09-fpm-alpine/config/00apcu.config.php b/friendica_rc-fpm/config/00apcu.config.php
similarity index 100%
copy from friendica_2020.09-fpm-alpine/config/00apcu.config.php
copy to friendica_rc-fpm/config/00apcu.config.php
diff --git a/friendica_2020.09-fpm-alpine/config/01redis.config.php b/friendica_rc-fpm/config/01redis.config.php
similarity index 100%
copy from friendica_2020.09-fpm-alpine/config/01redis.config.php
copy to friendica_rc-fpm/config/01redis.config.php
diff --git a/friendica_2020.09-fpm-alpine/config/zz-docker.config.php b/friendica_rc-fpm/config/zz-docker.config.php
similarity index 100%
copy from friendica_2020.09-fpm-alpine/config/zz-docker.config.php
copy to friendica_rc-fpm/config/zz-docker.config.php
diff --git a/friendica_2020.09-fpm-alpine/cron.sh b/friendica_rc-fpm/cron.sh
similarity index 100%
copy from friendica_2020.09-fpm-alpine/cron.sh
copy to friendica_rc-fpm/cron.sh
diff --git a/friendica_dev-fpm-alpine/entrypoint-dev.sh b/friendica_rc-fpm/entrypoint-dev.sh
similarity index 100%
copy from friendica_dev-fpm-alpine/entrypoint-dev.sh
copy to friendica_rc-fpm/entrypoint-dev.sh
diff --git a/friendica_2020.09-fpm-alpine/entrypoint.sh b/friendica_rc-fpm/entrypoint.sh
similarity index 100%
copy from friendica_2020.09-fpm-alpine/entrypoint.sh
copy to friendica_rc-fpm/entrypoint.sh
diff --git a/friendica_2020.09-fpm-alpine/setup_msmtp.sh b/friendica_rc-fpm/setup_msmtp.sh
similarity index 100%
copy from friendica_2020.09-fpm-alpine/setup_msmtp.sh
copy to friendica_rc-fpm/setup_msmtp.sh
diff --git a/friendica_2020.09-fpm-alpine/upgrade.exclude b/friendica_rc-fpm/upgrade.exclude
similarity index 100%
copy from friendica_2020.09-fpm-alpine/upgrade.exclude
copy to friendica_rc-fpm/upgrade.exclude
diff --git a/friendica_dev/Dockerfile b/friendica_rc/Dockerfile
similarity index 98%
copy from friendica_dev/Dockerfile
copy to friendica_rc/Dockerfile
index 368326e..a4e8d56 100644
--- a/friendica_dev/Dockerfile
+++ b/friendica_rc/Dockerfile
@@ -132,8 +132,8 @@ RUN set -ex;\
} > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip
-ENV FRIENDICA_VERSION "2021.06-dev"
-ENV FRIENDICA_ADDONS "2021.06-dev"
+ENV FRIENDICA_VERSION "2021.06-rc"
+ENV FRIENDICA_ADDONS "2021.06-rc"
COPY *.sh upgrade.exclude /
diff --git a/friendica_2020.09-fpm-alpine/config/00apcu.config.php b/friendica_rc/config/00apcu.config.php
similarity index 100%
copy from friendica_2020.09-fpm-alpine/config/00apcu.config.php
copy to friendica_rc/config/00apcu.config.php
diff --git a/friendica_2020.09-fpm-alpine/config/01redis.config.php b/friendica_rc/config/01redis.config.php
similarity index 100%
copy from friendica_2020.09-fpm-alpine/config/01redis.config.php
copy to friendica_rc/config/01redis.config.php
diff --git a/friendica_2020.09-fpm-alpine/config/zz-docker.config.php b/friendica_rc/config/zz-docker.config.php
similarity index 100%
copy from friendica_2020.09-fpm-alpine/config/zz-docker.config.php
copy to friendica_rc/config/zz-docker.config.php
diff --git a/friendica_2020.09-fpm-alpine/cron.sh b/friendica_rc/cron.sh
similarity index 100%
copy from friendica_2020.09-fpm-alpine/cron.sh
copy to friendica_rc/cron.sh
diff --git a/friendica_dev-fpm-alpine/entrypoint-dev.sh b/friendica_rc/entrypoint-dev.sh
similarity index 100%
copy from friendica_dev-fpm-alpine/entrypoint-dev.sh
copy to friendica_rc/entrypoint-dev.sh
diff --git a/friendica_2020.09-fpm-alpine/entrypoint.sh b/friendica_rc/entrypoint.sh
similarity index 100%
copy from friendica_2020.09-fpm-alpine/entrypoint.sh
copy to friendica_rc/entrypoint.sh
diff --git a/friendica_2020.09-fpm-alpine/setup_msmtp.sh b/friendica_rc/setup_msmtp.sh
similarity index 100%
copy from friendica_2020.09-fpm-alpine/setup_msmtp.sh
copy to friendica_rc/setup_msmtp.sh
diff --git a/friendica_2020.09-fpm-alpine/upgrade.exclude b/friendica_rc/upgrade.exclude
similarity index 100%
copy from friendica_2020.09-fpm-alpine/upgrade.exclude
copy to friendica_rc/upgrade.exclude
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.