diff --git a/Jenkinsfile b/Jenkinsfile index e8c019c..40e145a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,9 +15,10 @@ // sh 'docker pull cockpit-ws:latest' sh 'docker pull nextcloud:latest' sh 'docker pull pihole/pihole:latest' - sh 'docker pull portainer/portainer-ce:latest' + sh 'docker pull portainer/portainer-ce:alpine' sh 'docker pull openproject/openproject:17' sh 'docker pull lscr.io/linuxserver/code-server:latest' + sh 'docker pull itzg/minecraft-bedrock-server:latest' sh 'docker pull itzg/minecraft-server:latest' } } diff --git a/Jenkinsfile b/Jenkinsfile index e8c019c..40e145a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,9 +15,10 @@ // sh 'docker pull cockpit-ws:latest' sh 'docker pull nextcloud:latest' sh 'docker pull pihole/pihole:latest' - sh 'docker pull portainer/portainer-ce:latest' + sh 'docker pull portainer/portainer-ce:alpine' sh 'docker pull openproject/openproject:17' sh 'docker pull lscr.io/linuxserver/code-server:latest' + sh 'docker pull itzg/minecraft-bedrock-server:latest' sh 'docker pull itzg/minecraft-server:latest' } } diff --git a/docker-compose-auto.yml b/docker-compose-auto.yml index da81a82..af4ed0f 100644 --- a/docker-compose-auto.yml +++ b/docker-compose-auto.yml @@ -22,6 +22,9 @@ # Need to add to trusted-domains nextcloud.invertedlogic.ddns.net: # sudo vi /media/Data/Containers/NextCloud/config/config.php # +# We need to get some SSL certificates for using HTTPS. We will use certbot which requests to let's-encrypt for the certificates. +# Part of the process is it verifies you control the domain, so sets up a challenge which is requested on port 80, so we need to temporarily enable port 80. +# We can get certbot to set up a http server on a specific port to listen on, we can map a request on port 80 hitting the router to redirect to that port on the machine we are running this. # Getting HTTPS certificates (first on router redirect 80 to 9123 and with ISP disable port blocking of 80): # # sudo systemctl stop nginx.service @@ -31,8 +34,8 @@ # sudo systemctl start nginx.service # # When done, can block 80 again or redirect to a blackhole. Now instead when nginx is configured to use these certificates we can just allow 443 (HTTPS) instead of 80. - -# select all that apply +# Update all the nginx config files accordingly to listen on 443 and with settings to point to the certificates. +# # # ================================================================ # PORTS - Router | Ext | Host | Container | nginx | SSL | Tested @@ -46,8 +49,7 @@ # cockpit - Y 443 8050 9092 proxy YES YES # gitbucket - Y 443 8090 - proxy YES YES # code-server - Y 443 8443 8443 proxy YES YES -# minecraft - N 443 25565 25565 - YES - +# minecraft - N 443 25565 25565 - YES (locally) # # Cockpit Instructions @@ -61,7 +63,7 @@ # # Code-Server Instructions # -## Setup inside containers to have docker tools map docker socket to the host's socket +## Setup inside containers to have docker tools map docker socket to the host's socket (or run /config/setup.sh which does these commands) # ## First part is installing the docker CLI tools if not already installed: #echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null @@ -89,9 +91,7 @@ # CodeServer: password # Cockpit: connect to 192.168.1.116 with server username and password # NextCloud: root : W.......75; -# -# - +# Jenkins jryland : a.....75; services: @@ -148,27 +148,16 @@ portainer: image: portainer/portainer-ce:alpine container_name: portainer - # hostname: portainer.localdomain restart: always - # command: -H unix:///var/run/docker.sock --tlsskipverify volumes: - # Authentication - # - /etc/passwd:/etc/passwd:ro - # - /etc/group:/etc/group:ro - # - /etc/shadow:/etc/shadow:ro # Docker access - /var/run/docker.sock:/var/run/docker.sock # Data - /media/Data/Containers/Portainer:/data - #environment: - # - VIRTUAL_HOST=portainer.invertedlogic.dnns.net - # - VIRTUAL_PORT=9000 ports: - "8030:9000" - # - "8030:8000" open-project: - # image: openproject/community:latest image: openproject/openproject:10 container_name: open-project hostname: openproject.invertedlogic.ddns.net @@ -176,7 +165,6 @@ volumes: - /media/Data/Containers/OpenProject/static:/var/openproject/assets - /media/Data/Containers/OpenProject/pgdata:/var/openproject/pgdata - # - /media/Data/Containers/OpenProject/pgdata/pg_hba.conf:/etc/postgresql/9.6/main/pg_hba.conf environment: - OPENPROJECT_HTTPS=true - OPENPROJECT_HOST__NAME=openproject.invertedlogic.ddns.net @@ -206,9 +194,9 @@ ports: - "8060:8443" - minecraft: + minecraft-java: image: itzg/minecraft-server - container_name: minecraft + container_name: minecraft-java restart: always deploy: resources: @@ -219,7 +207,18 @@ VERSION: "latest" TYPE: "VANILLA" volumes: - - /media/Data/Containers/Minecraft:/data + - /media/Data/Containers/Minecraft/java:/data ports: - "25565:25565" + minecraft-bedrock: + image: itzg/minecraft-bedrock-server + container_name: minecraft-bedrock + restart: always + environment: + EULA: "TRUE" + volumes: + - /media/Data/Containers/Minecraft/bedrock:/data + ports: + - "19132:19132" +