Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
quassel-docker
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Janne Mareike Koschinski
quassel-docker
Commits
b4831379
Verified
Commit
b4831379
authored
5 years ago
by
Janne Mareike Koschinski
Browse files
Options
Downloads
Patches
Plain Diff
Use my own git repository for master builds
parent
fac9c614
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Dockerfile
+2
-1
2 additions, 1 deletion
Dockerfile
Makefile
+4
-0
4 additions, 0 deletions
Makefile
build.sh
+1
-1
1 addition, 1 deletion
build.sh
with
7 additions
and
2 deletions
Dockerfile
+
2
−
1
View file @
b4831379
...
@@ -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
;
\
...
...
This diff is collapsed.
Click to expand it.
Makefile
+
4
−
0
View file @
b4831379
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
build.sh
+
1
−
1
View file @
b4831379
#!/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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment