Merge pull request #47 from nupplaphil/docker-46

Change 2018.12-rc to 2019.01-rc

.docker-files/cron.sh

@@ -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
 

.travis.yml

@@ -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

2018.09/apache/cron.sh

@@ -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
 

2018.09/fpm-alpine/cron.sh

@@ -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
 

2018.09/fpm/cron.sh

@@ -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
 

2018.12-dev/apache/cron.sh

@@ -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
 

2018.12-dev/fpm-alpine/cron.sh

@@ -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
 

2018.12-dev/fpm/cron.sh

@@ -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
 

2019.01-rc/apache/Dockerfile

@@ -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"]

2019.01-rc/apache/cron.sh

@@ -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
 

2019.01-rc/fpm-alpine/Dockerfile

@@ -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"]

2019.01-rc/fpm-alpine/cron.sh

@@ -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
 

2019.01-rc/fpm/Dockerfile

@@ -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"]

2019.01-rc/fpm/cron.sh

@@ -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
 

update.sh

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