From faa58987944d11cec793d96d5c24c123bc6b2c29 Mon Sep 17 00:00:00 2001
From: s424714 <filpat@st.amu.edu.pl>
Date: Mon, 3 Apr 2023 15:35:18 +0200
Subject: [PATCH]  fix: dockerfile missing path

---
 Dockerfile  |  3 ++-
 Jenkinsfile | 32 ++++++++++++--------------------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8483205..8286282 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,7 @@ ENV RUN_TYPE=""
 
 # create working direcotyry
 WORKDIR /app
+ENV KAGGLE_CONFIG_DIR="./"
 
 # install python dependencies
 COPY requirements.txt ./
@@ -18,5 +19,5 @@ COPY dataset.py ./
 RUN mkdir -p ./data
 
 
-CMD kaggle datasets download -p data --unzip clmentbisaillon/fake-and-real-news-dataset && python ./dataset.py "--$RUN_TYPE"
 
+CMD kaggle datasets download -p data --unzip clmentbisaillon/fake-and-real-news-dataset && python ./dataset.py "--$RUN_TYPE"
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index 04d55c7..0ed5191 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,35 +30,27 @@ node {
 
     stage('Dockerfile build') {
 
-        // creating global envs for kaggle CLI
-        withEnv(["KAGGLE_USERNAME=${params.KAGGLE_USERNAME}",
-                "KAGGLE_KEY=${params.KAGGLE_KEY}" ]) {
-            // sh 'echo KAGGLE_USERNAME: $KAGGLE_USERNAME'
 
             sh "chmod +x -R ${env.WORKSPACE}"
 
-            def dockerImage = docker.build("dataset-create", "./dockerfiles/test")
-            // sh "./create-dataset.sh ${CUTOFF}"
-        }
-    }
-    stage("DOCKER testing"){
-        withEnv(["KAGGLE_USERNAME=${params.KAGGLE_USERNAME}",
-                "KAGGLE_KEY=${params.KAGGLE_KEY}" ]) {
-            // sh 'echo KAGGLE_USERNAME: $KAGGLE_USERNAME'
+            def dockerImage = docker.build("dataset-create")
 
-            dockerImage.inside{
-                sh "export $KAGGLE_KEY"
-                sh "kaggle datasets download -p data --unzip clmentbisaillon/fake-and-real-news-dataset && python ./dataset.py --dataset"
-                sh "cp /data/dataset/dataset.csv ${WORKSPACE}"
-            }
+            dockerImage.inside("""-w=${WORKSPACE}  """){
+                stage("Docker container running") {
+                    withEnv(["KAGGLE_USERNAME=${params.KAGGLE_USERNAME}",
+                            "KAGGLE_KEY=${params.KAGGLE_KEY}" ]) {
 
-            // sh "./create-dataset.sh ${CUTOFF}"
-        }
+                            sh "kaggle datasets download -p data --unzip clmentbisaillon/fake-and-real-news-dataset && python ./dataset.py --dataset"
+                            sh "cp ./data/dataset/* ${WORKSPACE}"
 
+                            }
+                }
+            }       
     }
 
     stage('Saving artefacts') {
         echo 'Goodbye!'
-        archiveArtifacts 'dataset.csv'
+        sh 'ls'
+        archiveArtifacts artifacts: '*.csv'
     }
 }
\ No newline at end of file