Make changes proposed by @pztrn

This commit is contained in:
Timur Demin 2019-07-20 14:16:06 +05:00
parent dbf82e213b
commit d9a46aa5b3
No known key found for this signature in database
GPG Key ID: 9EDF3F9D9286FA20
4 changed files with 5 additions and 5 deletions

View File

@ -1,4 +1,4 @@
FROM golang:1.11-alpine FROM golang:1.11-alpine AS build
WORKDIR /app WORKDIR /app
@ -8,8 +8,8 @@ RUN apk add git && \
FROM alpine:3.10 FROM alpine:3.10
LABEL maintainer "Stanislav N. <pztrn@pztrn.name>" LABEL maintainer "Stanislav N. <pztrn@pztrn.name>"
COPY --from=0 /go/bin/fastpastebin /app/fastpastebin COPY --from=build /go/bin/fastpastebin /app/fastpastebin
COPY examples/fastpastebin.yaml.docker /app/fastpastebin.yaml COPY fastpastebin.docker.yaml /app/fastpastebin.yaml
EXPOSE 25544 EXPOSE 25544
ENTRYPOINT [ "/app/fastpastebin", "-config", "/app/fastpastebin.yaml" ] ENTRYPOINT [ "/app/fastpastebin", "-config", "/app/fastpastebin.yaml" ]

View File

@ -23,14 +23,14 @@ services:
depends_on: depends_on:
- database - database
volumes: volumes:
- ./examples/fastpastebin.yaml.docker:/app/fastpastebin.yaml:ro - ./fastpastebin.docker.yaml:/app/fastpastebin.yaml:ro
# ports: # ports:
# - 25544:25544 # - 25544:25544
web: web:
image: nginx:1.16-alpine image: nginx:1.16-alpine
container_name: nginx container_name: nginx
volumes: volumes:
- ./examples/nginx.conf:/etc/nginx/conf.d/default.conf:ro - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro
ports: ports:
- 8080:80 - 8080:80
depends_on: depends_on: