diff --git a/Dockerfile b/Dockerfile index dcb75d8..574bfda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,33 +1,22 @@ # Stage 1 (Build) -FROM golang:1.15-alpine3.12 AS builder +FROM golang:1.15-alpine3.12 AS builder -ARG VERSION - -RUN apk add --update --no-cache git=2.26.2-r0 make=4.3-r0 upx=3.96-r0 - -WORKDIR /app/ - -COPY go.mod go.sum /app/ -RUN go mod download - -COPY . /app/ - -RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build \ - -ldflags="-s -w -X github.com/pterodactyl/wings/system.Version=$VERSION" \ - -v \ - -trimpath \ - -o wings \ - wings.go - -RUN upx wings - -# --------------------------------------- # +ARG VERSION +RUN apk add --update --no-cache git=2.26.2-r0 make=4.3-r0 upx=3.96-r0 +WORKDIR /app/ +COPY go.mod go.sum /app/ +RUN go mod download +COPY . /app/ +RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build \ + -ldflags="-s -w -X github.com/pterodactyl/wings/system.Version=$VERSION" \ + -v \ + -trimpath \ + -o wings \ + wings.go +RUN upx wings # Stage 2 (Final) -FROM busybox:1.33.0 - -RUN echo "ID=\"busybox\"" > /etc/os-release - -COPY --from=builder /app/wings /usr/bin/ - -CMD [ "wings", "--config", "/etc/pterodactyl/config.yml" ] +FROM busybox:1.33.0 +RUN echo "ID=\"busybox\"" > /etc/os-release +COPY --from=builder /app/wings /usr/bin/ +CMD [ "wings", "--config", "/etc/pterodactyl/config.yml" ] diff --git a/docker-compose.example.yml b/docker-compose.example.yml index d2aeb6c..583a0d1 100644 --- a/docker-compose.example.yml +++ b/docker-compose.example.yml @@ -22,6 +22,7 @@ services: - "/var/lib/pterodactyl/:/var/lib/pterodactyl/" - "/var/log/pterodactyl/:/var/log/pterodactyl/" - "/tmp/pterodactyl/:/tmp/pterodactyl/" + - "/etc/ssl/certs:/etc/ssl/certs" # 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 use let's encrypt. uncomment to use.