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

Merge pull request #47 from nupplaphil/docker-46

Browse source 
Change 2018.12-rc to 2019.01-rc
This commit is contained in:
Philipp 2019-01-04 02:06:45 +01:00 • committed by GitHub
commit 5081f9329a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.docker-files/cron.sh
View file

@ -1,7 +1,7 @@
#!/bin/sh
trap "break;exit" HUP INT TERM
while [ ! -f /var/www/html/config/local.ini.php ] || [ ! -f /var/www/html/config/local.config.php ]; do
while [ ! -f /var/www/html/config/local.ini.php ] && [ ! -f /var/www/html/config/local.config.php ]; do
sleep 1
done

18
.travis.yml
View file

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

2
2018.09/apache/cron.sh
View file

@ -1,7 +1,7 @@
#!/bin/sh
trap "break;exit" HUP INT TERM
while [ ! -f /var/www/html/config/local.ini.php ] || [ ! -f /var/www/html/config/local.config.php ]; do
while [ ! -f /var/www/html/config/local.ini.php ] && [ ! -f /var/www/html/config/local.config.php ]; do
sleep 1
done

2
2018.09/fpm-alpine/cron.sh
View file

@ -1,7 +1,7 @@
#!/bin/sh
trap "break;exit" HUP INT TERM
while [ ! -f /var/www/html/config/local.ini.php ] || [ ! -f /var/www/html/config/local.config.php ]; do
while [ ! -f /var/www/html/config/local.ini.php ] && [ ! -f /var/www/html/config/local.config.php ]; do
sleep 1
done

2
2018.09/fpm/cron.sh
View file

@ -1,7 +1,7 @@
#!/bin/sh
trap "break;exit" HUP INT TERM
while [ ! -f /var/www/html/config/local.ini.php ] || [ ! -f /var/www/html/config/local.config.php ]; do
while [ ! -f /var/www/html/config/local.ini.php ] && [ ! -f /var/www/html/config/local.config.php ]; do
sleep 1
done

2
2018.12-dev/apache/cron.sh
View file

@ -1,7 +1,7 @@
#!/bin/sh
trap "break;exit" HUP INT TERM
while [ ! -f /var/www/html/config/local.ini.php ] || [ ! -f /var/www/html/config/local.config.php ]; do
while [ ! -f /var/www/html/config/local.ini.php ] && [ ! -f /var/www/html/config/local.config.php ]; do
sleep 1
done

2
2018.12-dev/fpm-alpine/cron.sh
View file

@ -1,7 +1,7 @@
#!/bin/sh
trap "break;exit" HUP INT TERM
while [ ! -f /var/www/html/config/local.ini.php ] || [ ! -f /var/www/html/config/local.config.php ]; do
while [ ! -f /var/www/html/config/local.ini.php ] && [ ! -f /var/www/html/config/local.config.php ]; do
sleep 1
done

2
2018.12-dev/fpm/cron.sh
View file

@ -1,7 +1,7 @@
#!/bin/sh
trap "break;exit" HUP INT TERM
while [ ! -f /var/www/html/config/local.ini.php ] || [ ! -f /var/www/html/config/local.config.php ]; do
while [ ! -f /var/www/html/config/local.ini.php ] && [ ! -f /var/www/html/config/local.config.php ]; do
sleep 1
done

4
2018.12-rc/apache/Dockerfile → 2019.01-rc/apache/Dockerfile
View file

@ -106,8 +106,8 @@ RUN {\
COPY *.sh upgrade.exclude /
RUN chmod +x /*.sh
ENV FRIENDICA_VERSION 2018.12-rc
ENV FRIENDICA_ADDONS 2018.12-rc
ENV FRIENDICA_VERSION 2019.01-rc
ENV FRIENDICA_ADDONS 2019.01-rc
ENTRYPOINT ["/entrypoint.sh"]

2
2018.12-rc/fpm/cron.sh → 2019.01-rc/apache/cron.sh
View file

@ -1,7 +1,7 @@
#!/bin/sh
trap "break;exit" HUP INT TERM
while [ ! -f /var/www/html/config/local.ini.php ] || [ ! -f /var/www/html/config/local.config.php ]; do
while [ ! -f /var/www/html/config/local.ini.php ] && [ ! -f /var/www/html/config/local.config.php ]; do
sleep 1
done

0
2018.12-rc/apache/entrypoint.sh → 2019.01-rc/apache/entrypoint.sh
View file

0
2018.12-rc/apache/upgrade.exclude → 2019.01-rc/apache/upgrade.exclude
View file

4
2018.12-rc/fpm-alpine/Dockerfile → 2019.01-rc/fpm-alpine/Dockerfile
View file

@ -89,8 +89,8 @@ RUN {\
COPY *.sh upgrade.exclude /
RUN chmod +x /*.sh
ENV FRIENDICA_VERSION 2018.12-rc
ENV FRIENDICA_ADDONS 2018.12-rc
ENV FRIENDICA_VERSION 2019.01-rc
ENV FRIENDICA_ADDONS 2019.01-rc
ENTRYPOINT ["/entrypoint.sh"]

2
2018.12-rc/apache/cron.sh → 2019.01-rc/fpm-alpine/cron.sh
View file

@ -1,7 +1,7 @@
#!/bin/sh
trap "break;exit" HUP INT TERM
while [ ! -f /var/www/html/config/local.ini.php ] || [ ! -f /var/www/html/config/local.config.php ]; do
while [ ! -f /var/www/html/config/local.ini.php ] && [ ! -f /var/www/html/config/local.config.php ]; do
sleep 1
done

0
2018.12-rc/fpm-alpine/entrypoint.sh → 2019.01-rc/fpm-alpine/entrypoint.sh
View file

0
2018.12-rc/fpm-alpine/upgrade.exclude → 2019.01-rc/fpm-alpine/upgrade.exclude
View file

4
2018.12-rc/fpm/Dockerfile → 2019.01-rc/fpm/Dockerfile
View file

@ -98,8 +98,8 @@ RUN {\
COPY *.sh upgrade.exclude /
RUN chmod +x /*.sh
ENV FRIENDICA_VERSION 2018.12-rc
ENV FRIENDICA_ADDONS 2018.12-rc
ENV FRIENDICA_VERSION 2019.01-rc
ENV FRIENDICA_ADDONS 2019.01-rc
ENTRYPOINT ["/entrypoint.sh"]

2
2018.12-rc/fpm-alpine/cron.sh → 2019.01-rc/fpm/cron.sh
View file

@ -1,7 +1,7 @@
#!/bin/sh
trap "break;exit" HUP INT TERM
while [ ! -f /var/www/html/config/local.ini.php ] || [ ! -f /var/www/html/config/local.config.php ]; do
while [ ! -f /var/www/html/config/local.ini.php ] && [ ! -f /var/www/html/config/local.config.php ]; do
sleep 1
done

0
2018.12-rc/fpm/entrypoint.sh → 2019.01-rc/fpm/entrypoint.sh
View file

0
2018.12-rc/fpm/upgrade.exclude → 2019.01-rc/fpm/upgrade.exclude
View file

2
update.sh
View file

@ -41,7 +41,7 @@ variants=(
)
versions=(
2018.12-rc
2019.01-rc
2018.12-dev
2018.09
)