diff --git a/NextCloud/docker-compose.yml b/NextCloud/docker-compose.yml index c2ce4a8..cd526e3 100644 --- a/NextCloud/docker-compose.yml +++ b/NextCloud/docker-compose.yml @@ -16,9 +16,9 @@ services: - traefik - db environment: + - MYSQL_USER=nextcloud - MYSQL_PASSWORD= - MYSQL_DATABASE=nextcloud - - MYSQL_USER=nextcloud - MYSQL_HOST=db restart: unless-stopped @@ -32,9 +32,9 @@ services: - nextcloud environment: - MYSQL_ROOT_PASSWORD= + - MYSQL_USER=nextcloud - MYSQL_PASSWORD= - MYSQL_DATABASE=nextcloud - - MYSQL_USER=nextcloud restart: unless-stopped networks: diff --git a/ReverseProxy/docker-compose.yml b/ReverseProxy/docker-compose.yml deleted file mode 100644 index 3bbefe2..0000000 --- a/ReverseProxy/docker-compose.yml +++ /dev/null @@ -1,46 +0,0 @@ -version: '3.8' - -services: - - #nginx (80, 443, 8080) - nginx: - image: 'jc21/nginx-proxy-manager:latest' - container_name: nginx - ports: - # These ports are in format : - - '80:80' # Public HTTP Port - - '443:443' # Public HTTPS Port - - '8080:81' # Admin Web Port - # Add any other Stream port you want to expose - # - '21:21' # FTP - # Uncomment the next line if you uncomment anything in the section - # environment: - # Uncomment this if you want to change the location of - # the SQLite DB file within the container - # DB_SQLITE_FILE: "/data/database.sqlite" - - # Uncomment this if IPv6 is not enabled on your host - # DISABLE_IPV6: 'true' - volumes: - - ./nginx/data:/data - - ./nginx/letsencrypt:/etc/letsencrypt - restart: unless-stopped - - networks: - - websites - - gitea - - databases - - bitwarden - - nextcloud - -networks: - websites: - name: websites_default - gitea: - name: gitea_default - databases: - name: database_default - bitwarden: - name: bitwarden_default - nextcloud: - name: nextcloud_default \ No newline at end of file diff --git a/Traefik/docker-compose.yml b/Traefik/docker-compose.yml index 16c45f6..d7071d9 100644 --- a/Traefik/docker-compose.yml +++ b/Traefik/docker-compose.yml @@ -6,24 +6,50 @@ services: traefik: image: 'traefik:latest' container_name: traefik - ports: - # These ports are in format : - - '80:80' # Public HTTP Port - - '443:443' # Public HTTPS Port - - '8080:8080' # Dashboard Port volumes: - - ./nginx/data:/data - - ./nginx/letsencrypt:/etc/letsencrypt - restart: unless-stopped - + - ./letsencrypt:/letsencrypt + - /var/run/docker.sock:/var/run/docker.sock + - ./dynamic.yaml:/dynamic.yaml networks: + ## Traefik is sat on every network to allow exposure ## - traefik - frontend - development - backend - bitwarden - services + ports: + ## These ports are in format : ## + - '80:80' # Public HTTP Port + - '443:443' # Public HTTPS Port + - '8080:8080' # Dashboard Port + command: + ## General Settings ## + - --api.insecure=true + - --api.dashboard=true + - --api.debug=true + ## Log Settings ## + - --log.level=DEBUG # <== Setting the level of the logs from traefik + ## Provider Settings ## + - --providers.docker=true + - --providers.docker.exposedbydefault=false + - --providers.file.filename=/dynamic.yaml + ## Entrypoints Settings ## + - --entrypoints.http.address=:80 + - --entrypoints.https.address=:443 + ## Certificate Settings ## + - --certificatesresolvers.mytlschallenge.acme.tlschallenge=true + - --certificatesresolvers.mytlschallenge.acme.email=contact@luke-else.co.uk + - --certificatesresolvers.mytlschallenge.acme.storage=/letsencrypt/acme.json + labels: + ## Exposing API Dashboard Service ## + - "traefik.enable=true" + - "traefik.http.routers.api.rule=Host(traefik.luke-else.co.uk)" + - "traefik.http.routers.api.service=api@internal" + restart: unless-stopped + +## All Networks for child containers - All containers depend on this container being spun up ## networks: traefik: name: traefik