friendica/docker
2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2025-04-03 22:30:35 +02:00
Code Issues Releases Wiki Activity

Update to 2019.03-RC

Browse source
This commit is contained in:
Philipp Holzer 2019-02-20 18:55:40 +01:00
parent 0809143643
commit b1ab65ec80
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
10 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.docker-files/entrypoint.sh
View file

@ -20,11 +20,11 @@ clone_develop() {
friendica_git="${FRIENDICA_VERSION}" friendica_git="${FRIENDICA_VERSION}"
addons_git="${FRIENDICA_ADDONS}" addons_git="${FRIENDICA_ADDONS}"
if echo "$friendica_git" | grep -Eq '^.*\-dev'; then if echo "${friendica_git,,}" | grep -Eq '^.*\-dev'; then
friendica_git="develop" friendica_git="develop"
fi fi
if echo "$addons_git" | grep -Eq '^.*\-dev'; then if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then
addons_git="develop" addons_git="develop"
fi fi

9
.travis.yml
View file

@ -59,6 +59,9 @@ jobs:
- env: VERSION=2019.03-dev VARIANT=fpm-alpine ARCH=amd64 - env: VERSION=2019.03-dev VARIANT=fpm-alpine ARCH=amd64
- env: VERSION=2019.03-dev VARIANT=fpm ARCH=amd64 - env: VERSION=2019.03-dev VARIANT=fpm ARCH=amd64
- env: VERSION=2019.03-dev VARIANT=apache ARCH=amd64 - env: VERSION=2019.03-dev VARIANT=apache ARCH=amd64
- env: VERSION=2019.03-RC VARIANT=fpm-alpine ARCH=amd64
- env: VERSION=2019.03-RC VARIANT=fpm ARCH=amd64
- env: VERSION=2019.03-RC VARIANT=apache ARCH=amd64
- stage: test images (full) - stage: test images (full)
env: VERSION=2019.01 VARIANT=fpm-alpine ARCH=amd64 env: VERSION=2019.01 VARIANT=fpm-alpine ARCH=amd64
@ -73,6 +76,12 @@ jobs:
- env: VERSION=2019.03-dev VARIANT=fpm ARCH=i386 - env: VERSION=2019.03-dev VARIANT=fpm ARCH=i386
- env: VERSION=2019.03-dev VARIANT=apache ARCH=amd64 - env: VERSION=2019.03-dev VARIANT=apache ARCH=amd64
- env: VERSION=2019.03-dev VARIANT=apache ARCH=i386 - env: VERSION=2019.03-dev VARIANT=apache ARCH=i386
- env: VERSION=2019.03-RC VARIANT=fpm-alpine ARCH=amd64
- env: VERSION=2019.03-RC VARIANT=fpm-alpine ARCH=i386
- env: VERSION=2019.03-RC VARIANT=fpm ARCH=amd64
- env: VERSION=2019.03-RC VARIANT=fpm ARCH=i386
- env: VERSION=2019.03-RC VARIANT=apache ARCH=amd64
- env: VERSION=2019.03-RC VARIANT=apache ARCH=i386
- stage: deploy - stage: deploy
env: SCRIPT=build_and_push.sh env: SCRIPT=build_and_push.sh

4
2019.01/apache/entrypoint.sh
View file

@ -20,11 +20,11 @@ clone_develop() {
friendica_git="${FRIENDICA_VERSION}" friendica_git="${FRIENDICA_VERSION}"
addons_git="${FRIENDICA_ADDONS}" addons_git="${FRIENDICA_ADDONS}"
if echo "$friendica_git" | grep -Eq '^.*\-dev'; then if echo "${friendica_git,,}" | grep -Eq '^.*\-dev'; then
friendica_git="develop" friendica_git="develop"
fi fi
if echo "$addons_git" | grep -Eq '^.*\-dev'; then if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then
addons_git="develop" addons_git="develop"
fi fi

4
2019.01/fpm-alpine/entrypoint.sh
View file

@ -20,11 +20,11 @@ clone_develop() {
friendica_git="${FRIENDICA_VERSION}" friendica_git="${FRIENDICA_VERSION}"
addons_git="${FRIENDICA_ADDONS}" addons_git="${FRIENDICA_ADDONS}"
if echo "$friendica_git" | grep -Eq '^.*\-dev'; then if echo "${friendica_git,,}" | grep -Eq '^.*\-dev'; then
friendica_git="develop" friendica_git="develop"
fi fi
if echo "$addons_git" | grep -Eq '^.*\-dev'; then if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then
addons_git="develop" addons_git="develop"
fi fi

4
2019.01/fpm/entrypoint.sh
View file

@ -20,11 +20,11 @@ clone_develop() {
friendica_git="${FRIENDICA_VERSION}" friendica_git="${FRIENDICA_VERSION}"
addons_git="${FRIENDICA_ADDONS}" addons_git="${FRIENDICA_ADDONS}"
if echo "$friendica_git" | grep -Eq '^.*\-dev'; then if echo "${friendica_git,,}" | grep -Eq '^.*\-dev'; then
friendica_git="develop" friendica_git="develop"
fi fi
if echo "$addons_git" | grep -Eq '^.*\-dev'; then if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then
addons_git="develop" addons_git="develop"
fi fi

4
2019.03-dev/apache/entrypoint.sh
View file

@ -20,11 +20,11 @@ clone_develop() {
friendica_git="${FRIENDICA_VERSION}" friendica_git="${FRIENDICA_VERSION}"
addons_git="${FRIENDICA_ADDONS}" addons_git="${FRIENDICA_ADDONS}"
if echo "$friendica_git" | grep -Eq '^.*\-dev'; then if echo "${friendica_git,,}" | grep -Eq '^.*\-dev'; then
friendica_git="develop" friendica_git="develop"
fi fi
if echo "$addons_git" | grep -Eq '^.*\-dev'; then if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then
addons_git="develop" addons_git="develop"
fi fi

4
2019.03-dev/fpm-alpine/entrypoint.sh
View file

@ -20,11 +20,11 @@ clone_develop() {
friendica_git="${FRIENDICA_VERSION}" friendica_git="${FRIENDICA_VERSION}"
addons_git="${FRIENDICA_ADDONS}" addons_git="${FRIENDICA_ADDONS}"
if echo "$friendica_git" | grep -Eq '^.*\-dev'; then if echo "${friendica_git,,}" | grep -Eq '^.*\-dev'; then
friendica_git="develop" friendica_git="develop"
fi fi
if echo "$addons_git" | grep -Eq '^.*\-dev'; then if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then
addons_git="develop" addons_git="develop"
fi fi

4
2019.03-dev/fpm/entrypoint.sh
View file

@ -20,11 +20,11 @@ clone_develop() {
friendica_git="${FRIENDICA_VERSION}" friendica_git="${FRIENDICA_VERSION}"
addons_git="${FRIENDICA_ADDONS}" addons_git="${FRIENDICA_ADDONS}"
if echo "$friendica_git" | grep -Eq '^.*\-dev'; then if echo "${friendica_git,,}" | grep -Eq '^.*\-dev'; then
friendica_git="develop" friendica_git="develop"
fi fi
if echo "$addons_git" | grep -Eq '^.*\-dev'; then if echo "{$addons_git,,}" | grep -Eq '^.*\-dev'; then
addons_git="develop" addons_git="develop"
fi fi

2
generate-stackbrew-library.sh
View file

@ -2,7 +2,7 @@
set -Eeuo pipefail set -Eeuo pipefail
declare -A release_channel=( declare -A release_channel=(
[production]='2018.01' [production]='2019.01'
[stable]='2019.01' [stable]='2019.01'
[latest]='2019.01' [latest]='2019.01'
) )

3
update.sh
View file

@ -41,6 +41,7 @@ variants=(
) )
versions=( versions=(
2019.03-RC
2019.03-dev 2019.03-dev
2019.01 2019.01
) )
@ -60,7 +61,7 @@ function create_variant() {
# Check which installation typ we need. If develop, the source will get downloaded by git. # Check which installation typ we need. If develop, the source will get downloaded by git.
install_type='stable' install_type='stable'
if [[ "$1" == *-dev ]] || [[ "$1" == *-rc ]]; then if [[ "${1,,}" == *-dev ]] || [[ "${1,,}" == *-rc ]]; then
install_type='develop' install_type='develop'
fi fi