From 147826ed920b4ca0319ecae516dee63325dc4a82 Mon Sep 17 00:00:00 2001
From: s407323 <klawer1@st.amu.edu.pl>
Date: Fri, 26 Apr 2019 13:31:59 +0200
Subject: [PATCH] use ENV DEBIAN_FRONTEND noninteractive

---
 Dockerfile  | 11 +++++++++--
 Jenkinsfile | 44 +++++++++++++++++++++++---------------------
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a77bd9b..99d330a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,10 +3,17 @@ FROM ubuntu:latest
 RUN apt update -y && apt install -y make
 RUN apt install -y git
 RUN apt install -y gcc
-RUN apt install -y python3
-RUN apt install -y python-pandas
 RUN gcc --version
 RUN apt install -y build-essential
+
+# install python
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update \
+  && apt-get install -y python3-pip python3-dev \
+  && cd /usr/local/bin \
+  && ln -s /usr/bin/python3 python \
+  && pip3 install --upgrade pip
+
 RUN git clone https://github.com/usnistgov/SCTK.git
 WORKDIR SCTK
 RUN make config && make all && make check &&  make install && make doc
diff --git a/Jenkinsfile b/Jenkinsfile
index 737792b..b25aed6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,30 +1,32 @@
 pipeline {
     agent { dockerfile true }
     stages {
-        stage('Zadanie 1 - Jenkins') {
-            steps {
-                echo 'Kopiowanie plików z wynikami rozpoznawania mowy z artefaktów projektu ASR-eval'
-                script {
-                    copyArtifacts filter: '*',
-                    fingerprintArtifacts: true,
-                    projectName: 'ASR-eval',
-                    selector: lastSuccessful(),
-                    target: 'ASR-eval/'
+        parallel {
+            stage('Zadanie 1 - Jenkins') {
+                steps {
+                    echo 'Kopiowanie plików z wynikami rozpoznawania mowy z artefaktów projektu ASR-eval'
+                    script {
+                        copyArtifacts filter: '*',
+                        fingerprintArtifacts: true,
+                        projectName: 'ASR-eval',
+                        selector: lastSuccessful(),
+                        target: 'ASR-eval/'
+                    }
+                    echo 'Sklonowanie repozytorium git'
+                    checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[url: 'https://git.wmi.amu.edu.pl/s407323/s407323-mlworkshops']]])
+                    echo 'Wywołanie skryptu shella'
+                    sh 'chmod 755 ./zadanie1/script.sh'
+                    sh './zadanie1/script.sh'
+                    echo 'Zarchiwizowanie wyniku'
+                    archiveArtifacts 'zadanie1/output.txt'
                 }
-                echo 'Sklonowanie repozytorium git'
-                checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[url: 'https://git.wmi.amu.edu.pl/s407323/s407323-mlworkshops']]])
-                echo 'Wywołanie skryptu shella'
-                sh 'chmod 755 ./zadanie1/script.sh'
-                sh './zadanie1/script.sh'
-                echo 'Zarchiwizowanie wyniku'
-                archiveArtifacts 'zadanie1/output.txt'
             }
-        }
 
-        stage('Zadanie 2 - Docker') {
-            steps {
-                sh 'gcc --version'
-                sh 'git --version'
+            stage('Zadanie 2 - Docker') {
+                steps {
+                    sh 'gcc --version'
+                    sh 'git --version'
+                }
             }
         }