diff --git a/drone/deliver.sh b/drone/deliver.sh index ca07f1c..1044486 100755 --- a/drone/deliver.sh +++ b/drone/deliver.sh @@ -4,6 +4,6 @@ chmod 700 ./drone/prepare-deliver.sh source ./drone/prepare-deliver.sh -echo "making delivery onto '$USER@$IP:$DIR'" -scp -o "StrictHostKeyChecking no" "build/libs/server-all.jar" "drone/deploy.sh" "drone/start.sh" "$USER@$IP:$DIR" -echo "chmod 700 $DIR/*; cd $DIR; ./deploy.sh" | ssh -o "StrictHostKeyChecking no" "$USER@$IP" +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" +echo "chmod 700 $DIR/backend/*; cd $DIR/backend; ./deploy.sh" | ssh -o "StrictHostKeyChecking no" "$USER@$IP" diff --git a/drone/images/Dockerfile b/drone/image/Dockerfile similarity index 100% rename from drone/images/Dockerfile rename to drone/image/Dockerfile diff --git a/drone/prepare-deliver.sh b/drone/prepare-deliver.sh index 0ebb88d..477c23d 100755 --- a/drone/prepare-deliver.sh +++ b/drone/prepare-deliver.sh @@ -10,12 +10,12 @@ case "$DRONE_BRANCH" in "dev") USER=tbasket-dev IP=92.132.18.192 - DIR=/server/TBasket/backend + DIR=/server/TBasket ;; "production") USER=mabatista1 IP=lisbonne.iut-clermont.uca.fr - DIR=tbasket/backend + DIR=tbasket ;; "") echo '$DRONE_BRANCH is missing' >&2