From 87accaf7a291a4b10b27680241399d8d11b0da30 Mon Sep 17 00:00:00 2001
From: Override-6 <maximebatista18@gmail.com>
Date: Sun, 29 Jan 2023 16:31:15 +0100
Subject: [PATCH] fixing scripts

---
 drone/.drone.yml                       | 2 +-
 drone/image-deploy.sh                  | 4 ++--
 drone/image/tbasket-backend.dockerfile | 1 -
 drone/image/tbasket-test.dockerfile    | 1 -
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/drone/.drone.yml b/drone/.drone.yml
index dae5902..2c4f295 100644
--- a/drone/.drone.yml
+++ b/drone/.drone.yml
@@ -33,7 +33,7 @@ steps:
 ---
 kind: pipeline
 type: docker
-name: "Deploy docker images"
+name: "Deploy committed docker images"
 
 steps:
   - name: Build and push
diff --git a/drone/image-deploy.sh b/drone/image-deploy.sh
index bf72b45..276225a 100644
--- a/drone/image-deploy.sh
+++ b/drone/image-deploy.sh
@@ -9,9 +9,9 @@ push_image() ({
   local IMAGE_NAME=$(basename "$1" | rev | cut -d . -f2- | rev)
   cd "$(dirname "$1")"
 
-  docker login -h $"$REPOSITORY" -u="${DOCKER_USERNAME}" -p="${DOCKER_PASSWORD}"
+  docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}" $"$REPOSITORY"
   echo "Building $IMAGE_NAME..."
-  docker build "$1"
+  docker build "$(basename "$1")"
   docker tag "$IMAGE_NAME" "$REPOSITORY/$IMAGE_NAME:latest"
   echo "Pushing $IMAGE_NAME..."
   docker push "$REPOSITORY/$IMAGE_NAME"
diff --git a/drone/image/tbasket-backend.dockerfile b/drone/image/tbasket-backend.dockerfile
index ff64626..c0f467f 100644
--- a/drone/image/tbasket-backend.dockerfile
+++ b/drone/image/tbasket-backend.dockerfile
@@ -7,4 +7,3 @@ RUN apt update &&\
     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/image/tbasket-test.dockerfile b/drone/image/tbasket-test.dockerfile
index d9676dc..4c4d34a 100644
--- a/drone/image/tbasket-test.dockerfile
+++ b/drone/image/tbasket-test.dockerfile
@@ -7,4 +7,3 @@ RUN apt update &&\
     mkdir /opt/gradle &&\
     unzip -d /opt/gradle gradle-7.5.1-bin.zip &&\
     export GRADLE_HOME=/opt/gradle/gradle-7.5.1 \
-