diff --git a/Makefile b/Makefile index 3c681b212..f830b8b8a 100644 --- a/Makefile +++ b/Makefile @@ -1074,9 +1074,6 @@ docker-local-develop-resolute: docker-ddns: docker pull golang:alpine scripts/docker/buildx-multi.sh ddns linux/amd64,linux/arm64 $(BUILD_DATE) -docker-goproxy: - docker pull golang:alpine - scripts/docker/buildx-multi.sh goproxy linux/amd64,linux/arm64 $(BUILD_DATE) demo: docker-demo docker-demo: docker-demo-latest docker-demo-all: docker-demo-latest docker-demo-debian diff --git a/docker/README.md b/docker/README.md index a0e5b83b9..d15849992 100644 --- a/docker/README.md +++ b/docker/README.md @@ -30,7 +30,6 @@ A virtual machine with a dedicated operating system environment provides even mo | `demo/` | Build context for the public [demo site](https://demo.photoprism.app/), including Traefik and job configuration. | | `ddns/` | Minimal image for the Dynamic DNS updater used by our hosted services. | | `dummy/` | Test doubles for OIDC and WebDAV used by acceptance tests and local development. | -| `goproxy/` | Caching Go module proxy used to speed up CI and local builds. | ### Which Image Should I Use? diff --git a/docker/goproxy/Dockerfile b/docker/goproxy/Dockerfile deleted file mode 100644 index 122f55d50..000000000 --- a/docker/goproxy/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -##################################################### BUILD STAGE ###################################################### -FROM golang:alpine AS build - -ENV DO_NOT_TRACK=true - -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 DO_NOT_TRACK=true \ - 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"]