Commit f313350a authored by Cameron Carney's avatar Cameron Carney

Updated docker-compose.yml, bumped version of panel.

parent dc2a46e4
...@@ -32,8 +32,8 @@ TIMEZONE=UTC ...@@ -32,8 +32,8 @@ TIMEZONE=UTC
CACHE_DRIVER=memcached CACHE_DRIVER=memcached
# Rely on an external source so we can put the panel container down when updates are needed # Rely on an external source so we can put the panel container down when updates are needed
MEMCACHED_HOST=cache REDIS_HOST=cache
MEMCACHED_PORT=11211 REDIS_PORT=6379
DB_HOST=mysql DB_HOST=mysql
DB_PORT=3306 DB_PORT=3306
......
data/ data/
db/ db/
mysql_db/
ssl/ ssl/
letsencrypt/
.env .env
docker-compose.override.yml docker-compose.override.yml
\ No newline at end of file
...@@ -3,7 +3,7 @@ FROM alpine:3.6 ...@@ -3,7 +3,7 @@ FROM alpine:3.6
MAINTAINER Cameron Carney <ccarney16@live.com> MAINTAINER Cameron Carney <ccarney16@live.com>
ENV STARTUP_TIMEOUT=5 \ ENV STARTUP_TIMEOUT=5 \
PANEL_VERSION=v0.7.0-beta.1 PANEL_VERSION=v0.7.0-beta.2
WORKDIR /var/www/html WORKDIR /var/www/html
......
...@@ -5,31 +5,16 @@ version: '2' ...@@ -5,31 +5,16 @@ version: '2'
services: services:
## ##
# Let's Encrypt Certbot # Certbot (Let's Encrypt)
# This service provides free SSL certificates that can # This service provides automatic SSL for the panel.
# be used to connect to the world. Uncomment if you # when in doubt, use it. Please check certbot's documentation
# are using the panel on its own (without a reverse # for use in a container.
# proxy). It is recommended to use the webroot
# plugin. To get a certificate, run
# "docker-compose run --rm certbot --webroot -w
# /etc/letsencrypt/.webroot -d {domain}" and follow
# the instructions on screen.
## ##
# certbot: certbot:
# command: renew command: renew
# image: certbot/certbot:v0.16.0 image: certbot/certbot
# volumes: volumes:
# - ./letsencrypt:/etc/letsencrypt - ./letsencrypt:/etc/letsencrypt
##
# Panel Cache
# This service is required for the panel to function.
# You can use either redis or memcached, but memcached
# is provided by default here.
##
cache:
image: memcached:1.4-alpine
restart: always
## ##
# MariaDB (MySQL) Server # MariaDB (MySQL) Server
...@@ -43,7 +28,18 @@ services: ...@@ -43,7 +28,18 @@ services:
image: mariadb:10.1 image: mariadb:10.1
restart: always restart: always
volumes: volumes:
- ./db:/var/lib/mysql - ./mysql_db:/var/lib/mysql
##
# Panel Cache
# This service is required for the panel to function.
# You can use either redis or memcached, but redis
# is provided by default here.
##
cache:
container_name: pterodactyl-cache
image: redis:alpine
restart: always
## ##
# Pterodactyl Panel # Pterodactyl Panel
...@@ -59,6 +55,7 @@ services: ...@@ -59,6 +55,7 @@ services:
restart: always restart: always
volumes: volumes:
- ./data:/data - ./data:/data
# Let's Encrypt webroot functionality # Let's Encrypt webroot functionality
# - ./letsencrypt:/etc/letsencrypt # - ./letsencrypt:/etc/letsencrypt
# - ./letsencrypt/.webroot/.well-known:/var/www/html/public # - ./letsencrypt/.webroot/.well-known:/var/www/html/public
...@@ -78,6 +75,7 @@ services: ...@@ -78,6 +75,7 @@ services:
image: quay.io/ccarney/pterodactyl-daemon:v0.5.0-beta image: quay.io/ccarney/pterodactyl-daemon:v0.5.0-beta
ports: ports:
- 8080:8080 - 8080:8080
privileged: true
restart: always restart: always
volumes: volumes:
- /srv/daemon/config:/srv/daemon/config - /srv/daemon/config:/srv/daemon/config
...@@ -86,4 +84,5 @@ services: ...@@ -86,4 +84,5 @@ services:
- /tmp/pterodactyl:/tmp/pterodactyl - /tmp/pterodactyl:/tmp/pterodactyl
# Docker socket, this is required to function properly.
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment