From 030c2f116239219be384e10e665b07150d934c4e Mon Sep 17 00:00:00 2001
From: Reiner Jung <reiner.jung@email.uni-kiel.de>
Date: Fri, 19 Aug 2022 21:49:13 +0200
Subject: [PATCH] Updated configuration and dockerfile.
---
docker/Dockerfile | 2 +-
frameworks/Kieker/python/config.rc | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f8335de..4f5dbde 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -3,5 +3,5 @@ FROM openjdk:13-jdk-alpine
RUN echo "jenkins:x:2030:100:guest:/home/jenkins:/sbin/nologin" >> /etc/passwd && \
mkdir /home/jenkins && chmod 777 /home/jenkins && \
apk update && \
- apk add git openssh zip R bash curl python3
+ apk add git openssh zip R bash curl python3 py3-pip
diff --git a/frameworks/Kieker/python/config.rc b/frameworks/Kieker/python/config.rc
index aa290a4..79326a4 100644
--- a/frameworks/Kieker/python/config.rc
+++ b/frameworks/Kieker/python/config.rc
@@ -3,6 +3,10 @@
PYTHON=`which python3`
PIP=`which pip`
+if [ ! -f "$PIP" ] ; then
+ PIP=`which pip3`
+fi
+
GIT=`which git`
RSCRIPT_PATH="${BASE_DIR}/../../statistics.r"
--
GitLab