From 1ad66afba454704eb9ebc8e21a7cf2e34d5cc708 Mon Sep 17 00:00:00 2001 From: Pascal LAFOURCADE Date: Thu, 8 Dec 2022 18:41:09 +0100 Subject: [PATCH 1/6] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'drone/prepare-?= =?UTF-8?q?deliver.sh'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- drone/prepare-deliver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drone/prepare-deliver.sh b/drone/prepare-deliver.sh index f5edc98..f24f12d 100755 --- a/drone/prepare-deliver.sh +++ b/drone/prepare-deliver.sh @@ -32,7 +32,7 @@ case "$DRONE_BRANCH" in "production") USER=palafour IP=193.49.118.205 - DIR=public_html/TBasket/ + DIR=public_html/TBasket ;; "") echo "DRONE_BRANCH is missing" >&2 From 60b4120f7e4b123406b4703d262d04c6e1e338de Mon Sep 17 00:00:00 2001 From: Pascal LAFOURCADE Date: Thu, 8 Dec 2022 18:44:27 +0100 Subject: [PATCH 2/6] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'drone/prepare-?= =?UTF-8?q?deliver.sh'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- drone/prepare-deliver.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/drone/prepare-deliver.sh b/drone/prepare-deliver.sh index f24f12d..4cc9bab 100755 --- a/drone/prepare-deliver.sh +++ b/drone/prepare-deliver.sh @@ -19,7 +19,6 @@ echo "done." mkdir /root/.ssh echo "$SSH_PRIVATE_KEY" > /root/.ssh/id_rsa -echo "$SSH_PUBLIC_KEY" > /root/.ssh/id_rsa.pub chmod 0600 /root/.ssh/* chmod 700 /root/.ssh From 3d98a006cee32511c34a856a99ceb335065fbf5f Mon Sep 17 00:00:00 2001 From: Override-6 Date: Sun, 11 Dec 2022 20:10:09 +0100 Subject: [PATCH 3/6] optimisations drone --- drone/.drone.yml | 5 ++--- drone/images/Dockerfile | 10 ++++++++++ drone/prepare-deliver.sh | 19 +------------------ 3 files changed, 13 insertions(+), 21 deletions(-) create mode 100644 drone/images/Dockerfile diff --git a/drone/.drone.yml b/drone/.drone.yml index 3a5a6bc..554fb86 100644 --- a/drone/.drone.yml +++ b/drone/.drone.yml @@ -5,16 +5,15 @@ name: Deployment steps: - name: Unit tests - image: amazoncorretto:11 + image: override6/tbasket-backend:latest volumes: - name: build path: ./build commands: - - echo - ./gradlew :test - name: Deploy - image: amazoncorretto:11 + image: override6/tbasket-backend:latest depends_on: - 'Unit tests' environment: diff --git a/drone/images/Dockerfile b/drone/images/Dockerfile new file mode 100644 index 0000000..1a3332f --- /dev/null +++ b/drone/images/Dockerfile @@ -0,0 +1,10 @@ +# syntax=override6/tbasket-end:latest +FROM ubuntu:latest + +RUN apt update &&\ + apt install openjdk-11-jdk openssh-client wget unzip -y &&\ + wget https://services.gradle.org/distributions/gradle-7.5.1-bin.zip &&\ + mkdir /opt/gradle &&\ + unzip -d /opt/gradle gradle-7.5.1-bin.zip &&\ + export GRADLE_HOME=/opt/gradle/gradle-7.5.1 + diff --git a/drone/prepare-deliver.sh b/drone/prepare-deliver.sh index 4cc9bab..07ac43d 100755 --- a/drone/prepare-deliver.sh +++ b/drone/prepare-deliver.sh @@ -1,22 +1,5 @@ #!/usr/bin/env bash -echo "installing packages..." -#use the right command to install packages -if [ "$(command -v apt)" ]; then - apt update > /dev/null - apt -y install openssh-client openssh-clients > /dev/null -elif [ "$(command -v yum)" ]; then - yum update > /dev/null - yum -y install openssh-client openssh-clients > /dev/null -elif [ "$(command -v apk)" ]; then - apk update > /dev/null - apk add openssh > /dev/null -else - echo "could not find a package manager, aborting" >&2 - exit 1 -fi -echo "done." - mkdir /root/.ssh echo "$SSH_PRIVATE_KEY" > /root/.ssh/id_rsa chmod 0600 /root/.ssh/* @@ -26,7 +9,7 @@ case "$DRONE_BRANCH" in "dev") USER=maxime IP=92.132.18.192 - DIR=server/TBasket/ + DIR=server/TBasket ;; "production") USER=palafour From 6da35c77a7620bd7acf3b63819e03e87cd006121 Mon Sep 17 00:00:00 2001 From: Override-6 Date: Tue, 13 Dec 2022 16:20:49 +0100 Subject: [PATCH 4/6] modification scripts deploiment --- drone/prepare-deliver.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drone/prepare-deliver.sh b/drone/prepare-deliver.sh index 07ac43d..7cf4dd5 100755 --- a/drone/prepare-deliver.sh +++ b/drone/prepare-deliver.sh @@ -12,12 +12,12 @@ case "$DRONE_BRANCH" in DIR=server/TBasket ;; "production") - USER=palafour - IP=193.49.118.205 - DIR=public_html/TBasket + USER=mabatista1 + IP=193.49.118.52 + DIR=tbasket/backend ;; "") - echo "DRONE_BRANCH is missing" >&2 + echo '$DRONE_BRANCH is missing' >&2 exit 1 ;; *) From e7dee2ba1b6917f2c4cb0d5a52178b8193ce6b8e Mon Sep 17 00:00:00 2001 From: Override-6 Date: Tue, 13 Dec 2022 16:21:06 +0100 Subject: [PATCH 5/6] modification scripts deploiment --- drone/prepare-deliver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drone/prepare-deliver.sh b/drone/prepare-deliver.sh index 7cf4dd5..b74b5a6 100755 --- a/drone/prepare-deliver.sh +++ b/drone/prepare-deliver.sh @@ -13,7 +13,7 @@ case "$DRONE_BRANCH" in ;; "production") USER=mabatista1 - IP=193.49.118.52 + IP=lisbonne.iut-clermont.uca.fr DIR=tbasket/backend ;; "") From 5a7c3ce935725d6e4914d61acc818956fb27a4f7 Mon Sep 17 00:00:00 2001 From: Override-6 Date: Tue, 13 Dec 2022 16:23:49 +0100 Subject: [PATCH 6/6] jar build is now made after tests to economize execution time --- drone/.drone.yml | 1 + drone/deliver.sh | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drone/.drone.yml b/drone/.drone.yml index 554fb86..bb1fea4 100644 --- a/drone/.drone.yml +++ b/drone/.drone.yml @@ -11,6 +11,7 @@ steps: path: ./build commands: - ./gradlew :test + - ./gradlew :shadowJar - name: Deploy image: override6/tbasket-backend:latest diff --git a/drone/deliver.sh b/drone/deliver.sh index 2b8f212..73516c4 100755 --- a/drone/deliver.sh +++ b/drone/deliver.sh @@ -3,7 +3,6 @@ chmod 700 ./drone/prepare-deliver.sh source ./drone/prepare-deliver.sh -./gradlew :shadowJar echo "making delivery onto '$USER@$IP:$DIR/backend'" scp -o "StrictHostKeyChecking no" "build/libs/server-all.jar" "drone/deploy.sh" "drone/start.sh" "$USER@$IP:$DIR/backend"