* Added heimdall
* bitwarden production ready
* stashapp, ready
* removed some apps (portus, silverpeas, mailtrail, emby) put them in
readme
* rocketchat ready for live server
This commit is contained in:
2020-04-26 18:36:20 -07:00
parent 0a181def6d
commit 199132af76
15 changed files with 87 additions and 68 deletions
+8 -1
View File
@@ -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. define new directories for the .env file.
To do this I've just been copying the app folder to a domain-name folder. 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
View File
+32
View File
@@ -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"
+6
View File
@@ -0,0 +1,6 @@
# Domains & Project
PREFIX=p1
BITWARDEN_DOMAIN_NAME=passtool.nickyeoman.com
# Software versions
BITWARDEN_V=1.14.2
-1
View File
@@ -1 +0,0 @@
# https://hub.docker.com/r/emby/embyserver
+19 -6
View File
@@ -1,17 +1,30 @@
# https://hub.docker.com/r/linuxserver/heimdall # https://hub.docker.com/r/linuxserver/heimdall
--- ---
version: "2.1" version: "2.1"
volumes:
heimdall:
networks:
admin_web:
external:
name: admin_web
services: services:
heimdall: heimdall:
image: linuxserver/heimdall # https://hub.docker.com/r/linuxserver/heimdall
image: linuxserver/heimdall:${HEIMDALL_V}
container_name: heimdall container_name: heimdall
environment: environment:
- PUID=1000 - PUID=1000
- PGID=1000 - PGID=1000
- TZ=Europe/London - TZ=America/Vancouver
volumes: volumes:
- /path/to/appdata/config:/config - heimdall:/config
ports:
- 80:80
- 443:443
restart: unless-stopped 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"
+6
View File
@@ -0,0 +1,6 @@
# Domains & Project
PREFIX=p1
HEIMDALL_DOMAIN_NAME=heimdall.nickyeoman.com
# Software versions
HEIMDALL_V=2.2.2-ls83
-8
View File
@@ -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
-19
View File
@@ -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
-1
View File
@@ -1 +0,0 @@
# https://hub.docker.com/r/opensuse/portus/
+9 -14
View File
@@ -8,9 +8,9 @@
version: '2' version: '2'
networks: networks:
traefik_web: admin_web:
external: external:
name: ${NETWORK_NAME} name: admin_web
volumes: volumes:
rocketchat: rocketchat:
@@ -35,10 +35,10 @@ services:
volumes: volumes:
- rocketchat:/app/uploads - rocketchat:/app/uploads
networks: networks:
- ${NETWORK_NAME} - admin_web
environment: environment:
- PORT=3000 - PORT=3000
- ROOT_URL=https://${DOMAIN_NAME} - ROOT_URL=https://${ROCKET_DOMAIN_NAME}
- MONGO_URL=mongodb://${PREFIX}_rc-db_1:27017/rocketchat - MONGO_URL=mongodb://${PREFIX}_rc-db_1:27017/rocketchat
- MONGO_OPLOG_URL=mongodb://${PREFIX}_rc-db_1:27017/local - MONGO_OPLOG_URL=mongodb://${PREFIX}_rc-db_1:27017/local
- MAIL_URL=smtp://smtp.email - MAIL_URL=smtp://smtp.email
@@ -46,11 +46,9 @@ services:
# - HTTPS_PROXY=http://proxy.domain.com # - HTTPS_PROXY=http://proxy.domain.com
depends_on: depends_on:
- rc-db - rc-db
ports:
- 3000:3000
labels: labels:
- "traefik.enable=true" - "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.entrypoints=websecure"
- "traefik.http.routers.${PREFIX}_chat.tls.certresolver=letsencrypt" - "traefik.http.routers.${PREFIX}_chat.tls.certresolver=letsencrypt"
- "traefik.http.services.${PREFIX}_chat.loadbalancer.server.port=3000" - "traefik.http.services.${PREFIX}_chat.loadbalancer.server.port=3000"
@@ -62,7 +60,7 @@ services:
- rocketchat-db:/data/db - rocketchat-db:/data/db
#- ./data/dump:/dump #- ./data/dump:/dump
networks: networks:
- ${NETWORK_NAME} - admin_web
command: mongod --smallfiles --oplogSize 128 --replSet rs0 --storageEngine=mmapv1 command: mongod --smallfiles --oplogSize 128 --replSet rs0 --storageEngine=mmapv1
labels: labels:
- "traefik.enable=false" - "traefik.enable=false"
@@ -85,14 +83,14 @@ services:
depends_on: depends_on:
- ${PREFIX}_rc-db_1 - ${PREFIX}_rc-db_1
networks: networks:
- ${NETWORK_NAME} - admin_web
# hubot, the popular chatbot (add the bot user first and change the password before starting this image) # hubot, the popular chatbot (add the bot user first and change the password before starting this image)
hubot: hubot:
image: rocketchat/hubot-rocketchat:latest image: rocketchat/hubot-rocketchat:latest
restart: unless-stopped restart: unless-stopped
environment: environment:
- ROCKETCHAT_URL=rocketchat:3000 - ROCKETCHAT_URL=${PREFIX}_rocketchat_1:3000
- ROCKETCHAT_ROOM=GENERAL - ROCKETCHAT_ROOM=GENERAL
- ROCKETCHAT_USER=bot - ROCKETCHAT_USER=bot
- ROCKETCHAT_PASSWORD=botpassword - ROCKETCHAT_PASSWORD=botpassword
@@ -106,7 +104,4 @@ services:
volumes: volumes:
- rocketchat-scripts:/home/hubot/scripts - rocketchat-scripts:/home/hubot/scripts
networks: networks:
- ${NETWORK_NAME} - admin_web
# 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
+1 -8
View File
@@ -1,13 +1,6 @@
# Domains & Project # Domains & Project
PREFIX=p1 PREFIX=p1
DOMAIN_NAME=joomla.nickyeoman.com ROCKET_DOMAIN_NAME=chat.nickyeoman.com
# Passwords
MYSQL_PASSWORD=MyNotSecurePassword1234
MYSQL_ROOT_PASSWORD=AlsoNotSecure
# Software versions # Software versions
ROCKETCHAT_V=3.1.1 ROCKETCHAT_V=3.1.1
# Network
NETWORK_NAME=traefik_web
-1
View File
@@ -1 +0,0 @@
# https://hub.docker.com/_/silverpeas
+5 -5
View File
@@ -5,7 +5,7 @@
# #
# Version 1 # Version 1
################################################################################ ################################################################################
version: '3.4' version: '2'
volumes: volumes:
stash: stash:
@@ -14,9 +14,9 @@ volumes:
stash-generated: stash-generated:
networks: networks:
traefik_web: admin_web:
external: external:
name: ${NETWORK_NAME} name: admin_web
services: services:
stash: stash:
@@ -34,7 +34,7 @@ services:
- STASH_METADATA=/metadata/ - STASH_METADATA=/metadata/
- STASH_CACHE=/cache/ - STASH_CACHE=/cache/
networks: networks:
- ${NETWORK_NAME} - admin_web
volumes: volumes:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
## Adjust below paths (the left part) to your liking. ## Adjust below paths (the left part) to your liking.
@@ -51,7 +51,7 @@ services:
- stash-generated:/generated - stash-generated:/generated
labels: labels:
- "traefik.enable=true" - "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.entrypoints=websecure"
- "traefik.http.routers.${PREFIX}_stash.tls.certresolver=letsencrypt" - "traefik.http.routers.${PREFIX}_stash.tls.certresolver=letsencrypt"
- "traefik.http.services.${PREFIX}_stash.loadbalancer.server.port=9999" - "traefik.http.services.${PREFIX}_stash.loadbalancer.server.port=9999"
+1 -4
View File
@@ -1,6 +1,3 @@
# Domain and project # Domain and project
DOMAIN_NAME=stash.nickyeoman.com STASH_DOMAIN_NAME=stash.nickyeoman.com
PREFIX=p1 PREFIX=p1
# Network
NETWORK_NAME=traefik_web