From 3ff68fd6565de456bdb01b562e700d522fa42e5f Mon Sep 17 00:00:00 2001 From: colin Date: Wed, 5 Feb 2025 10:20:02 -0500 Subject: [PATCH] Update stack.staging.yml --- stack.staging.yml | 127 ++++++++++++++++------------------------------ 1 file changed, 43 insertions(+), 84 deletions(-) diff --git a/stack.staging.yml b/stack.staging.yml index 81fd712..7d6c540 100644 --- a/stack.staging.yml +++ b/stack.staging.yml @@ -1,87 +1,46 @@ -version: '3' -services: - database: - image: git.nixc.us/colin/hedgedoc:staging-database - environment: - - POSTGRES_USER=hedgedoc - - POSTGRES_PASSWORD=password - - POSTGRES_DB=hedgedoc - volumes: - - /mnt/tank/persist/nixc.us/hedgedoc/staging/db:/var/lib/postgresql/data - deploy: - replicas: 1 - placement: - constraints: -## - node.labels.role == db - - node.hostname == ingress.nixc.us -# - node.labels.mac-rack == true - labels: - - "us.nixc.autodeploy=true" - - "traefik.enable=false" - networks: - - default - # logging: - # driver: "gelf" - # options: - # gelf-address: "udp://log.nixc.us:15124" - # tag: "hedgedoc_database" - hedgedoc: - # Make sure to use the latest release from https://hedgedoc.org/latest-release - image: git.nixc.us/colin/hedgedoc:staging-hedgedoc - environment: - # CMD_ALLOW_ANONYMOUS: "true" - CMD_ALLOW_ANONYMOUS_EDITS: "true" - CMD_ALLOW_FREEURL: "true" - CMD_DB_URL: "postgres://hedgedoc:password@hedgedoc_database:5432/hedgedoc" - CMD_DOMAIN: "hedgedoc.nixc.us" - # CMD_URL_ADDPORT: "true" - CMD_PROTOCOL_USESSL: "true" - CMD_SESSION_SECRET: "kcxFbvEv4gQeeDuXTJJDQ4Vj878C4p2AQFe9Ur33tLeUdQNzGGiQz6NAmEoxjZXH" - CMD_DB_USERNAME: "hedgedoc" - CMD_DB_PASSWORD: "password" - CMD_DB_HOST: "database" - CMD_DB_PORT: "5432" -# CMD_LDAP_URL: ldap://lldap_lldap:3890 -# CMD_LDAP_BINDDN: uid=admin,ou=people,dc=nixc,dc=us -# CMD_LDAP_BINDCREDENTIALS: ehgJHdnbMvz8vEGVSYqRAC2r3WUisLxTRLnuXuXb72DEvhi8Ayzu4CQj9h2sexpX -# CMD_LDAP_SEARCHBASE: ou=people,dc=nixc,dc=us -# CMD_LDAP_SEARCHFILTER: '(&(memberOf=cn=hedgedocUsers,ou=groups,dc=nixc,dc=us)(uid={{username}}))' -# CMD_LDAP_USERIDFIELD: uid - volumes: - - /mnt/tank/persist/nixc.us/hedgedoc/staging/uploads:/hedgedoc/public/uploads - # ports: - # - "3000:3000" - depends_on: - - database - deploy: - replicas: 1 - placement: - constraints: -## - node.labels.role == db - - node.hostname == ingress.nixc.us -# - node.labels.mac-rack == true - labels: - - "us.nixc.autodeploy=true" - - "traefik.enable=true" - - "traefik.http.routers.staging_hedgedoc.tls=true" - - "traefik.http.services.staging_hedgedoc.loadbalancer.server.port=3000" - - "traefik.http.routers.staging_hedgedoc.rule=Host(`staging.hedgedoc.nixc.us`)" - - "traefik.http.routers.staging_hedgedoc.entrypoints=websecure" - - "traefik.http.routers.staging_hedgedoc.tls.certresolver=letsencryptresolver" - - "traefik.http.routers.staging_hedgedoc.service=staging_hedgedoc" - - "traefik.docker.network=traefik" - # - 'traefik.http.routers.staging_hedgedoc.middlewares=authelia@docker' - networks: - - default - - traefik - # logging: - # driver: "gelf" - # options: - # gelf-address: "udp://log.nixc.us:15124" - # tag: "hedgedoc_app" - networks: traefik: external: true - default: - external: false \ No newline at end of file + +services: + firefox: + image: lscr.io/linuxserver/firefox:latest +# image: jlesage/firefox + environment: +# DISPLAY_WIDTH: '1280' +# DISPLAY_HEIGHT: '720' +# KEEP_APP_RUNNING: '1' +# KASM_PORT: 80 + PUID: 1000 + GUID: 1000 + tmpfs: + - /tmp:size=2G + volumes: + # - '/mnt/tank/persist/nixc.us/marketing-browser/production/config:/config:rw' + - '/etc/localtime:/etc/localtime:ro' + # - "istock:/config/Downloads" + - type: tmpfs + target: /dev/shm + deploy: + # placement: + # constraints: + # - node.hostname == macmini1 + replicas: 1 + labels: + - "traefik.enable=true" + - "traefik.http.routers.istock_firefox.tls=true" + - "traefik.http.services.istock_firefox.loadbalancer.server.port=3000" + - "traefik.http.routers.istock_firefox.rule=Host(`marketing-browser.staging.nixc.us`)" + - "traefik.http.routers.istock_firefox.entrypoints=websecure" + - "traefik.http.routers.istock_firefox.tls.certresolver=letsencryptresolver" + - "traefik.http.routers.istock_firefox.service=istock_firefox" + - "traefik.docker.network=traefik" + - 'traefik.http.routers.istock_firefox.middlewares=authelia_authelia@docker' + networks: + - traefik + dns: + - 1.1.1.1 + - 8.8.8.8 +# volumes: +# istock: +# external: true \ No newline at end of file