Updated compose templates

ast-r · Sep 11, 2020 · d022342 · d022342
1 parent 0372d4c
commit d022342
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 17 deletions.
diff --git a/bin/create-project b/bin/create-project
@@ -123,6 +123,7 @@ function build_config {
             if [ "$enable_service_le" == "x" ] && [ "$enable_service_panel" == "" ]; then
                 printf " ./manifest/compose/le.daemon.yml"
 
+                # Build config directory and copy let's encrypt settings
                 mkdir -p ./conf.d/letsencrypt
                 rm -f ./conf.d/letsencrypt/cli.ini
                 cp ./manifest/config/letsencrypt.standalone.ini ./conf.d/letsencrypt/cli.ini

diff --git a/manifest/compose/build.daemon.yml b/manifest/compose/build.daemon.yml
@@ -4,5 +4,4 @@ services:
     build:
       args:
         VERSION: ${DAEMON_VERSION}
-      context: ./manifest/daemon
-    image: ccarney16/pterodactyl-daemon:${DAEMON_VERSION}
+      context: ./manifest/daemon
diff --git a/manifest/compose/build.panel.yml b/manifest/compose/build.panel.yml
@@ -9,8 +9,3 @@ services:
       args:
         VERSION: ${PANEL_VERSION}
       context: ./manifest/panel
-    image: ccarney16/pterodactyl-panel:${PANEL_VERSION}
-  cron:
-    image: ccarney16/pterodactyl-panel:${PANEL_VERSION}
-  worker:
-    image: ccarney16/pterodactyl-panel:${PANEL_VERSION}
diff --git a/manifest/compose/daemon.yml b/manifest/compose/daemon.yml
@@ -5,7 +5,7 @@ services:
       # --Pterodactyl Daemon--
       # This service provides the wings runtime.
       ##
-      image: ccarney16/pterodactyl-daemon:latest
+      image: ccarney16/pterodactyl-daemon:${DAEMON_VERSION:-latest}
       ports:
       - 2022:2022
       - 8080:8080

diff --git a/manifest/compose/le.panel.yml b/manifest/compose/le.panel.yml
@@ -12,6 +12,5 @@ services:
     depends_on:
     - panel
     image: certbot/certbot:latest
-    volumes:
-    - ./conf.d/letsencrypt:/etc/letsencrypt
-    - ./conf.d/webroot/.well-known:/var/www/html/public/.well-known
+    volumes_from:
+    - panel
diff --git a/manifest/compose/panel.yml b/manifest/compose/panel.yml
@@ -6,17 +6,17 @@ services:
   ##
   panel:
     env_file: ./conf.d/panel.env
-    image: ccarney16/pterodactyl-panel:latest
+    image: ccarney16/pterodactyl-panel:${PANEL_VERSION:-latest}
     ports:
     - 80:80
     - 443:443
     restart: always
     volumes:
     - ./data/panel:/data
     # Enable Let's Encrypt Support
-    - ./conf.d/letsencrypt:/etc/letsencrypt:ro
-    - ./conf.d/webroot/.well-known:/var/www/html/public/.well-known:ro
-    - ./conf.d/certs:/etc/certs:ro
+    - ./conf.d/letsencrypt:/etc/letsencrypt
+    - ./conf.d/letsencrypt/webroot/.well-known:/var/www/html/public/.well-known
+    - ./conf.d/certs:/etc/certs
   ##
   # --Worker--
   # These are required for schedules and other misc tasks to 
@@ -25,7 +25,7 @@ services:
   worker:
     command: p:worker
     env_file: ./conf.d/panel.env
-    image: ccarney16/pterodactyl-panel:latest
+    image: ccarney16/pterodactyl-panel:${PANEL_VERSION:-latest}
     restart: always
     volumes_from:
     - panel
@@ -37,7 +37,7 @@ services:
   cron:
     command: p:cron
     env_file: ./conf.d/panel.env
-    image: ccarney16/pterodactyl-panel:latest
+    image: ccarney16/pterodactyl-panel:${PANEL_VERSION:-latest}
     restart: always
     volumes_from:
     - panel