Updated containers. New build process added

.env.example

@@ -51,4 +51,7 @@ DB_PASSWORD=pterodbpass
 
 MAIL_DRIVER=mail
 MAIL_FROM=admin@localhost
-MAIL_FROM_NAME="Pterodactyl Panel"
+MAIL_FROM_NAME="Pterodactyl Panel"
\ No newline at end of file
+
+DOCKER_ROOT=/var/lib/docker
+DOCKER_SOCKET=/var/run/docker.sock
\ No newline at end of file

bin/dev

+#!/bin/sh
+
+##
+# dev - modifies docker-compose params to suit development needs
+##
+
+cd "$(dirname $0)/../"
+
+# source versions from txt file
+. ./manifest/version.txt
+
+# Export Variables
+export PANEL_VERSION
+export DAEMON_VERSION
+export SFTP_VERSION
+
+# Just pass everything to compose
+docker-compose -f docker-compose.yml -f ./manifest/docker-compose.dev.yml $@
\ No newline at end of file

docker-compose.extra.yml

@@ -12,39 +12,38 @@
 # run --rm certbot --webroot -w /etc/letsencrypt/webroot -d {domain}" and follow
 # the instructions on screen. 
 ##
-# certbot:
-#   command: renew
-#   image: certbot
-#   volumes:
-#   - ./letsencrypt:/etc/letsencrypt
+certbot:
+  command: renew
+  image: certbot/certbot
+  volumes:
+  - ./letsencrypt:/etc/letsencrypt
 # If you are using the certbot container, apply this to the panel container
-# panel:
-#   volumes:
-#   - ./letsencrypt:/etc/letsencrypt
-#   - ./letsencrypt/webroot/.well-known:/var/www/html/public/.well-known
+panel:
+  volumes:
+  - ./letsencrypt:/etc/letsencrypt
+  - ./letsencrypt/webroot/.well-known:/var/www/html/public/.well-known
 
 ##
 # Seperate Worker Container
 # If you plan on using another container for handling all the workers and cronjobs, 
 # use these services and set DISABLE_WORKERS=true for the panel container
 ##
-# worker:
-#   command: php /var/www/html/artisan queue:work database --queue=high,standard,low --sleep=3 --tries=3
-#   env_file: .env
-#   image: quay.io/ccarney/pterodactyl-panel:latest
-#   restart: always
-#   volumes_from:
-#   - panel
-# cron:
-#   command: /usr/sbin/crond -f -l 0
-#   env_file: .env
-#   image: quay.io/ccarney/pterodactyl-panel:latest
-#   restart: always
-#   volumes_from:
-#   - panel
+worker:
+  command: php /var/www/html/artisan queue:work database --queue=high,standard,low --sleep=3 --tries=3
+  env_file: .env
+  image: quay.io/ccarney/pterodactyl-panel:latest
+  restart: always
+  volumes_from:
+  - panel
+cron:
+  command: /usr/sbin/crond -f -l 0
+  env_file: .env
+  image: quay.io/ccarney/pterodactyl-panel:latest
+  restart: always
+  volumes_from:
+  - panel
+
 sftp:
-  build:
-    context: ./manifest/sftp
   image: ccarney16/pterodactyl-sftp:v1.0.1
   restart: always
   volumes_from:

docker-compose.yml

 ##
 # Pterodactyl Panel Docker Setup by ccarney
 ##
-version: '2'
+version: '2.1'
 services:
 ##
 # MariaDB (MySQL) Server
@@ -31,14 +31,11 @@ services:
 # This is the main service that will be seen publically.
 ##
   panel:
-    build:
-      context: ./manifest/panel
-      dockerfile: Dockerfile
     depends_on:
     - cache
     - mysql
     env_file: .env
-    image: ccarney16/pterodactyl-panel:v0.7.11
+    image: ccarney16/pterodactyl-panel:latest
     restart: always
     volumes:
     - ./data:/data
@@ -52,12 +49,9 @@ services:
 # you may comment/delete the section below.
 ##
   daemon:
-    build:
-      context: ./manifest/daemon
-      dockerfile: Dockerfile
     depends_on:
     - panel
-    image: ccarney16/pterodactyl-daemon:v0.6.8
+    image: ccarney16/pterodactyl-daemon:latest
     ports:
     -  8080:8080
     privileged: true
@@ -71,5 +65,5 @@ services:
 
     # Docker socket and directory, needed to communicate to docker
     # NOTE: If you are using docker in a different directory, please change below to reflect that!
-    - /var/lib/docker:/var/lib/docker
-    - /var/run/docker.sock:/var/run/docker.sock
+    - ${DOCKER_ROOT:-/var/lib/docker}:${DOCKER_ROOT:-/var/lib/docker}
+    - ${DOCKER_SOCKET:-/var/run/docker.sock}:${DOCKER_SOCKET:-/var/run/docker.sock}

manifest/daemon/Dockerfile

@@ -2,7 +2,9 @@ FROM node:8-alpine
 
 MAINTAINER Cameron Carney <ccarney16@live.com>
 
-ENV DAEMON_VERSION=v0.6.8 \
+ARG VERSION
+
+ENV DAEMON_VERSION=${VERSION} \
     UID=500
 
 WORKDIR /srv/daemon

manifest/docker-compose.dev.yml

+# Build services for dockerizing
+version: '2.1'
+services:
+  panel:
+    build:
+      args:
+        VERSION: ${PANEL_VERSION}
+      context: ./manifest/panel
+    image: ccarney16/pterodactyl-panel:${PANEL_VERSION}
+  daemon:
+    build:
+      args:
+        VERSION: ${DAEMON_VERSION}
+      context: ./manifest/daemon
+    image: ccarney16/pterodactyl-daemon:${DAEMON_VERSION}
+  sftp:
+    build:
+      args:
+        VERSION: ${SFTP_VERSION}
+      context: ./manifest/sftp
+    image: ccarney16/pterodactyl-sftp:${SFTP_VERSION}
+    volumes_from:
+    - daemon

manifest/panel/Dockerfile

@@ -2,8 +2,10 @@ FROM alpine:edge
 
 MAINTAINER Cameron Carney <ccarney16@live.com>
 
+ARG VERSION
+
 ENV STARTUP_TIMEOUT=5 \
-    PANEL_VERSION=v0.7.11
+    PANEL_VERSION=${VERSION}
 
 WORKDIR /var/www/html
 

manifest/sftp/Dockerfile

 FROM alpine:latest
 
-ENV VERSION=v1.0.1 \
+ARG VERSION
+
+ENV SFTP_VERSION=${VERSION} \
     UID=500
 
 RUN mkdir /srv/daemon -p; \
-    wget -P /srv/daemon https://github.com/pterodactyl/sftp-server/releases/download/${VERSION}/sftp-server; \
+    wget -P /srv/daemon https://github.com/pterodactyl/sftp-server/releases/download/${SFTP_VERSION}/sftp-server; \
     chmod +x /srv/daemon/sftp-server; \
     addgroup -S -g ${UID} pterodactyl && adduser -S -D -H -G pterodactyl -u ${UID} -s /bin/false pterodactyl
 

manifest/version.txt

+PANEL_VERSION=v0.7.12
+DAEMON_VERSION=v0.6.11
+SFTP_VERSION=v1.0.4