Merge branch 'develop' of https://github.com/pterodactyl/wings into develop

This commit is contained in:
Dane Everitt 2020-05-03 21:04:23 -07:00
commit 7f93e5f9d5
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
3 changed files with 62 additions and 0 deletions

14
Dockerfile Normal file
View File

@ -0,0 +1,14 @@
# ----------------------------------
# Pterodactyl Panel Dockerfile
# ----------------------------------
FROM golang:1.14-alpine
COPY . /go/wings/
WORKDIR /go/wings/
RUN apk add --no-cache upx \
&& go build -ldflags="-s -w" \
&& upx --brute wings
FROM alpine:latest
COPY --from=0 /go/wings/wings /usr/bin/
CMD ["wings","--config", "/var/lib/pterodactyl/config.yml"]

View File

@ -268,6 +268,28 @@ func (c *Configuration) EnsureFilePermissions() error {
r := regexp.MustCompile("^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}$")
// add trailing slash on data directory is no trailing slash exists
if ! strings.HasSuffix(c.System.Data, "/") {
c.System.Data = c.System.Data + "/"
}
// create the daemon-data dir if it doesn't exist
p, _ := path.Split(c.System.Data)
if _, err := os.Stat(c.System.Data); err != nil {
// if file doesn't exist
if os.IsNotExist(err) {
//
if err = os.Mkdir(p, 0755); err != nil {
// of we can't make the directory return error
return err
}
} else {
// if the error is anything but IsNotExist
return err
}
}
files, err := ioutil.ReadDir(c.System.Data)
if err != nil {
return err

View File

@ -0,0 +1,26 @@
version: '3'
services:
daemon:
build: .
restart: always
hostname: daemon
ports:
- "8080:8080"
- "2022:2022"
tty: true
environment:
- "DEBUG=false"
volumes:
- "/var/run/docker.sock:/var/run/docker.sock"
- "/var/lib/docker/containers/:/var/lib/docker/containers/"
- "/var/lib/pterodactyl/:/var/lib/pterodactyl/"
- "/srv/daemon-data/:/srv/daemon-data/"
- "/tmp/pterodactyl/:/tmp/pterodactyl/"
- "/etc/timezone:/etc/timezone:ro"
## Required for ssl if you user let's encrypt. uncomment to use.
## - "/etc/letsencrypt/:/etc/letsencrypt/"
networks:
default:
ipam:
config:
- subnet: 172.21.0.0/16