Skip to content
Snippets Groups Projects
Verified Commit b4831379 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Use my own git repository for master builds

parent fac9c614
Branches
No related tags found
No related merge requests found
...@@ -25,10 +25,11 @@ RUN apk add --no-cache \ ...@@ -25,10 +25,11 @@ RUN apk add --no-cache \
ARG QUASSEL_VERSION="" ARG QUASSEL_VERSION=""
ARG QUASSEL_BRANCH="master" ARG QUASSEL_BRANCH="master"
ARG QUASSEL_REPO="https://github.com/quassel/quassel"
# setup repo # setup repo
RUN mkdir /quassel && \ 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 && \ cd /quassel/src && \
if [ ! -z "$QUASSEL_VERSION" ]; then \ if [ ! -z "$QUASSEL_VERSION" ]; then \
git checkout $QUASSEL_VERSION; \ git checkout $QUASSEL_VERSION; \
......
...@@ -2,6 +2,7 @@ NAME=k8r.eu/justjanne/quassel-docker ...@@ -2,6 +2,7 @@ NAME=k8r.eu/justjanne/quassel-docker
ALPINE_VERSION=3.10 ALPINE_VERSION=3.10
QUASSEL_VERSION= QUASSEL_VERSION=
QUASSEL_BRANCH=master QUASSEL_BRANCH=master
QUASSEL_REPO=https://github.com/quassel/quassel
ifeq ($(strip $(QUASSEL_VERSION)),) ifeq ($(strip $(QUASSEL_VERSION)),)
IMAGE_VERSION=trunk IMAGE_VERSION=trunk
else else
...@@ -21,6 +22,7 @@ build_x86: Dockerfile ...@@ -21,6 +22,7 @@ build_x86: Dockerfile
--build-arg BASE=alpine:$(ALPINE_VERSION) \ --build-arg BASE=alpine:$(ALPINE_VERSION) \
--build-arg QUASSEL_VERSION=$(QUASSEL_VERSION) \ --build-arg QUASSEL_VERSION=$(QUASSEL_VERSION) \
--build-arg QUASSEL_BRANCH=$(QUASSEL_BRANCH) \ --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 if [ ! -z "$(QUASSEL_VERSION)" ]; then docker tag $(NAME):$(IMAGE_VERSION) $(NAME):latest; fi
...@@ -31,6 +33,7 @@ build_aarch64: Dockerfile ...@@ -31,6 +33,7 @@ build_aarch64: Dockerfile
--build-arg BASE=multiarch/alpine:aarch64-v$(ALPINE_VERSION) \ --build-arg BASE=multiarch/alpine:aarch64-v$(ALPINE_VERSION) \
--build-arg QUASSEL_VERSION=$(QUASSEL_VERSION) \ --build-arg QUASSEL_VERSION=$(QUASSEL_VERSION) \
--build-arg QUASSEL_BRANCH=$(QUASSEL_BRANCH) \ --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 if [ ! -z "$(QUASSEL_VERSION)" ]; then docker tag $(NAME):$(IMAGE_VERSION)-aarch64 $(NAME):aarch64; fi
...@@ -41,6 +44,7 @@ build_armhf: Dockerfile ...@@ -41,6 +44,7 @@ build_armhf: Dockerfile
--build-arg BASE=multiarch/alpine:armhf-v$(ALPINE_VERSION) \ --build-arg BASE=multiarch/alpine:armhf-v$(ALPINE_VERSION) \
--build-arg QUASSEL_VERSION=$(QUASSEL_VERSION) \ --build-arg QUASSEL_VERSION=$(QUASSEL_VERSION) \
--build-arg QUASSEL_BRANCH=$(QUASSEL_BRANCH) \ --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 if [ ! -z "$(QUASSEL_VERSION)" ]; then docker tag $(NAME):$(IMAGE_VERSION)-armhf $(NAME):armhf; fi
......
#!/bin/sh #!/bin/sh
make QUASSEL_BRANCH=0.13 QUASSEL_VERSION=0.13.1 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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment