0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2024-12-30 22:34:13 -05:00

build: fix docker build

Update Dockerfile and Makefile to build a zot docker image
This commit is contained in:
Ramkumar Chinchani 2020-11-05 17:39:14 -08:00
parent b80b7d2361
commit 09c633ad91
3 changed files with 20 additions and 19 deletions

View file

@ -1,18 +1,23 @@
# --- # ---
# Stage 1: Install certs, build binary, create default config file # Stage 1: Install certs, build binary, create default config file
# --- # ---
FROM docker.io/golang:1.13.6-alpine3.11 AS builder FROM docker.io/golang:1.15.3 AS builder
RUN apk --update add git make ca-certificates
RUN mkdir -p /go/src/github.com/anuvu/zot RUN mkdir -p /go/src/github.com/anuvu/zot
WORKDIR /go/src/github.com/anuvu/zot WORKDIR /go/src/github.com/anuvu/zot
COPY . . COPY . .
RUN CGO_ENABLED=0 make clean binary RUN CGO_ENABLED=0 make clean binary
RUN echo -e '# Default config file for zot server\n\ RUN echo '{\n\
http:\n\ "storage": {\n\
address: 0.0.0.0\n\ "rootDirectory": "/var/lib/registry"\n\
port: 5000\n\ },\n\
storage:\n\ "http": {\n\
rootDirectory: /var/lib/registry' > config.yml && cat config.yml "address": "0.0.0.0",\n\
"port": "5000"\n\
},\n\
"log": {\n\
"level": "debug"\n\
}\n\
}\n' > config.json && cat config.json
# --- # ---
# Stage 2: Final image with nothing but certs, binary, and default config file # Stage 2: Final image with nothing but certs, binary, and default config file
@ -20,8 +25,8 @@ storage:\n\
FROM scratch AS final FROM scratch AS final
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
COPY --from=builder /go/src/github.com/anuvu/zot/bin/zot /zot COPY --from=builder /go/src/github.com/anuvu/zot/bin/zot /zot
COPY --from=builder /go/src/github.com/anuvu/zot/config.yml /etc/zot/config.yml COPY --from=builder /go/src/github.com/anuvu/zot/config.json /etc/zot/config.json
ENTRYPOINT ["/zot"] ENTRYPOINT ["/zot"]
EXPOSE 5000 EXPOSE 5000
VOLUME ["/var/lib/registry"] VOLUME ["/var/lib/registry"]
CMD ["serve", "/etc/zot/config.yml"] CMD ["serve", "/etc/zot/config.json"]

View file

@ -1,7 +0,0 @@
FROM golang:1.12.8
RUN go version
ENV GO111MODULE on
RUN go get -u github.com/swaggo/swag/cmd/swag
WORKDIR /go/src/github.com/anuvu/zot
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.17.1

View file

@ -52,9 +52,12 @@ run: binary test
.PHONY: binary-container .PHONY: binary-container
binary-container: binary-container:
${CONTAINER_RUNTIME} build ${BUILD_ARGS} -f Dockerfile.build -t zot-build:latest . ${CONTAINER_RUNTIME} build ${BUILD_ARGS} -f Dockerfile -t zot-build:latest .
.PHONY: run-container
run-container:
${CONTAINER_RUNTIME} run --rm --security-opt label=disable -v $$(pwd):/go/src/github.com/anuvu/zot \ ${CONTAINER_RUNTIME} run --rm --security-opt label=disable -v $$(pwd):/go/src/github.com/anuvu/zot \
zot-build:latest make zot-build:latest
.PHONY: binary-stacker .PHONY: binary-stacker
binary-stacker: binary-stacker: