From 7415ce60fb03f61e9573c3f2aa6ac45128c33ee3 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sat, 13 Feb 2021 17:00:15 +0100
Subject: [PATCH] Fix dockerfile
---
Dockerfile.trunk | 5 +----
Dockerfile.v0.13 | 4 +---
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/Dockerfile.trunk b/Dockerfile.trunk
index 5152325..4183dd7 100644
--- a/Dockerfile.trunk
+++ b/Dockerfile.trunk
@@ -25,10 +25,7 @@ ARG QUASSEL_VERSION="0.13.1"
# setup repo
RUN mkdir /quassel && \
git clone -b master --single-branch https://github.com/quassel/quassel /quassel/src && \
- cd /quassel/src && \
- if [ ! -z "$QUASSEL_VERSION" ]; then \
- git checkout $QUASSEL_VERSION; \
- fi
+ cd /quassel/src
# generate build files
RUN mkdir /quassel/build && \
diff --git a/Dockerfile.v0.13 b/Dockerfile.v0.13
index 94f1c4a..0cd6252 100644
--- a/Dockerfile.v0.13
+++ b/Dockerfile.v0.13
@@ -27,9 +27,7 @@ ARG QUASSEL_VERSION="0.13.1"
RUN mkdir /quassel && \
git clone -b 0.13 --single-branch https://github.com/quassel/quassel /quassel/src && \
cd /quassel/src && \
- if [ ! -z "$QUASSEL_VERSION" ]; then \
- git checkout $QUASSEL_VERSION; \
- fi
+ git checkout $QUASSEL_VERSION
# generate build files
RUN mkdir /quassel/build && \
--
GitLab