diff --git a/Dockerfile b/Dockerfile index 3554c48..650e65d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,8 @@ ENV CGO_ENABLED=0 ADD . /build WORKDIR /build -RUN apk add -u git +RUN apk add --no-cache --update git tzdata ca-certificates + RUN \ if [ -z "$CI" ] ; then \ echo "runs outside of CI" && version=$(git rev-parse --abbrev-ref HEAD)-$(git log -1 --format=%h)-$(date +%Y%m%dT%H:%M:%S); \ @@ -19,23 +20,11 @@ RUN \ cd app && go build -o /build/reproxy -ldflags "-X main.revision=${version} -s -w" -FROM alpine:3.13 +FROM scratch -ENV \ - TERM=xterm-color \ - TIME_ZONE=UTC - -RUN \ - apk add --no-cache --update tzdata curl ca-certificates dumb-init && \ - cp /usr/share/zoneinfo/${TIME_ZONE} /etc/localtime && \ - echo "${TIME_ZONE}" > /etc/timezone && date && \ - ln -s /usr/bin/dumb-init /sbin/dinit && \ - rm -rf /var/cache/apk/* - -COPY init.sh /init.sh +COPY --from=backend /usr/share/zoneinfo /usr/share/zoneinfo +COPY --from=backend /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=backend /build/reproxy /srv/reproxy -RUN chmod +x /srv/reproxy -WORKDIR /srv -ENTRYPOINT ["/init.sh"] -CMD ["/srv/reproxy"] \ No newline at end of file +WORKDIR /srv +ENTRYPOINT ["/srv/reproxy"] diff --git a/examples/assets/embed/Dockerfile b/examples/assets/embed/Dockerfile index 8214ca3..31a00dc 100644 --- a/examples/assets/embed/Dockerfile +++ b/examples/assets/embed/Dockerfile @@ -1,5 +1,5 @@ FROM umputun/reproxy:master -ENV TIME_ZONE=America/Chicago +ENV TZ=America/Chicago COPY assets /web EXPOSE 80 -CMD ["/srv/reproxy", "--assets.location=/web", "--listen=0.0.0.0:80"] \ No newline at end of file +CMD ["--assets.location=/web", "--listen=0.0.0.0:80"] \ No newline at end of file diff --git a/examples/assets/embed/docker-compose.yml b/examples/assets/embed/docker-compose.yml index 5f5ebb9..2c5567d 100644 --- a/examples/assets/embed/docker-compose.yml +++ b/examples/assets/embed/docker-compose.yml @@ -4,7 +4,4 @@ services: container_name: reproxy-embed hostname: reproxy-embed ports: - - "80:80" - environment: - - LISTEN=0.0.0.0:8080 - - ASSETS_LOCATION=/web + - "80:80" \ No newline at end of file diff --git a/examples/assets/external/Dockerfile b/examples/assets/external/Dockerfile index a7a9ae2..9a6b064 100644 --- a/examples/assets/external/Dockerfile +++ b/examples/assets/external/Dockerfile @@ -1,4 +1,4 @@ FROM umputun/reproxy:master ENV TIME_ZONE=America/Chicago EXPOSE 80 -CMD ["/srv/reproxy", "--assets.location=/web", "--listen=0.0.0.0:80"] \ No newline at end of file +CMD ["--assets.location=/web", "--listen=0.0.0.0:80"] \ No newline at end of file diff --git a/examples/assets/external/docker-compose.yml b/examples/assets/external/docker-compose.yml index c506cb8..3fef45e 100644 --- a/examples/assets/external/docker-compose.yml +++ b/examples/assets/external/docker-compose.yml @@ -7,6 +7,3 @@ services: - "80:80" volumes: - ./assets:/web - environment: - - LISTEN=0.0.0.0:8080 - - ASSETS_LOCATION=/web diff --git a/examples/docker/docker-compose.yml b/examples/docker/docker-compose.yml index 5824441..01b3097 100644 --- a/examples/docker/docker-compose.yml +++ b/examples/docker/docker-compose.yml @@ -3,20 +3,18 @@ services: image: umputun/reproxy:master container_name: reproxy hostname: reproxy - labels: - reproxy.enabled: "false" # don't include reproxy to automatic destinations ports: - "80:8080" volumes: - - /var/run/docker.sock:/var/run/docker.sock + - /var/run/docker.sock:/var/run/docker.sock:ro - ./web:/web environment: + - TZ=America/Chicago - LISTEN=0.0.0.0:8080 - DOCKER_ENABLED=true - DOCKER_AUTO=true - ASSETS_LOCATION=/web - DEBUG=true - - TIME_ZONE=America/Chicago # automatic destination, will be mapped for ^/api/svc1/(.*) svc1: