diff --git a/Dockerfile b/Dockerfile index c888684c569fea56de0f3d1aa061b185a6320d04..083c8e67aa97af1b02edaf9fd8dc1a6028d495ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,10 +25,11 @@ RUN apk add --no-cache \ ARG QUASSEL_VERSION="" ARG QUASSEL_BRANCH="master" +ARG QUASSEL_REPO="https://github.com/quassel/quassel" # setup repo RUN mkdir /quassel && \ - git clone -b "$QUASSEL_BRANCH" --single-branch https://github.com/quassel/quassel /quassel/src && \ + git clone -b "$QUASSEL_BRANCH" --single-branch "$QUASSEL_REPO" /quassel/src && \ cd /quassel/src && \ if [ ! -z "$QUASSEL_VERSION" ]; then \ git checkout $QUASSEL_VERSION; \ diff --git a/Makefile b/Makefile index ab31bb49ce70dd9600036a58a3c8ad5add96a9d2..4aa0cbe536c9f7d1cc96a8877dd0701cb6320ad3 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ NAME=k8r.eu/justjanne/quassel-docker ALPINE_VERSION=3.10 QUASSEL_VERSION= QUASSEL_BRANCH=master +QUASSEL_REPO=https://github.com/quassel/quassel ifeq ($(strip $(QUASSEL_VERSION)),) IMAGE_VERSION=trunk else @@ -21,6 +22,7 @@ build_x86: Dockerfile --build-arg BASE=alpine:$(ALPINE_VERSION) \ --build-arg QUASSEL_VERSION=$(QUASSEL_VERSION) \ --build-arg QUASSEL_BRANCH=$(QUASSEL_BRANCH) \ + --build-arg QUASSEL_REPO=$(QUASSEL_REPO) \ . if [ ! -z "$(QUASSEL_VERSION)" ]; then docker tag $(NAME):$(IMAGE_VERSION) $(NAME):latest; fi @@ -31,6 +33,7 @@ build_aarch64: Dockerfile --build-arg BASE=multiarch/alpine:aarch64-v$(ALPINE_VERSION) \ --build-arg QUASSEL_VERSION=$(QUASSEL_VERSION) \ --build-arg QUASSEL_BRANCH=$(QUASSEL_BRANCH) \ + --build-arg QUASSEL_REPO=$(QUASSEL_REPO) \ . if [ ! -z "$(QUASSEL_VERSION)" ]; then docker tag $(NAME):$(IMAGE_VERSION)-aarch64 $(NAME):aarch64; fi @@ -41,6 +44,7 @@ build_armhf: Dockerfile --build-arg BASE=multiarch/alpine:armhf-v$(ALPINE_VERSION) \ --build-arg QUASSEL_VERSION=$(QUASSEL_VERSION) \ --build-arg QUASSEL_BRANCH=$(QUASSEL_BRANCH) \ + --build-arg QUASSEL_REPO=$(QUASSEL_REPO) \ . if [ ! -z "$(QUASSEL_VERSION)" ]; then docker tag $(NAME):$(IMAGE_VERSION)-armhf $(NAME):armhf; fi diff --git a/build.sh b/build.sh index 2468cabcfdfc0edfe0906cbf5c6df4063ab4631c..4f64644db3ba45a2747de1d92f1e3d9d7b9d68c8 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,4 @@ #!/bin/sh make QUASSEL_BRANCH=0.13 QUASSEL_VERSION=0.13.1 -make QUASSEL_BRANCH=master +make QUASSEL_BRANCH=master QUASSEL_REPO=https://github.com/justjanne/quassel