diff --git a/Dockerfile b/docker/Dockerfile similarity index 64% rename from Dockerfile rename to docker/Dockerfile index 0588b6e..a7e6a15 100644 --- a/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.11-alpine +FROM golang:1.11-alpine AS build WORKDIR /app @@ -8,8 +8,8 @@ RUN apk add git && \ FROM alpine:3.10 LABEL maintainer "Stanislav N. " -COPY --from=0 /go/bin/fastpastebin /app/fastpastebin -COPY examples/fastpastebin.yaml.docker /app/fastpastebin.yaml +COPY --from=build /go/bin/fastpastebin /app/fastpastebin +COPY fastpastebin.docker.yaml /app/fastpastebin.yaml EXPOSE 25544 ENTRYPOINT [ "/app/fastpastebin", "-config", "/app/fastpastebin.yaml" ] diff --git a/docker-compose.yml b/docker/docker-compose.yml similarity index 83% rename from docker-compose.yml rename to docker/docker-compose.yml index 85d431e..af70478 100644 --- a/docker-compose.yml +++ b/docker/docker-compose.yml @@ -23,14 +23,14 @@ services: depends_on: - database volumes: - - ./examples/fastpastebin.yaml.docker:/app/fastpastebin.yaml:ro + - ./fastpastebin.docker.yaml:/app/fastpastebin.yaml:ro # ports: # - 25544:25544 web: image: nginx:1.16-alpine container_name: nginx volumes: - - ./examples/nginx.conf:/etc/nginx/conf.d/default.conf:ro + - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro ports: - 8080:80 depends_on: diff --git a/examples/fastpastebin.yaml.docker b/docker/fastpastebin.docker.yaml similarity index 100% rename from examples/fastpastebin.yaml.docker rename to docker/fastpastebin.docker.yaml diff --git a/examples/nginx.conf b/docker/nginx.conf similarity index 100% rename from examples/nginx.conf rename to docker/nginx.conf