From 59138a5aa2ca536a4418f18776d0cda027487ea3 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 25 May 2019 17:50:05 -0300 Subject: Add "restart: always" rule for all containers --- docker-compose.yaml | 45 +++++++++++++++++++++++++++++++++++++++++++++ docker-compose.yml | 42 ------------------------------------------ 2 files changed, 45 insertions(+), 42 deletions(-) create mode 100644 docker-compose.yaml delete mode 100644 docker-compose.yml diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..00c8cd0 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,45 @@ +version: '2' + +services: + proxy: + image: jwilder/nginx-proxy + container_name: nginx-proxy + restart: always + ports: + - '80:80' + - '443:443' + volumes: + - /var/run/docker.sock:/tmp/docker.sock:ro + - /etc/nginx/vhost.d + - /usr/share/nginx/html + - "${VOLUME_HOME}/docker/certs:/etc/nginx/certs:ro" + + ssl_companion: + image: jrcs/letsencrypt-nginx-proxy-companion + container_name: ssl-companion + restart: always + volumes: + - "${VOLUME_HOME}/docker/certs:/etc/nginx/certs:rw" + - /var/run/docker.sock:/var/run/docker.sock:ro + volumes_from: + - proxy + depends_on: + - proxy + + wallabag: + image: wallabag/wallabag + container_name: wallabag + restart: always + volumes: + - "${VOLUME_HOME}/applications/wallabag/data:/var/www/wallabag/data" + - "${VOLUME_HOME}/applications/wallabag/images:/var/www/wallabag/web/assets/images" + ports: + - "5000:80" + environment: + - SYMFONY__ENV__FOSUSER_REGISTRATION=false + - SYMFONY__ENV__FOSUSER_CONFIRMATION=false + - SYMFONY__ENV__DOMAIN_NAME=https://wallabag.${TLD} + - VIRTUAL_HOST=wallabag.${TLD} + - VIRTUAL_PORT=5000 + - LETSENCRYPT_HOST=wallabag.${TLD} + - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL} diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index fe10ed7..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,42 +0,0 @@ -version: '2' - -services: - proxy: - image: jwilder/nginx-proxy - container_name: nginx-proxy - ports: - - '80:80' - - '443:443' - volumes: - - /var/run/docker.sock:/tmp/docker.sock:ro - - /etc/nginx/vhost.d - - /usr/share/nginx/html - - "${VOLUME_HOME}/docker/certs:/etc/nginx/certs:ro" - - ssl_companion: - image: jrcs/letsencrypt-nginx-proxy-companion - container_name: ssl-companion - volumes: - - "${VOLUME_HOME}/docker/certs:/etc/nginx/certs:rw" - - /var/run/docker.sock:/var/run/docker.sock:ro - volumes_from: - - proxy - depends_on: - - proxy - - wallabag: - image: wallabag/wallabag - container_name: wallabag - volumes: - - "${VOLUME_HOME}/applications/wallabag/data:/var/www/wallabag/data" - - "${VOLUME_HOME}/applications/wallabag/images:/var/www/wallabag/web/assets/images" - ports: - - "5000:80" - environment: - - SYMFONY__ENV__FOSUSER_REGISTRATION=false - - SYMFONY__ENV__FOSUSER_CONFIRMATION=false - - SYMFONY__ENV__DOMAIN_NAME=https://wallabag.${TLD} - - VIRTUAL_HOST=wallabag.${TLD} - - VIRTUAL_PORT=5000 - - LETSENCRYPT_HOST=wallabag.${TLD} - - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL} -- cgit v1.2.3