update docker configs (#50)

* update docker configs

dockerfile with an updated start command

docker-compose file adds custom network name so it can be used in firewalld commands.

* update compose file

mount changes
remove /srv/daemon-data
remove /etc/timezone

variable changes
add TZ

* add note about old data folder.

* update to go 1.15

Update base image to go version 1.15
This commit is contained in:
Michael (Parker) Parker 2020-09-17 23:48:01 -04:00 committed by GitHub
parent 48aeeff818
commit aa78071543
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 8 deletions

View File

@ -2,7 +2,7 @@
# Pterodactyl Panel Dockerfile # Pterodactyl Panel Dockerfile
# ---------------------------------- # ----------------------------------
FROM golang:1.14-alpine FROM golang:1.15-alpine
COPY . /go/wings/ COPY . /go/wings/
WORKDIR /go/wings/ WORKDIR /go/wings/
RUN apk add --no-cache upx \ RUN apk add --no-cache upx \
@ -11,4 +11,4 @@ RUN apk add --no-cache upx \
FROM alpine:latest FROM alpine:latest
COPY --from=0 /go/wings/wings /usr/bin/ COPY --from=0 /go/wings/wings /usr/bin/
CMD ["wings","--config", "/var/lib/pterodactyl/config.yml"] CMD ["wings","--config", "/etc/pterodactyl/config.yml"]

View File

@ -1,26 +1,35 @@
version: '3' version: '3.5'
services: services:
daemon: daemon:
build: . build: .
restart: always restart: always
hostname: daemon networks:
- daemon0
ports: ports:
- "8080:8080" - "8080:8080"
- "2022:2022" - "2022:2022"
tty: true tty: true
environment: environment:
- "DEBUG=false" - "DEBUG=false"
- "TZ=UTC" # change to the three letter timezone of your choosing
volumes: volumes:
- "/var/run/docker.sock:/var/run/docker.sock" - "/var/run/docker.sock:/var/run/docker.sock"
- "/var/lib/docker/containers/:/var/lib/docker/containers/" - "/var/lib/docker/containers/:/var/lib/docker/containers/"
- "/etc/pterodactyl/:/etc/pterodactyl/"
- "/var/lib/pterodactyl/:/var/lib/pterodactyl/" - "/var/lib/pterodactyl/:/var/lib/pterodactyl/"
- "/srv/daemon-data/:/srv/daemon-data/" - "/var/log/pterodactyl/:/var/log/pterodactyl/"
- "/tmp/pterodactyl/:/tmp/pterodactyl/" - "/tmp/pterodactyl/:/tmp/pterodactyl/"
- "/etc/timezone:/etc/timezone:ro" ## you may need /srv/daemon-data if you are upgrading from an old daemon
## - "/srv/daemon-data/:/srv/daemon-data/"
## Required for ssl if you user let's encrypt. uncomment to use. ## Required for ssl if you user let's encrypt. uncomment to use.
## - "/etc/letsencrypt/:/etc/letsencrypt/" ## - "/etc/letsencrypt/:/etc/letsencrypt/"
networks: networks:
default: daemon0:
name: daemon0
driver: bridge
ipam: ipam:
config: config:
- subnet: 172.21.0.0/16 - subnet: "172.21.0.0/16"
driver_opts:
com.docker.network.bridge.name: daemon0