From 05a75f6dfcfe6529f823d7d4d7d2a8396496bee4 Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 23 Apr 2024 10:50:58 -0400 Subject: [PATCH] webgrind --- README.md | 2 +- docker-compose.production.yml | 6 +++--- docker-compose.staging.yml | 6 +++--- docker/productivity/Dockerfile | 1 - docker/productivity/Dockerfile.production | 1 - docker/webgrind/Dockerfile | 1 + docker/webgrind/Dockerfile.production | 1 + stack.production.yml | 22 ++++++++++----------- stack.staging.yml | 24 +++++++++++------------ 9 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 docker/productivity/Dockerfile delete mode 100644 docker/productivity/Dockerfile.production create mode 100644 docker/webgrind/Dockerfile create mode 100644 docker/webgrind/Dockerfile.production diff --git a/README.md b/README.md index 9c7dd49..cb6836d 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -![Build Status](https://woodpecker.nixc.us/api/badges/134/status.svg) +![Build Status](https://woodpecker.nixc.us/api/badges/135/status.svg) diff --git a/docker-compose.production.yml b/docker-compose.production.yml index 2884fd5..961f714 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -1,7 +1,7 @@ version: "3.9" services: - super-productivity: + webgrind: build: - context: docker/productivity + context: docker/webgrind dockerfile: Dockerfile.production - image: git.nixc.us/nixius/super-productivity:production + image: git.nixc.us/nixius/webgrind:production diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml index e8a9598..f09d83d 100644 --- a/docker-compose.staging.yml +++ b/docker-compose.staging.yml @@ -1,7 +1,7 @@ version: "3.9" services: - super-productivity: + webgrind: build: - context: docker/productivity + context: docker/webgrind dockerfile: Dockerfile - image: git.nixc.us/nixius/super-productivity:staging + image: git.nixc.us/nixius/webgrind:staging diff --git a/docker/productivity/Dockerfile b/docker/productivity/Dockerfile deleted file mode 100644 index d16075c..0000000 --- a/docker/productivity/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM johannesjo/super-productivity:latest \ No newline at end of file diff --git a/docker/productivity/Dockerfile.production b/docker/productivity/Dockerfile.production deleted file mode 100644 index b673c29..0000000 --- a/docker/productivity/Dockerfile.production +++ /dev/null @@ -1 +0,0 @@ -FROM git.nixc.us/nixius/super-productivity:staging \ No newline at end of file diff --git a/docker/webgrind/Dockerfile b/docker/webgrind/Dockerfile new file mode 100644 index 0000000..0e7a92a --- /dev/null +++ b/docker/webgrind/Dockerfile @@ -0,0 +1 @@ +FROM jojomi/webgrind:latest \ No newline at end of file diff --git a/docker/webgrind/Dockerfile.production b/docker/webgrind/Dockerfile.production new file mode 100644 index 0000000..2b924b9 --- /dev/null +++ b/docker/webgrind/Dockerfile.production @@ -0,0 +1 @@ +FROM git.nixc.us/nixius/webgrind:staging \ No newline at end of file diff --git a/stack.production.yml b/stack.production.yml index 7aa4309..5a44139 100644 --- a/stack.production.yml +++ b/stack.production.yml @@ -1,9 +1,9 @@ version: "3.7" services: - productivity: - image: git.nixc.us/nixius/super-productivity:production + webgrind: + image: git.nixc.us/nixius/webgrind:production volumes: - - "/mnt/tank/persist/nixc.us/productivity/production/data/:/home/user/.config/superProductivity" + - "/mnt/tank/persist/nixc.us/webgrind/production/data/:/home/user/.config/webgrind" deploy: replicas: 1 placement: @@ -13,17 +13,17 @@ services: replicas: 1 labels: homepage.group: apps - homepage.name: productivity - homepage.href: https://productivity.nixc.us/ + homepage.name: webgrind + homepage.href: https://webgrind.nixc.us/ homepage.description: us.nixc.autodeploy: "true" traefik.enable: "true" - traefik.http.routers.production_productivity_productivity.tls: "true" - traefik.http.services.production_productivity_productivity.loadbalancer.server.port: 80 - traefik.http.routers.production_productivity_productivity.rule: Host(`productivity.nixc.us`) - traefik.http.routers.production_productivity_productivity.entrypoints: websecure - traefik.http.routers.production_productivity_productivity.tls.certresolver: letsencryptresolver - traefik.http.routers.production_productivity_productivity.service: production_productivity_productivity + traefik.http.routers.production_webgrind_webgrind.tls: "true" + traefik.http.services.production_webgrind_webgrind.loadbalancer.server.port: 80 + traefik.http.routers.production_webgrind_webgrind.rule: Host(`webgrind.nixc.us`) + traefik.http.routers.production_webgrind_webgrind.entrypoints: websecure + traefik.http.routers.production_webgrind_webgrind.tls.certresolver: letsencryptresolver + traefik.http.routers.production_webgrind_webgrind.service: production_webgrind_webgrind traefik.docker.network: traefik # - 'traefik.http.routers.production_uptime_uptime.middlewares=authelia@docker' networks: diff --git a/stack.staging.yml b/stack.staging.yml index 1ac8a77..ba83b07 100644 --- a/stack.staging.yml +++ b/stack.staging.yml @@ -1,9 +1,9 @@ version: "3.7" services: - productivity: - image: git.nixc.us/nixius/super-productivity:staging - volumes: - - "/mnt/tank/persist/nixc.us/productivity/staging/data/:/home/user/.config/superProductivity" + webgrind: + image: git.nixc.us/nixius/webgrind:staging + # volumes: + # - "/mnt/tank/persist/nixc.us/webgrind/staging/data/:/home/user/.config/webgrind" deploy: replicas: 1 placement: @@ -13,17 +13,17 @@ services: replicas: 1 labels: homepage.group: apps - homepage.name: productivity - homepage.href: https://staging.productivity.nixc.us/ + homepage.name: webgrind + homepage.href: https://staging.webgrind.nixc.us/ homepage.description: us.nixc.autodeploy: "true" traefik.enable: "true" - traefik.http.routers.staging_productivity_productivity.tls: "true" - traefik.http.services.staging_productivity_productivity.loadbalancer.server.port: 80 - traefik.http.routers.staging_productivity_productivity.rule: Host(`staging.productivity.nixc.us`) - traefik.http.routers.staging_productivity_productivity.entrypoints: websecure - traefik.http.routers.staging_productivity_productivity.tls.certresolver: letsencryptresolver - traefik.http.routers.staging_productivity_productivity.service: staging_productivity_productivity + 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.docker.network: traefik # - 'traefik.http.routers.staging_uptime_uptime.middlewares=authelia@docker' networks: