diff --git a/docker-compose.yml b/docker-compose.yml index 85764f8..ec8cecf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,56 +1,22 @@ -version: '2' - +version: "2.1" services: - - nginx: - image: "grocy/nginx:v2.7.1-3" - build: - args: - GROCY_VERSION: v2.7.1 - context: . - dockerfile: Dockerfile-grocy-nginx - depends_on: - - grocy - environment: - - VIRTUAL_HOST=grocy.franv.site - - LETSENCRYPT_HOST=grocy.franv.site - - LETSENCRYPT_EMAIL=ouch@thetrauma.org - - VIRTUAL_PORT=8080 - -# ports: -# - '82:8080' -# - '445:8443' - read_only: true - tmpfs: - - /tmp - volumes: - - /var/log/nginx - container_name: nginx - grocy: - image: "grocy/grocy:v2.7.1-3" - build: - args: - GITHUB_API_TOKEN: "${GITHUB_API_TOKEN}" - GROCY_VERSION: v2.7.1 - context: . - dockerfile: Dockerfile-grocy - expose: - - '9000' - read_only: true - tmpfs: - - /tmp - volumes: - - /var/log/php7 - - app-db:/var/www/data - env_file: - - grocy.env + image: linuxserver/grocy container_name: grocy + environment: + - PUID=1002 + - PGID=1002 + - TZ= + - VIRTUAL_HOST=grocy.airdog.site + - LETSENCRYPT_HOST=grocy.airdog.site + - LETSENCRYPT_EMAIL=ouch@thetrauma.org -volumes: - app-db: + volumes: + - ./config:/config + restart: unless-stopped + networks: + franvproxy_test_proxy-tier: networks: - default: - external: - name: franvproxy_proxy-tier + franvproxy_test_proxy-tier: + external: true