peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

...

Browse Source
This commit is contained in:
Antoine GIRARD 2018-06-08 19:12:59 +02:00
parent a733d828c3
commit dab1afa29c
No known key found for this signature in database
GPG Key ID: F3B46D1708E22963
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile
View File

@ -1,7 +1,9 @@
ARG target=library ARG target=library
################################### ###################################
#Build stage #Build stage
FROM golang:1.10-alpine3.7 AS build-env FROM $target/golang:1.10-alpine3.7 AS build-env
#QEMU phase
ARG GOARCH ARG GOARCH
ARG GITEA_VERSION ARG GITEA_VERSION
@ -62,5 +64,6 @@ VOLUME ["/data"]
ENTRYPOINT ["/usr/bin/entrypoint"] ENTRYPOINT ["/usr/bin/entrypoint"]
CMD ["/bin/s6-svscan", "/etc/s6"] CMD ["/bin/s6-svscan", "/etc/s6"]
COPY docker / COPY docker/etc /etc/
COPY docker/usr /usr/
COPY --from=build-env /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea COPY --from=build-env /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea

9
docker/Makefile
View File

@ -26,9 +26,9 @@ docker-build:
.PHONY: docker-cross .PHONY: docker-cross
docker-cross : docker-setup-qemu docker-cross : docker-setup-qemu
docker build --build-arg target=$(TARGET) --build-arg GOARCH=$(GOARCH) -f docker/Dockerfile.$(QEMU_ARCH) -t $(DOCKER_REF) . docker build --build-arg target=$(TARGET) --build-arg GOARCH=$(GOARCH) -f docker/Dockerfile.$(QEMU_ARCH) -t $(DOCKER_REF) .
#exemple TARGET=arm64v8 GOARCH=arm64 QEMU_ARCH=aarch64 make docker-cross #exemple TARGET=arm64v8 GOARCH=arm64 QEMU_ARCH=aarch64 make docker-cross
#exemple TARGET=amd64 GOARCH=amd64 QEMU_ARCH=amd64 make docker-cross #exemple TARGET=amd64 GOARCH=amd64 QEMU_ARCH=amd64 make docker-cross
#exemple TARGET=arm32v6 GOARCH=arm QEMU_ARCH=arm make docker-cross #exemple TARGET=arm32v6 GOARCH=arm QEMU_ARCH=arm make docker-cross
TARGET: arm32v6 TARGET: arm32v6
.PHONY: docker-setup-qemu .PHONY: docker-setup-qemu
@ -38,6 +38,7 @@ docker-setup-qemu:
(cd docker && curl -sL https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-${QEMU_ARCH}-static.tar.gz | tar xz); \ (cd docker && curl -sL https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-${QEMU_ARCH}-static.tar.gz | tar xz); \
docker run --rm --privileged multiarch/qemu-user-static:register --reset; \ docker run --rm --privileged multiarch/qemu-user-static:register --reset; \
sed "s/^#QEMU phase/COPY docker\/qemu-${QEMU_ARCH}-static* \/usr\/bin\//g" Dockerfile > docker/Dockerfile.${QEMU_ARCH}; \ sed "s/^#QEMU phase/COPY docker\/qemu-${QEMU_ARCH}-static* \/usr\/bin\//g" Dockerfile > docker/Dockerfile.${QEMU_ARCH}; \
sed -i "s/make clean generate build/make build/g" docker/Dockerfile.${QEMU_ARCH}; \
else cp Dockerfile docker/Dockerfile.${QEMU_ARCH}; \ else cp Dockerfile docker/Dockerfile.${QEMU_ARCH}; \
fi; fi;
#sed -i "s/make clean generate build/make build --always-make/g" docker/Dockerfile.${QEMU_ARCH}; \