From 8ee15ee1017f1c5684f525d06fd67ba98b84423f Mon Sep 17 00:00:00 2001
From: Maciej Czajka <maccza5@st.amu.edu.pl>
Date: Sat, 2 Apr 2022 13:42:37 +0200
Subject: [PATCH] update jenkinsfile and dockerfile

---
 Dockerfile         | 18 ++++++++++--------
 Jenkinsfile_docker |  8 --------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0b88d83..a81af6d 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,20 +9,22 @@ RUN pip3 install pandas
 RUN pip3 install matplotlib
 RUN pip3 install sklearn
 RUN apt-get install unzip
-RUN mkdir root/.kaggle
-RUN touch root/.kaggle/kaggle.json
-RUN echo "{\"username\":\"maciejczajka\",\"key\":\"d8f044ad2b96d32372e22f9054c02bb1\"}" >> root/.kaggle/kaggle.json
-RUN chmod 666 root/.kaggle
-RUN chmod 666 root/.kaggle/kaggle.json
+#RUN mkdir root/.kaggle
+#RUN touch root/.kaggle/kaggle.json
+#RUN echo "{\"username\":\"maciejczajka\",\"key\":\"d8f044ad2b96d32372e22f9054c02bb1\"}" >> root/.kaggle/kaggle.json
+#RUN chmod 666 root/.kaggle
+#RUN chmod 666 root/.kaggle/kaggle.json
+
+ENV KAGGLE_USERNAME=maciejczajka
+ENV KAGGLE_KEY=d8f044ad2b96d32372e22f9054c02bb1
+ENV CUTOFF=1000
 
 WORKDIR /app
 
-ENV CUTOFF=1000
-
 COPY download.sh .
 COPY Zajecia_2/main.py .
 
-RUN ls -al /root/.kaggle/kaggle.json
+#RUN ls -al /root/.kaggle/kaggle.json
 RUN whoami
 #RUN ./download.sh
 #CMD ["python3", "./main.py"]
diff --git a/Jenkinsfile_docker b/Jenkinsfile_docker
index 2bf5b45..174bedc 100644
--- a/Jenkinsfile_docker
+++ b/Jenkinsfile_docker
@@ -34,15 +34,7 @@ pipeline {
 
 	stage('Script'){
 		steps {
-			script {
-                    withEnv(["KAGGLE_USERNAME=${params.KAGGLE_USERNAME}",
-                             "KAGGLE_KEY=${params.KAGGLE_KEY}" ]) {
-                        sh 'echo KAGGLE_USERNAME: $KAGGLE_USERNAME'
-                        sh 'kaggle datasets list'
-                   	 }
-                	}
 			sh './download.sh $CUTOFF'
-			archiveArtifacts artifacts: 'all_games.csv.dev, all_games.csv.test, all_games.csv.train', followSymlinks: false
 		}
 	}
 	}