diff --git a/README.md b/README.md index cb6836d..d28e028 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -![Build Status](https://woodpecker.nixc.us/api/badges/135/status.svg) +![Build Status](https://woodpecker.nixc.us/api/badges/136/status.svg) diff --git a/docker-compose.production.yml b/docker-compose.production.yml index 961f714..ec2d545 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -1,7 +1,7 @@ version: "3.9" services: - webgrind: + webdav: build: - context: docker/webgrind + context: docker/webdav dockerfile: Dockerfile.production - image: git.nixc.us/nixius/webgrind:production + image: git.nixc.us/nixius/webdav:production diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml index f09d83d..fbb3911 100644 --- a/docker-compose.staging.yml +++ b/docker-compose.staging.yml @@ -1,7 +1,7 @@ version: "3.9" services: - webgrind: + webdav: build: - context: docker/webgrind + context: docker/webdav dockerfile: Dockerfile - image: git.nixc.us/nixius/webgrind:staging + image: git.nixc.us/nixius/webdav:staging diff --git a/docker/webdav/Dockerfile b/docker/webdav/Dockerfile new file mode 100644 index 0000000..3fe9993 --- /dev/null +++ b/docker/webdav/Dockerfile @@ -0,0 +1 @@ +FROM bytemark/webdav \ No newline at end of file diff --git a/docker/webdav/Dockerfile.production b/docker/webdav/Dockerfile.production new file mode 100644 index 0000000..99fc17a --- /dev/null +++ b/docker/webdav/Dockerfile.production @@ -0,0 +1 @@ +FROM git.nixc.us/nixius/webdav:staging \ No newline at end of file diff --git a/docker/webgrind/Dockerfile b/docker/webgrind/Dockerfile deleted file mode 100644 index 48d257b..0000000 --- a/docker/webgrind/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM jokkedk/webgrind:1.9.2 \ No newline at end of file diff --git a/docker/webgrind/Dockerfile.production b/docker/webgrind/Dockerfile.production deleted file mode 100644 index 2b924b9..0000000 --- a/docker/webgrind/Dockerfile.production +++ /dev/null @@ -1 +0,0 @@ -FROM git.nixc.us/nixius/webgrind:staging \ No newline at end of file diff --git a/stack.staging.yml b/stack.staging.yml index ba83b07..efd50a2 100644 --- a/stack.staging.yml +++ b/stack.staging.yml @@ -1,33 +1,37 @@ version: "3.7" + +networks: + traefik: + external: true + services: - webgrind: - image: git.nixc.us/nixius/webgrind:staging + webdav: + image: git.nixc.us/nixius/webdav:staging # volumes: - # - "/mnt/tank/persist/nixc.us/webgrind/staging/data/:/home/user/.config/webgrind" + # - "/mnt/tank/persist/nixc.us/webdav/staging/data/:/var/lib/dav" + environment: + AUTH_TYPE: Basic + USERNAME: 3sWgHNUq4DexGAeY7x3NZR6qjjg75iNY3 + PASSWORD: htFyxQacTgknFjyKFr6SZdjnQD4KjfgGb deploy: replicas: 1 placement: constraints: - node.hostname == macmini2 - deploy: - replicas: 1 labels: homepage.group: apps - homepage.name: webgrind - homepage.href: https://staging.webgrind.nixc.us/ + homepage.name: webdav + homepage.href: https://webdav.nixc.us/ homepage.description: us.nixc.autodeploy: "true" traefik.enable: "true" - traefik.http.routers.staging_webgrind_webgrind.tls: "true" - traefik.http.services.staging_webgrind_webgrind.loadbalancer.server.port: 80 - traefik.http.routers.staging_webgrind_webgrind.rule: Host(`staging.webgrind.nixc.us`) - traefik.http.routers.staging_webgrind_webgrind.entrypoints: websecure - traefik.http.routers.staging_webgrind_webgrind.tls.certresolver: letsencryptresolver - traefik.http.routers.staging_webgrind_webgrind.service: staging_webgrind_webgrind + traefik.http.routers.staging_webdav_webdav.tls: "true" + traefik.http.services.staging_webdav_webdav.loadbalancer.server.port: 80 + traefik.http.routers.staging_webdav_webdav.rule: Host(`staging.webdav.nixc.us`) + traefik.http.routers.staging_webdav_webdav.entrypoints: websecure + traefik.http.routers.staging_webdav_webdav.tls.certresolver: letsencryptresolver + traefik.http.routers.staging_webdav_webdav.service: staging_webdav_webdav traefik.docker.network: traefik # - 'traefik.http.routers.staging_uptime_uptime.middlewares=authelia@docker' networks: - traefik -networks: - traefik: - external: true \ No newline at end of file