From b4831379961c4f152cb9b41bc4ac0f0cd46e4c57 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Thu, 5 Dec 2019 12:24:09 +0100
Subject: [PATCH] Use my own git repository for master builds
---
Dockerfile | 3 ++-
Makefile | 4 ++++
build.sh | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index c888684..083c8e6 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 ab31bb4..4aa0cbe 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 2468cab..4f64644 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
--
GitLab