Update dendrite/Dockerfile, dendrite/Makefile files

This commit is contained in:
Adrien le Maire 2021-01-31 12:10:27 +00:00
parent ba3d4c074b
commit 824a5c0c22
2 changed files with 6 additions and 5 deletions

View File

@ -1,9 +1,10 @@
FROM golang:buster as builder FROM golang:buster as builder
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
COPY dendrite /dendrite ARG VERSION
WORKDIR /dendrite WORKDIR /
RUN rm -rf .git && ./build.sh RUN git clone -b v${VERSION} --depth 1 https://github.com/matrix-org/dendrite.git && \
cd dendrite && rm -rf .git && ./build.sh
FROM debian:buster-20210111-slim FROM debian:buster-20210111-slim

View File

@ -3,13 +3,13 @@ include version
IMAGE=dendrite IMAGE=dendrite
nopush: git-clone nopush:
docker buildx build --platform linux/amd64 --load \ docker buildx build --platform linux/amd64 --load \
--build-arg VERSION=$(VERSION) \ --build-arg VERSION=$(VERSION) \
--tag ${NAMESPACE}/${IMAGE}:$(VERSION) \ --tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) . --tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .
push: git-clone push:
docker buildx build --platform linux/amd64,linux/arm64 --push \ docker buildx build --platform linux/amd64,linux/arm64 --push \
--build-arg VERSION=$(VERSION) \ --build-arg VERSION=$(VERSION) \
--cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \ --cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \