From 5a9627d6aee78de1bb969918db739149d411509d Mon Sep 17 00:00:00 2001 From: s464962 Date: Sat, 30 Mar 2024 16:17:42 +0100 Subject: [PATCH 1/6] Added Dockerfile --- Dockerfile | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..20d4759 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,12 @@ +FROM ubuntu:latest + +RUN apt-get update && apt-get install -y python3-pip unzip coreutils + +RUN pip install --user kaggle pandas + +WORKDIR /app + +COPY kaggle.json /root/.kaggle/kaggle.json +COPY ./create-dataset.sh ./ + +#CMD [ "./create-dataset.sh", "10000" ] \ No newline at end of file From 4c82e6e301efe484618e4e38291a2e93ac9a381b Mon Sep 17 00:00:00 2001 From: s464962 Date: Sat, 30 Mar 2024 16:19:03 +0100 Subject: [PATCH 2/6] added path to create-dataset.sh --- create-dataset.sh | 60 ++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/create-dataset.sh b/create-dataset.sh index 41102c3..c3f9279 100644 --- a/create-dataset.sh +++ b/create-dataset.sh @@ -1,29 +1,31 @@ -#!/bin/bash - -pip install kaggle - -kaggle datasets download -d syedanwarafridi/vehicle-sales-data - -unzip -o vehicle-sales-data.zip - -# Tasowanie -shuf car_prices.csv -o car_prices_shuf.csv - -# Podział danych na podzbiory -total_rows=$(wc -l < car_prices_shuf.csv) -test_dev_rows=$(( $1 * 2 )) - -head -n $1 car_prices_shuf.csv > car_prices_test.csv -head -n $test_dev_rows car_prices_shuf.csv | tail -n +$(( $1 + 1 )) > car_prices_dev.csv -tail -n +$(( $test_dev_rows + 1 )) car_prices_shuf.csv > car_prices_train.csv - -test_size=$(wc -l < car_prices_test.csv) -dev_size=$(wc -l < car_prices_dev.csv) -train_size=$(wc -l < car_prices_train.csv) -echo "Rozmiar zbioru testowego: $test_size" -echo "Rozmiar zbioru deweloperskiego: $dev_size" -echo "Rozmiar zbioru treningowego: $train_size" - -# Zapis artefaktów -mkdir -p data -mv car_prices.csv car_prices_shuf.csv car_prices_test.csv car_prices_dev.csv car_prices_train.csv data/ +#!/bin/bash + +export PATH=$PATH:/root/.local/bin + +pip install kaggle + +kaggle datasets download -d syedanwarafridi/vehicle-sales-data + +unzip -o vehicle-sales-data.zip + +# Tasowanie +shuf car_prices.csv -o car_prices_shuf.csv + +# Podział danych na podzbiory +total_rows=$(wc -l < car_prices_shuf.csv) +test_dev_rows=$(( $1 * 2 )) + +head -n $1 car_prices_shuf.csv > car_prices_test.csv +head -n $test_dev_rows car_prices_shuf.csv | tail -n +$(( $1 + 1 )) > car_prices_dev.csv +tail -n +$(( $test_dev_rows + 1 )) car_prices_shuf.csv > car_prices_train.csv + +test_size=$(wc -l < car_prices_test.csv) +dev_size=$(wc -l < car_prices_dev.csv) +train_size=$(wc -l < car_prices_train.csv) +echo "Rozmiar zbioru testowego: $test_size" +echo "Rozmiar zbioru deweloperskiego: $dev_size" +echo "Rozmiar zbioru treningowego: $train_size" + +# Zapis artefaktów +mkdir -p data +mv car_prices.csv car_prices_shuf.csv car_prices_test.csv car_prices_dev.csv car_prices_train.csv data/ From 3bff07492410e9015e9ea13d893a567eb23eee37 Mon Sep 17 00:00:00 2001 From: s464962 Date: Sat, 30 Mar 2024 17:47:27 +0100 Subject: [PATCH 3/6] Update Jenkinsfile --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3c35ee5..2be7fad 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,7 @@ pipeline { - agent any + agent { + dockerfile true + } parameters { string( From 65537bb67a5d0af571e9c2b5c84f00532c0fba71 Mon Sep 17 00:00:00 2001 From: s464962 Date: Sat, 30 Mar 2024 17:50:13 +0100 Subject: [PATCH 4/6] Update Dockerfile --- Dockerfile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 20d4759..53595f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ -FROM ubuntu:latest - -RUN apt-get update && apt-get install -y python3-pip unzip coreutils - -RUN pip install --user kaggle pandas - -WORKDIR /app - -COPY kaggle.json /root/.kaggle/kaggle.json -COPY ./create-dataset.sh ./ - +FROM ubuntu:latest + +RUN apt-get update && apt-get install -y python3-pip unzip coreutils + +RUN pip install --user kaggle pandas + +WORKDIR /app + +#COPY kaggle.json /root/.kaggle/kaggle.json +COPY ./create-dataset.sh ./ + #CMD [ "./create-dataset.sh", "10000" ] \ No newline at end of file From 5fd30b4d1c4d61e9c85c39eeb797bfbeb24688a1 Mon Sep 17 00:00:00 2001 From: s464962 Date: Sat, 30 Mar 2024 18:18:01 +0100 Subject: [PATCH 5/6] Update Jenkinsfile-stats --- Jenkinsfile-stats | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile-stats b/Jenkinsfile-stats index 701e7a1..7b47289 100644 --- a/Jenkinsfile-stats +++ b/Jenkinsfile-stats @@ -1,5 +1,7 @@ pipeline { - agent any + agent { + docker { image 'raczynski/ium:latest' } + } parameters { buildSelector( From 1a9af6aa7ea5122256e3b7d2c685877216c82da9 Mon Sep 17 00:00:00 2001 From: s464962 Date: Sat, 30 Mar 2024 18:19:46 +0100 Subject: [PATCH 6/6] Update Jenkinsfile-stats --- Jenkinsfile-stats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-stats b/Jenkinsfile-stats index 7b47289..33a264e 100644 --- a/Jenkinsfile-stats +++ b/Jenkinsfile-stats @@ -1,6 +1,6 @@ pipeline { agent { - docker { image 'raczynski/ium:latest' } + docker { image 'raczynski/ium:1.0' } } parameters {