Merge branch 'fix-restart-policy' into 'master'

Fix restart policy

See merge request isard/isard-apps!20

docker/etherpad/etherpad.yml

@@ -6,7 +6,7 @@ services:
       context: ${BUILD_ROOT_PATH}/docker/etherpad
       dockerfile: Dockerfile
     container_name: isard-apps-etherpad
-    restart: on-failure:10
+    restart: unless-stopped
     volumes:
       - /etc/localtime:/etc/localtime:ro
 #    ports:

docker/jitsi/jitsi.yml

@@ -5,7 +5,7 @@ services:
     jitsi:
         container_name: jitsi
         image: jitsi/web:latest
-        restart: ${RESTART_POLICY}
+        restart: unless-stopped
 #        ports:
 #            - '${HTTP_PORT}:80'
 #            - '${HTTPS_PORT}:443'

docker/mariadb/mariadb.yml

@@ -20,5 +20,6 @@ services:
       MYSQL_DATABASE: wordpress
       MYSQL_USER: wordpress
       MYSQL_PASSWORD: ${WORDPRESS_MARIADB_PASSWORD}
+    restart: unless-stopped
     networks:
       - isard_net

docker/moodle/Dockerfile

@@ -1,8 +1,10 @@
-ARG LANG=$LANG
+# ARG LANG=$LANG
-ARG LANGUAGE=$LANGUAGE
+# ARG LANGUAGE=$LANGUAGE
-
+# 
-ARG ARCH=
+# ARG ARCH=
-FROM ${ARCH}erseco/alpine-php7-webserver
+ARG IMG=$MOODLE_IMG
+FROM ${IMG}
+# FROM ${ARCH}${IMG}
 
 LABEL maintainer="Adapted from: Ernesto Serrano <info@ernesto.es>"
 

docker/moodle/moodle.yml

@@ -4,6 +4,8 @@ services:
     build:
       context: ${BUILD_ROOT_PATH}/docker/moodle
       dockerfile: Dockerfile
+      args:
+        - IMG=${MOODLE_IMG}
     container_name: isard-apps-moodle
     restart: unless-stopped
     volumes:

docker/nextcloud/Dockerfile

@@ -1,4 +1,5 @@
-FROM nextcloud:fpm-alpine
+ARG IMG=$NEXTCLOUD_IMG
+FROM ${IMG}
 
 RUN set -ex; \
     \

docker/nextcloud/nextcloud.yml

@@ -4,6 +4,8 @@ services:
     build:
       context: ${BUILD_ROOT_PATH}/docker/nextcloud
       dockerfile: Dockerfile
+      args:
+        - IMG=${NEXTCLOUD_IMG}
       #target: production
     container_name: isard-apps-nextcloud-app
     restart: unless-stopped

docker/onlyoffice/onlyoffice.yml

@@ -6,6 +6,7 @@ services:
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ${BUILD_ROOT_PATH}/docker/onlyoffice/local.json:/etc/onlyoffice/documentserver/local.json:ro
+    restart: unless-stopped
     networks:
       - isard_net
 

docker/redis/redis.yml

@@ -6,5 +6,6 @@ services:
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ${DB_FOLDER}/redis:/data
+    restart: unless-stopped
     networks:
       - isard_net

docker/wordpress/wordpress.yml

@@ -13,7 +13,7 @@ x-volumes:
 
 services:
   isard-apps-wordpress:
-    image: wordpress:latest # https://hub.docker.com/_/wordpress/
+    image: ${WORDPRESS_IMG} # https://hub.docker.com/_/wordpress/
     container_name: isard-apps-wordpress
 #    ports:
 #      - ${IP}:80:80 # change ip if required
@@ -29,11 +29,12 @@ services:
       - isard-apps-mariadb
     links:
       - isard-apps-mariadb
+    restart: unless-stopped
     networks:
       - isard_net
 
   isard-apps-wordpress-cli:
-    image: wordpress:cli
+    image: ${WORDPRESS_CLI_IMG}
     container_name: isard-apps-wordpress-cli
     volumes:
       *wordpress-volumes