From 8f935c1115427127065f3b57bd1627b1bffc3abd Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 25 May 2019 13:11:56 -0300 Subject: Remove docker-compose.yml from git-crypt --- docker-compose.yml | 43 ++++++++++++++++++++++++++++++++++++++++++- secrets/docker-compose.yml | Bin 1239 -> 0 bytes secrets/envrc.sh | Bin 268 -> 369 bytes 3 files changed, 42 insertions(+), 1 deletion(-) mode change 120000 => 100644 docker-compose.yml delete mode 100644 secrets/docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 120000 index 7f1b8b1..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1 +0,0 @@ -secrets/docker-compose.yml \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..f7f6ab3 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,42 @@ +version: '3' + +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 + - "${PWD}/volumes/docker/certs:/etc/nginx/certs:ro" + + ssl_companion: + image: jrcs/letsencrypt-nginx-proxy-companion + container_name: ssl-companion + volumes: + - "${PWD}/volumes/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: + - "${PWD}/volumes/applications/wallabag/data:/var/www/wallabag/data" + - "${PWD}/volumes/applications/wallabag/images:/var/www/wallabag/web/assets/images" + ports: + - "80:5000" + 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/secrets/docker-compose.yml b/secrets/docker-compose.yml deleted file mode 100644 index db77532..0000000 Binary files a/secrets/docker-compose.yml and /dev/null differ diff --git a/secrets/envrc.sh b/secrets/envrc.sh index 67060ea..3011d68 100644 Binary files a/secrets/envrc.sh and b/secrets/envrc.sh differ -- cgit v1.2.3