From 199132af769530b9667b08de81b1fbb1fa7a5dd4 Mon Sep 17 00:00:00 2001 From: Nick Yeoman Date: Sun, 26 Apr 2020 18:36:20 -0700 Subject: [PATCH] cleanup * Added heimdall * bitwarden production ready * stashapp, ready * removed some apps (portus, silverpeas, mailtrail, emby) put them in readme * rocketchat ready for live server --- README.md | 9 ++++++++- bitwarden/bitwarden.env | 0 bitwarden/docker-compose.yml | 32 ++++++++++++++++++++++++++++++++ bitwarden/env-sample | 6 ++++++ emby/docker-compose.yml | 1 - heimdall/docker-compose.yml | 25 +++++++++++++++++++------ heimdall/env-sample | 6 ++++++ mailtrain/docker-compose.yml | 8 -------- odoo/docker-compose.yml | 19 ------------------- portus/docker-compose.yml | 1 - rocketchat/docker-compose.yml | 23 +++++++++-------------- rocketchat/env-sample | 9 +-------- silverpeas/docker-compose.yml | 1 - stashapp/docker-compose.yml | 10 +++++----- stashapp/env-sample | 5 +---- 15 files changed, 87 insertions(+), 68 deletions(-) create mode 100644 bitwarden/bitwarden.env create mode 100644 bitwarden/docker-compose.yml create mode 100644 bitwarden/env-sample delete mode 100644 emby/docker-compose.yml create mode 100644 heimdall/env-sample delete mode 100644 mailtrain/docker-compose.yml delete mode 100644 odoo/docker-compose.yml delete mode 100644 portus/docker-compose.yml delete mode 100644 silverpeas/docker-compose.yml diff --git a/README.md b/README.md index 967d386..83da146 100644 --- a/README.md +++ b/README.md @@ -19,4 +19,11 @@ To create multiple projects is a little bit more tricky as you have to define new directories for the .env file. To do this I've just been copying the app folder to a domain-name folder. -Which isn't ideal, but I don't know how to do this more elegantly. +Which isn't ideal, but I don't know how to do this more elegantly. + +# Possible additions: + +* emby: [dockerhub](https://hub.docker.com/r/emby/embyserver) [official](https://emby.media/) +* mailtrain: https://hub.docker.com/r/mailtrain/mailtrain +* portus: https://hub.docker.com/r/opensuse/portus/ +* silverpeas: https://hub.docker.com/_/silverpeas diff --git a/bitwarden/bitwarden.env b/bitwarden/bitwarden.env new file mode 100644 index 0000000..e69de29 diff --git a/bitwarden/docker-compose.yml b/bitwarden/docker-compose.yml new file mode 100644 index 0000000..fe0e109 --- /dev/null +++ b/bitwarden/docker-compose.yml @@ -0,0 +1,32 @@ +################################################################################ +# bitwarden +# +# Version 1 +################################################################################ + +version: "3" + +volumes: + bitwarden: + +networks: + admin_web: + external: + name: admin_web + +services: + bitwarden: + # https://hub.docker.com/r/bitwardenrs/server + image: bitwardenrs/server:${BITWARDEN_V} + env_file: ./bitwarden.env + volumes: + - /etc/localtime:/etc/localtime:ro + - bitwarden:/data/:rw + networks: + - admin_web + labels: + - "traefik.enable=true" + - "traefik.http.routers.${PREFIX}_bitwarden.rule=Host(`${BITWARDEN_DOMAIN_NAME}`)" + - "traefik.http.routers.${PREFIX}_bitwarden.entrypoints=websecure" + - "traefik.http.routers.${PREFIX}_bitwarden.tls.certresolver=letsencrypt" + - "traefik.http.services.${PREFIX}_bitwarden.loadbalancer.server.port=80" diff --git a/bitwarden/env-sample b/bitwarden/env-sample new file mode 100644 index 0000000..a85710c --- /dev/null +++ b/bitwarden/env-sample @@ -0,0 +1,6 @@ +# Domains & Project +PREFIX=p1 +BITWARDEN_DOMAIN_NAME=passtool.nickyeoman.com + +# Software versions +BITWARDEN_V=1.14.2 diff --git a/emby/docker-compose.yml b/emby/docker-compose.yml deleted file mode 100644 index 4176e16..0000000 --- a/emby/docker-compose.yml +++ /dev/null @@ -1 +0,0 @@ -# https://hub.docker.com/r/emby/embyserver diff --git a/heimdall/docker-compose.yml b/heimdall/docker-compose.yml index 17cc093..6e48f2f 100644 --- a/heimdall/docker-compose.yml +++ b/heimdall/docker-compose.yml @@ -1,17 +1,30 @@ # https://hub.docker.com/r/linuxserver/heimdall --- version: "2.1" + +volumes: + heimdall: + +networks: + admin_web: + external: + name: admin_web + services: heimdall: - image: linuxserver/heimdall + # https://hub.docker.com/r/linuxserver/heimdall + image: linuxserver/heimdall:${HEIMDALL_V} container_name: heimdall environment: - PUID=1000 - PGID=1000 - - TZ=Europe/London + - TZ=America/Vancouver volumes: - - /path/to/appdata/config:/config - ports: - - 80:80 - - 443:443 + - heimdall:/config restart: unless-stopped + labels: + - "traefik.enable=true" + - "traefik.http.routers.${PREFIX}_heimdall.rule=Host(`${HEIMDALL_DOMAIN_NAME}`)" + - "traefik.http.routers.${PREFIX}_heimdall.entrypoints=websecure" + - "traefik.http.routers.${PREFIX}_heimdall.tls.certresolver=letsencrypt" + - "traefik.http.services.${PREFIX}_heimdall.loadbalancer.server.port=80" diff --git a/heimdall/env-sample b/heimdall/env-sample new file mode 100644 index 0000000..e3e9943 --- /dev/null +++ b/heimdall/env-sample @@ -0,0 +1,6 @@ +# Domains & Project +PREFIX=p1 +HEIMDALL_DOMAIN_NAME=heimdall.nickyeoman.com + +# Software versions +HEIMDALL_V=2.2.2-ls83 diff --git a/mailtrain/docker-compose.yml b/mailtrain/docker-compose.yml deleted file mode 100644 index e07c20e..0000000 --- a/mailtrain/docker-compose.yml +++ /dev/null @@ -1,8 +0,0 @@ -version: '3' -services: - # https://hub.docker.com/r/mailtrain/mailtrain - mailtrain: - environment: - - URL_BASE_TRUSTED - - URL_BASE_SANDBOX - - URL_BASE_PUBLIC diff --git a/odoo/docker-compose.yml b/odoo/docker-compose.yml deleted file mode 100644 index 2e8c6d2..0000000 --- a/odoo/docker-compose.yml +++ /dev/null @@ -1,19 +0,0 @@ -#https://hub.docker.com/_/odoo -version: '2' -services: - web: - image: odoo:12.0 - depends_on: - - mydb - ports: - - "8069:8069" - environment: - - HOST=mydb - - USER=odoo - - PASSWORD=myodoo - mydb: - image: postgres:10 - environment: - - POSTGRES_DB=postgres - - POSTGRES_PASSWORD=myodoo - - POSTGRES_USER=odoo diff --git a/portus/docker-compose.yml b/portus/docker-compose.yml deleted file mode 100644 index b92235f..0000000 --- a/portus/docker-compose.yml +++ /dev/null @@ -1 +0,0 @@ -# https://hub.docker.com/r/opensuse/portus/ diff --git a/rocketchat/docker-compose.yml b/rocketchat/docker-compose.yml index 5d1b2b2..e6dec7a 100644 --- a/rocketchat/docker-compose.yml +++ b/rocketchat/docker-compose.yml @@ -8,9 +8,9 @@ version: '2' networks: - traefik_web: + admin_web: external: - name: ${NETWORK_NAME} + name: admin_web volumes: rocketchat: @@ -35,10 +35,10 @@ services: volumes: - rocketchat:/app/uploads networks: - - ${NETWORK_NAME} + - admin_web environment: - PORT=3000 - - ROOT_URL=https://${DOMAIN_NAME} + - ROOT_URL=https://${ROCKET_DOMAIN_NAME} - MONGO_URL=mongodb://${PREFIX}_rc-db_1:27017/rocketchat - MONGO_OPLOG_URL=mongodb://${PREFIX}_rc-db_1:27017/local - MAIL_URL=smtp://smtp.email @@ -46,11 +46,9 @@ services: # - HTTPS_PROXY=http://proxy.domain.com depends_on: - rc-db - ports: - - 3000:3000 labels: - "traefik.enable=true" - - "traefik.http.routers.${PREFIX}_chat.rule=Host(`${DOMAIN_NAME}`)" + - "traefik.http.routers.${PREFIX}_chat.rule=Host(`${ROCKET_DOMAIN_NAME}`)" - "traefik.http.routers.${PREFIX}_chat.entrypoints=websecure" - "traefik.http.routers.${PREFIX}_chat.tls.certresolver=letsencrypt" - "traefik.http.services.${PREFIX}_chat.loadbalancer.server.port=3000" @@ -62,7 +60,7 @@ services: - rocketchat-db:/data/db #- ./data/dump:/dump networks: - - ${NETWORK_NAME} + - admin_web command: mongod --smallfiles --oplogSize 128 --replSet rs0 --storageEngine=mmapv1 labels: - "traefik.enable=false" @@ -85,14 +83,14 @@ services: depends_on: - ${PREFIX}_rc-db_1 networks: - - ${NETWORK_NAME} + - admin_web # hubot, the popular chatbot (add the bot user first and change the password before starting this image) hubot: image: rocketchat/hubot-rocketchat:latest restart: unless-stopped environment: - - ROCKETCHAT_URL=rocketchat:3000 + - ROCKETCHAT_URL=${PREFIX}_rocketchat_1:3000 - ROCKETCHAT_ROOM=GENERAL - ROCKETCHAT_USER=bot - ROCKETCHAT_PASSWORD=botpassword @@ -106,7 +104,4 @@ services: volumes: - rocketchat-scripts:/home/hubot/scripts networks: - - ${NETWORK_NAME} - # this is used to expose the hubot port for notifications on the host on port 3001, e.g. for hubot-jenkins-notifier - ports: - - 3001:8080 + - admin_web diff --git a/rocketchat/env-sample b/rocketchat/env-sample index e963d92..c3cd3e3 100644 --- a/rocketchat/env-sample +++ b/rocketchat/env-sample @@ -1,13 +1,6 @@ # Domains & Project PREFIX=p1 -DOMAIN_NAME=joomla.nickyeoman.com - -# Passwords -MYSQL_PASSWORD=MyNotSecurePassword1234 -MYSQL_ROOT_PASSWORD=AlsoNotSecure +ROCKET_DOMAIN_NAME=chat.nickyeoman.com # Software versions ROCKETCHAT_V=3.1.1 - -# Network -NETWORK_NAME=traefik_web diff --git a/silverpeas/docker-compose.yml b/silverpeas/docker-compose.yml deleted file mode 100644 index 6f87630..0000000 --- a/silverpeas/docker-compose.yml +++ /dev/null @@ -1 +0,0 @@ -# https://hub.docker.com/_/silverpeas diff --git a/stashapp/docker-compose.yml b/stashapp/docker-compose.yml index 64755ad..55178cb 100644 --- a/stashapp/docker-compose.yml +++ b/stashapp/docker-compose.yml @@ -5,7 +5,7 @@ # # Version 1 ################################################################################ -version: '3.4' +version: '2' volumes: stash: @@ -14,9 +14,9 @@ volumes: stash-generated: networks: - traefik_web: + admin_web: external: - name: ${NETWORK_NAME} + name: admin_web services: stash: @@ -34,7 +34,7 @@ services: - STASH_METADATA=/metadata/ - STASH_CACHE=/cache/ networks: - - ${NETWORK_NAME} + - admin_web volumes: - /etc/localtime:/etc/localtime:ro ## Adjust below paths (the left part) to your liking. @@ -51,7 +51,7 @@ services: - stash-generated:/generated labels: - "traefik.enable=true" - - "traefik.http.routers.${PREFIX}_stash.rule=Host(`${DOMAIN_NAME}`)" + - "traefik.http.routers.${PREFIX}_stash.rule=Host(`${STASH_DOMAIN_NAME}`)" - "traefik.http.routers.${PREFIX}_stash.entrypoints=websecure" - "traefik.http.routers.${PREFIX}_stash.tls.certresolver=letsencrypt" - "traefik.http.services.${PREFIX}_stash.loadbalancer.server.port=9999" diff --git a/stashapp/env-sample b/stashapp/env-sample index ce2a2f9..3f9a7fb 100644 --- a/stashapp/env-sample +++ b/stashapp/env-sample @@ -1,6 +1,3 @@ # Domain and project -DOMAIN_NAME=stash.nickyeoman.com +STASH_DOMAIN_NAME=stash.nickyeoman.com PREFIX=p1 - -# Network -NETWORK_NAME=traefik_web