From f0bafa7b17970e60c623e62eecdc6b8646708870 Mon Sep 17 00:00:00 2001 From: clfreville2 Date: Wed, 5 Jun 2024 19:29:40 +0200 Subject: [PATCH 1/8] Add Ruff linter in CI --- .drone.yml | 13 +++++++++++++ requirements.txt | 5 +++++ 2 files changed, 18 insertions(+) create mode 100644 .drone.yml create mode 100644 requirements.txt diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..09b59cd --- /dev/null +++ b/.drone.yml @@ -0,0 +1,13 @@ +kind: pipeline +name: default +type: docker + +on: + push: + +steps: + - name: lint + image: python:3.12 + commands: + - pip install --root-user-action=ignore -r requirements.txt + - ruff check . diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..63b5398 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,5 @@ +matplotlib>=3.5.0 +pandas>=1.5.0 +seaborn>=0.12.0 +streamlit>=1.35.0 +ruff>=0.4.8 -- 2.36.3 From 7ceae78dfca3e451a5cd861a35893dc9ad0b7161 Mon Sep 17 00:00:00 2001 From: bastien ollier Date: Fri, 21 Jun 2024 16:07:48 +0200 Subject: [PATCH 2/8] add dockerfile --- frontend/__pycache__/clusters.cpython-39.pyc | Bin 0 -> 2206 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 frontend/__pycache__/clusters.cpython-39.pyc diff --git a/frontend/__pycache__/clusters.cpython-39.pyc b/frontend/__pycache__/clusters.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..3100a5c338bccfe4e96b7f036a3382b8a55c9c08 GIT binary patch literal 2206 zcmb7FO>f&a7$zx+Qk;(l#kOSV))j4mO&btnABP@>AzcdWFw6rQ^kQrf6jRBZNU}r9 zLu1INcE|pM9h_r+$1eK~yzZ30Fksl8m$Ku;YX^)1Uy&5~lJCR!d6cfNw;0Osm(k(x zA!C0~=X&wb*+n&vU=&k4X9e%_LUaYEzR10<{|!@~@?SFLzYyI3y+BFyBzjVbeHMq8 zSj}Q#<&&@X_a1kw{Pw#nElsCKoH!z?T09w(B z#UiR$YI3s}u&akS(okor->Y2AdKD9}W(_YZ)q&}yr9+`H8#L_cQAyJb!NvF{-{9lh zOEF-|jpGxjRNe7^Mx$a=cldKY;YVyDYW{@%_`}4jJ;hIizJK}_LZE;|?VX5s*~G8> z+JC_(K^;^GuJ)Bs-YbE&oVT~xG(2Z_*hJQ18X-4=S}Oln@0@c6f0V~T=kjk9P0+^N z`swq&i9H+6u4){W2ls}9ep!uHFhgaf=~us9WbulozLlf0e>%z>N)9jU?XWq(+42pn9A#DF zylmoB<~a3hRJaKMLp>$FsZ;&K2VI6j@+`lL^b^V_v%j>|J50Aaiw zBcYX#*I1m#UK zLL%ZpSV%17Of2{fv4DDd`fd2u_h77Sq5`X3BD_N%NCz7Lwx~sM=sPeo>T9B=exJ-; zG9Qq+N9Hp!jy($s5w~dEY{NK0i^!3=wIFja-d;jxL1s; Date: Fri, 21 Jun 2024 16:08:46 +0200 Subject: [PATCH 3/8] add dockerfile --- .drone.yml | 25 +++++++++++++++++++++++++ Dockerfile | 20 ++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 Dockerfile diff --git a/.drone.yml b/.drone.yml index 09b59cd..3fea3b0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,3 +11,28 @@ steps: commands: - pip install --root-user-action=ignore -r requirements.txt - ruff check . + + - name: docker-image + image: plugins/docker + settings: + context: frontend/ + dockerfile: Dockerfile + registry: hub.codefirst.iut.uca.fr + repo: hub.codefirst.iut.uca.fr/bastien.ollier/miner + username: + from_secret: REGISTRY_USER + password: + from_secret: REGISTRY_PASSWORD + cache_from: + - hub.codefirst.iut.uca.fr/bastien.ollier/miner:latest + depends_on: [ lint ] + + - name: deploy-miner + image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest + environment: + IMAGENAME: hub.codefirst.iut.uca.fr/bastien.ollier/miner:latest + CONTAINERNAME: miner + COMMAND: create + OVERWRITE: true + ADMINS: baollier1 + depends_on: [ docker-image ] diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..337af25 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,20 @@ +FROM python:3.9-slim + +WORKDIR /app + +RUN apt-get update && apt-get install -y \ + build-essential \ + curl \ + software-properties-common \ + git \ + && rm -rf /var/lib/apt/lists/* + +RUN ls + +RUN pip3 install -r requirements.txt + +EXPOSE 8501 + +HEALTHCHECK CMD curl --fail http://localhost:8501/_stcore/health + +ENTRYPOINT ["streamlit", "run", "streamlit_app.py", "--server.port=8501", "--server.address=0.0.0.0"] \ No newline at end of file -- 2.36.3 From d0399e045204fb368349e64a52b237f28f4045fc Mon Sep 17 00:00:00 2001 From: bastien ollier Date: Fri, 21 Jun 2024 16:11:36 +0200 Subject: [PATCH 4/8] add dockerfile --- Dockerfile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 337af25..7a16a15 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,12 +9,8 @@ RUN apt-get update && apt-get install -y \ git \ && rm -rf /var/lib/apt/lists/* -RUN ls - +COPY . . RUN pip3 install -r requirements.txt -EXPOSE 8501 - -HEALTHCHECK CMD curl --fail http://localhost:8501/_stcore/health - -ENTRYPOINT ["streamlit", "run", "streamlit_app.py", "--server.port=8501", "--server.address=0.0.0.0"] \ No newline at end of file +EXPOSE 80 +ENTRYPOINT ["streamlit", "run", "streamlit_app.py", "--server.port=80", "--server.address=0.0.0.0"] \ No newline at end of file -- 2.36.3 From d8f7b63922c45b8af885eb7f0eef78d893f0c715 Mon Sep 17 00:00:00 2001 From: bastien ollier Date: Fri, 21 Jun 2024 16:14:15 +0200 Subject: [PATCH 5/8] add dockerfile --- .drone.yml | 1 - Dockerfile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3fea3b0..9ed1d7c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,7 +15,6 @@ steps: - name: docker-image image: plugins/docker settings: - context: frontend/ dockerfile: Dockerfile registry: hub.codefirst.iut.uca.fr repo: hub.codefirst.iut.uca.fr/bastien.ollier/miner diff --git a/Dockerfile b/Dockerfile index 7a16a15..bee20cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,4 +13,4 @@ COPY . . RUN pip3 install -r requirements.txt EXPOSE 80 -ENTRYPOINT ["streamlit", "run", "streamlit_app.py", "--server.port=80", "--server.address=0.0.0.0"] \ No newline at end of file +ENTRYPOINT ["streamlit", "run", "frontend/main.py", "--server.port=80", "--server.address=0.0.0.0"] \ No newline at end of file -- 2.36.3 From f1eb757bcaf4d53954c5526ee4e9201eb8e5406c Mon Sep 17 00:00:00 2001 From: bastien ollier Date: Fri, 21 Jun 2024 16:23:19 +0200 Subject: [PATCH 6/8] add dockerfile --- .drone.yml | 3 ++- Dockerfile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9ed1d7c..dc45553 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,5 +33,6 @@ steps: CONTAINERNAME: miner COMMAND: create OVERWRITE: true - ADMINS: baollier1 + ADMINS: bastienollier,clementfreville2,hugopradier2 + DRONE_REPO_OWNER: bastien.ollier depends_on: [ docker-image ] diff --git a/Dockerfile b/Dockerfile index bee20cf..279f3fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,4 +13,4 @@ COPY . . RUN pip3 install -r requirements.txt EXPOSE 80 -ENTRYPOINT ["streamlit", "run", "frontend/main.py", "--server.port=80", "--server.address=0.0.0.0"] \ No newline at end of file +ENTRYPOINT ["streamlit", "run", "frontend/main.py", "--server.port=80", "--server.address=0.0.0.0", "--server.baseUrlPath=/containers/bastienollier-miner"] \ No newline at end of file -- 2.36.3 From af1d5b0beee6847d710a22180118d2f753b1ad32 Mon Sep 17 00:00:00 2001 From: clfreville2 Date: Fri, 21 Jun 2024 16:34:14 +0200 Subject: [PATCH 7/8] Update to Python 3.12 --- .drone.yml | 22 ++++++++++++++-------- Dockerfile | 11 ++--------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/.drone.yml b/.drone.yml index dc45553..4610933 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,8 +2,9 @@ kind: pipeline name: default type: docker -on: - push: +trigger: + event: + - push steps: - name: lint @@ -27,12 +28,17 @@ steps: depends_on: [ lint ] - name: deploy-miner - image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest + image: hub.codefirst.iut.uca.fr/clement.freville2/codefirst-dockerproxy-clientdrone:latest + settings: + image: hub.codefirst.iut.uca.fr/bastien.ollier/miner:latest + container: miner + command: create + overwrite: true + admins: bastienollier,clementfreville2,hugopradier2 environment: - IMAGENAME: hub.codefirst.iut.uca.fr/bastien.ollier/miner:latest - CONTAINERNAME: miner - COMMAND: create - OVERWRITE: true - ADMINS: bastienollier,clementfreville2,hugopradier2 DRONE_REPO_OWNER: bastien.ollier depends_on: [ docker-image ] + when: + branch: + - main + - ci/* diff --git a/Dockerfile b/Dockerfile index 279f3fe..dd96397 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,9 @@ -FROM python:3.9-slim +FROM python:3.12-slim WORKDIR /app -RUN apt-get update && apt-get install -y \ - build-essential \ - curl \ - software-properties-common \ - git \ - && rm -rf /var/lib/apt/lists/* - COPY . . RUN pip3 install -r requirements.txt EXPOSE 80 -ENTRYPOINT ["streamlit", "run", "frontend/main.py", "--server.port=80", "--server.address=0.0.0.0", "--server.baseUrlPath=/containers/bastienollier-miner"] \ No newline at end of file +ENTRYPOINT ["streamlit", "run", "frontend/exploration.py", "--server.port=80", "--server.address=0.0.0.0", "--server.baseUrlPath=/containers/bastienollier-miner"] -- 2.36.3 From 4293eafa86d392986d9f0ddf78f9e55795c68b42 Mon Sep 17 00:00:00 2001 From: clfreville2 Date: Fri, 21 Jun 2024 16:50:03 +0200 Subject: [PATCH 8/8] Remove cache file --- frontend/__pycache__/clusters.cpython-39.pyc | Bin 2206 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 frontend/__pycache__/clusters.cpython-39.pyc diff --git a/frontend/__pycache__/clusters.cpython-39.pyc b/frontend/__pycache__/clusters.cpython-39.pyc deleted file mode 100644 index 3100a5c338bccfe4e96b7f036a3382b8a55c9c08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2206 zcmb7FO>f&a7$zx+Qk;(l#kOSV))j4mO&btnABP@>AzcdWFw6rQ^kQrf6jRBZNU}r9 zLu1INcE|pM9h_r+$1eK~yzZ30Fksl8m$Ku;YX^)1Uy&5~lJCR!d6cfNw;0Osm(k(x zA!C0~=X&wb*+n&vU=&k4X9e%_LUaYEzR10<{|!@~@?SFLzYyI3y+BFyBzjVbeHMq8 zSj}Q#<&&@X_a1kw{Pw#nElsCKoH!z?T09w(B z#UiR$YI3s}u&akS(okor->Y2AdKD9}W(_YZ)q&}yr9+`H8#L_cQAyJb!NvF{-{9lh zOEF-|jpGxjRNe7^Mx$a=cldKY;YVyDYW{@%_`}4jJ;hIizJK}_LZE;|?VX5s*~G8> z+JC_(K^;^GuJ)Bs-YbE&oVT~xG(2Z_*hJQ18X-4=S}Oln@0@c6f0V~T=kjk9P0+^N z`swq&i9H+6u4){W2ls}9ep!uHFhgaf=~us9WbulozLlf0e>%z>N)9jU?XWq(+42pn9A#DF zylmoB<~a3hRJaKMLp>$FsZ;&K2VI6j@+`lL^b^V_v%j>|J50Aaiw zBcYX#*I1m#UK zLL%ZpSV%17Of2{fv4DDd`fd2u_h77Sq5`X3BD_N%NCz7Lwx~sM=sPeo>T9B=exJ-; zG9Qq+N9Hp!jy($s5w~dEY{NK0i^!3=wIFja-d;jxL1s;