From 1fe545e2e84383494a58c04e3bdaf55799322e9b Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 18 Mar 2024 12:51:23 -0400 Subject: [PATCH] switching source to remmina from syncthing --- docker-compose.production.yml | 6 +-- docker-compose.staging.yml | 6 +-- docker/remmina/Dockerfile | 1 + .../Dockerfile.production | 0 docker/syncthing/Dockerfile | 1 - stack.production.yml | 44 +++++++------------ stack.staging.yml | 39 ++++++---------- 7 files changed, 38 insertions(+), 59 deletions(-) create mode 100644 docker/remmina/Dockerfile rename docker/{syncthing => remmina}/Dockerfile.production (100%) delete mode 100644 docker/syncthing/Dockerfile diff --git a/docker-compose.production.yml b/docker-compose.production.yml index fb1932a..fb5b3e7 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -1,7 +1,7 @@ version: "3.9" services: - syncthing: + remmina: build: - context: docker/syncthing + context: docker/remmina dockerfile: Dockerfile.production - image: git.nixc.us/colin/syncthing:production + image: git.nixc.us/colin/remmina:production diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml index 504d2b2..0862529 100644 --- a/docker-compose.staging.yml +++ b/docker-compose.staging.yml @@ -1,6 +1,6 @@ version: "3.9" services: - syncthing: + remmina: build: - context: docker/syncthing - image: git.nixc.us/colin/syncthing:staging + context: docker/remmina + image: git.nixc.us/colin/remmina:staging diff --git a/docker/remmina/Dockerfile b/docker/remmina/Dockerfile new file mode 100644 index 0000000..525c4df --- /dev/null +++ b/docker/remmina/Dockerfile @@ -0,0 +1 @@ +FROM lscr.io/linuxserver/remmina:latest \ No newline at end of file diff --git a/docker/syncthing/Dockerfile.production b/docker/remmina/Dockerfile.production similarity index 100% rename from docker/syncthing/Dockerfile.production rename to docker/remmina/Dockerfile.production diff --git a/docker/syncthing/Dockerfile b/docker/syncthing/Dockerfile deleted file mode 100644 index 106d076..0000000 --- a/docker/syncthing/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM syncthing/syncthing \ No newline at end of file diff --git a/stack.production.yml b/stack.production.yml index 0fec3be..5c1a734 100644 --- a/stack.production.yml +++ b/stack.production.yml @@ -1,4 +1,3 @@ -# build 0 version: '3.7' networks: @@ -6,20 +5,16 @@ networks: external: true services: - sync: -# build: ./syncthing/ - image: git.nixc.us/colin/syncthing:production -# expose: -# - 8384 - hostname: sync - ports: - - "22000:22000" - - "21027:21027/udp" - volumes: - - "/mnt/tank/persist/nixc.us/sync/production/config:/var/syncthing/config" - - "/mnt/tank/persist/nixc.us/vault/production/otng:/otng" - - "/mnt/tank/persist/nixc.us/vault/production/data:/vault/:ro" - - "/mnt/tank/persist/nixc.us/vault/production/storage:/var/syncthing/storage" + remmina: + image: git.nixc.us/colin/remmina:production + environment: + - PUID=1000 + - PGID=1000 + # - REMMINA_PASSWORD=your_password + - REMMINA_PORT=5900 + # volumes: + # - "/mnt/tank/persist/nixc.us/remmina/config:/config" + # - "/mnt/tank/persist/nixc.us/vault/production/data:/data:ro" networks: - traefik deploy: @@ -30,16 +25,11 @@ services: labels: traefik.docker.network: traefik traefik.enable: "true" - traefik.http.routers.production_sync.entrypoints: websecure - traefik.http.routers.production_sync.rule: Host(`sync.nixc.us`) - traefik.http.routers.production_sync.service: production_sync - traefik.http.routers.production_sync.tls: "true" - traefik.http.routers.production_sync.tls.certresolver: letsencryptresolver - traefik.http.services.production_sync.loadbalancer.server.port: '8384' + traefik.http.routers.production_remmina.entrypoints: websecure + traefik.http.routers.production_remmina.rule: Host(`remmina.nixc.us`) + traefik.http.routers.production_remmina.service: production_remmina + traefik.http.routers.production_remmina.tls: "true" + traefik.http.routers.production_remmina.tls.certresolver: letsencryptresolver + traefik.http.services.production_remmina.loadbalancer.server.port: '5900' traefik.tags: traefik - traefik.http.routers.production_sync.middlewares: authelia_authelia@docker - # logging: - # driver: "gelf" - # options: - # gelf-address: "udp://log.nixc.us:15124" - # tag: "sync_sync" \ No newline at end of file + traefik.http.routers.production_remmina.middlewares: authelia_authelia@docker diff --git a/stack.staging.yml b/stack.staging.yml index b11066e..0533955 100644 --- a/stack.staging.yml +++ b/stack.staging.yml @@ -1,4 +1,3 @@ -# build 0 version: '3.7' networks: @@ -6,18 +5,13 @@ networks: external: true services: - sync: - image: git.nixc.us/colin/syncthing:staging -# expose: -# - 8384 - # ports: - # - "22000:22000" - # - "21027:21027/udp" - # volumes: - # - "/mnt/tank/persist/nixc.us/sync/staging/config:/var/syncthing/config" - # - "/mnt/tank/persist/nixc.us/vault/staging/otng:/otng" - # - "/mnt/tank/persist/nixc.us/vault/staging/data:/vault/:ro" - # - "/mnt/tank/persist/nixc.us/vault/staging/storage:/var/syncthing/storage" + remmina: + image: git.nixc.us/colin/remmina:staging + environment: + - PUID=1000 + - PGID=1000 + # - REMMINA_PASSWORD=your_password + - REMMINA_PORT=5900 networks: - traefik deploy: @@ -28,16 +22,11 @@ services: labels: traefik.docker.network: traefik traefik.enable: "true" - traefik.http.routers.staging_sync.entrypoints: websecure - traefik.http.routers.staging_sync.rule: Host(`staging.sync.nixc.us`) - traefik.http.routers.staging_sync.service: staging_sync - traefik.http.routers.staging_sync.tls: "true" - traefik.http.routers.staging_sync.tls.certresolver: letsencryptresolver - traefik.http.services.staging_sync.loadbalancer.server.port: '8384' + traefik.http.routers.staging_remmina.entrypoints: websecure + traefik.http.routers.staging_remmina.rule: Host(`staging.remmina.nixc.us`) + traefik.http.routers.staging_remmina.service: staging_remmina + traefik.http.routers.staging_remmina.tls: "true" + traefik.http.routers.staging_remmina.tls.certresolver: letsencryptresolver + traefik.http.services.staging_remmina.loadbalancer.server.port: '5900' traefik.tags: traefik - traefik.http.routers.staging_sync.middlewares: authelia_authelia@docker - # logging: - # driver: "gelf" - # options: - # gelf-address: "udp://log.nixc.us:15124" - # tag: "sync_sync" \ No newline at end of file + traefik.http.routers.staging_remmina.middlewares: authelia_authelia@docker