From dcff5c0996c6e87a2ce73a9e088e9541ef9ea640 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 11 Jun 2021 15:14:46 +0200 Subject: [PATCH 1/2] Fixed moodle, nextcloud, wordpress img versions --- docker/moodle/Dockerfile | 12 +++++++----- docker/moodle/moodle.yml | 2 ++ docker/nextcloud/Dockerfile | 3 ++- docker/nextcloud/nextcloud.yml | 2 ++ docker/wordpress/wordpress.yml | 4 ++-- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/docker/moodle/Dockerfile b/docker/moodle/Dockerfile index ac30f0e..e6f7663 100644 --- a/docker/moodle/Dockerfile +++ b/docker/moodle/Dockerfile @@ -1,8 +1,10 @@ -ARG LANG=$LANG -ARG LANGUAGE=$LANGUAGE - -ARG ARCH= -FROM ${ARCH}erseco/alpine-php7-webserver +# ARG LANG=$LANG +# ARG LANGUAGE=$LANGUAGE +# +# ARG ARCH= +ARG IMG=$MOODLE_IMG +FROM ${IMG} +# FROM ${ARCH}${IMG} LABEL maintainer="Adapted from: Ernesto Serrano " diff --git a/docker/moodle/moodle.yml b/docker/moodle/moodle.yml index 03ddf83..cbc30e5 100644 --- a/docker/moodle/moodle.yml +++ b/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: diff --git a/docker/nextcloud/Dockerfile b/docker/nextcloud/Dockerfile index edfe77a..4b1d42b 100644 --- a/docker/nextcloud/Dockerfile +++ b/docker/nextcloud/Dockerfile @@ -1,4 +1,5 @@ -FROM nextcloud:fpm-alpine +ARG IMG=$NEXTCLOUD_IMG +FROM ${IMG} RUN set -ex; \ \ diff --git a/docker/nextcloud/nextcloud.yml b/docker/nextcloud/nextcloud.yml index 2c65cc0..2f067a6 100644 --- a/docker/nextcloud/nextcloud.yml +++ b/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 diff --git a/docker/wordpress/wordpress.yml b/docker/wordpress/wordpress.yml index 350be10..03e7b3a 100644 --- a/docker/wordpress/wordpress.yml +++ b/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 @@ -33,7 +33,7 @@ services: - isard_net isard-apps-wordpress-cli: - image: wordpress:cli + image: ${WORDPRESS_CLI_IMG} container_name: isard-apps-wordpress-cli volumes: *wordpress-volumes From 83cb6c453818749e22b6609660da779a3310b58e Mon Sep 17 00:00:00 2001 From: root Date: Mon, 14 Jun 2021 09:33:02 +0200 Subject: [PATCH 2/2] Fixed restart to unless-stopped --- docker/etherpad/etherpad.yml | 2 +- docker/jitsi/jitsi.yml | 2 +- docker/mariadb/mariadb.yml | 1 + docker/onlyoffice/onlyoffice.yml | 1 + docker/redis/redis.yml | 1 + docker/wordpress/wordpress.yml | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docker/etherpad/etherpad.yml b/docker/etherpad/etherpad.yml index 8d35b84..7d8c46a 100644 --- a/docker/etherpad/etherpad.yml +++ b/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: diff --git a/docker/jitsi/jitsi.yml b/docker/jitsi/jitsi.yml index ef0d717..64db5dc 100644 --- a/docker/jitsi/jitsi.yml +++ b/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' diff --git a/docker/mariadb/mariadb.yml b/docker/mariadb/mariadb.yml index f8ef1df..b0a0901 100644 --- a/docker/mariadb/mariadb.yml +++ b/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 \ No newline at end of file diff --git a/docker/onlyoffice/onlyoffice.yml b/docker/onlyoffice/onlyoffice.yml index 0457f14..88b5a62 100644 --- a/docker/onlyoffice/onlyoffice.yml +++ b/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 diff --git a/docker/redis/redis.yml b/docker/redis/redis.yml index a3beb00..03d945f 100644 --- a/docker/redis/redis.yml +++ b/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 \ No newline at end of file diff --git a/docker/wordpress/wordpress.yml b/docker/wordpress/wordpress.yml index 03e7b3a..ff7ede8 100644 --- a/docker/wordpress/wordpress.yml +++ b/docker/wordpress/wordpress.yml @@ -29,6 +29,7 @@ services: - isard-apps-mariadb links: - isard-apps-mariadb + restart: unless-stopped networks: - isard_net