0ct0pu5/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Docker: Remove unused photoprism/goproxy config #98 #782

Browse source
This commit is contained in:
Michael Mayer 2021-12-18 15:00:36 +01:00
parent 4f5c326268
commit 0207d23ec8
2 changed files with 2 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -243,9 +243,6 @@ docker-local:
scripts/docker/build.sh photoprism
docker-pull:
docker pull photoprism/photoprism:preview photoprism/photoprism:latest
docker-goproxy:
docker pull golang:alpine
scripts/docker/multiarch.sh goproxy linux/amd64,linux/arm64 $(DOCKER_TAG)
docker-demo:
scripts/docker/build.sh demo $(DOCKER_TAG)
scripts/docker/push.sh demo $(DOCKER_TAG)
@ -254,12 +251,10 @@ docker-demo-local:
scripts/docker/build.sh demo $(DOCKER_TAG)
scripts/docker/push.sh demo $(DOCKER_TAG)
docker-dummy-webdav:
docker pull --platform=amd64 golang:1
docker pull --platform=arm64 golang:1
docker pull golang:alpine
scripts/docker/multiarch.sh dummy-webdav linux/amd64,linux/arm64 $(DOCKER_TAG)
docker-dummy-oidc:
docker pull --platform=amd64 golang:1
docker pull --platform=arm64 golang:1
docker pull golang:alpine
scripts/docker/multiarch.sh dummy-oidc linux/amd64,linux/arm64 $(DOCKER_TAG)
packer-digitalocean:
$(info Buildinng DigitalOcean marketplace image...)

29
docker/goproxy/Dockerfile
View file

@ -1,29 +0,0 @@
##################################################### BUILD STAGE ######################################################
FROM golang:alpine AS build
ARG GOPROXY
ARG GODEBUG
RUN apk add --no-cache -U make git mercurial subversion
RUN git clone https://github.com/goproxyio/goproxy.git /src/goproxy && \
cd /src/goproxy && \
export CGO_ENABLED=0 && \
make
################################################## PRODUCTION STAGE ####################################################
FROM golang:alpine
ENV TINI_VERSION v0.19.0
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static-amd64 /usr/bin/tini
RUN chmod +x /usr/bin/tini
RUN apk add --no-cache -U git mercurial subversion
COPY --from=build /src/goproxy/bin/goproxy /goproxy
VOLUME "/go"
EXPOSE 8888
ENTRYPOINT ["/usr/bin/tini", "--"]
CMD ["/goproxy", "-listen", "0.0.0.0:8888"]