From 089b5a660a389d838cf13563ef4d5ad9f2fb5be6 Mon Sep 17 00:00:00 2001
From: JustFiesta <mateusz.bocak9@gmail.com>
Date: Fri, 17 May 2024 10:44:53 +0200
Subject: [PATCH] Small path fixups and removal of redundand reads

---
 run_container_on_EC2.sh | 6 +++---
 send_image_to_aws.sh    | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/run_container_on_EC2.sh b/run_container_on_EC2.sh
index 2660f5578..31848a145 100644
--- a/run_container_on_EC2.sh
+++ b/run_container_on_EC2.sh
@@ -6,9 +6,9 @@
 source ./send_image_to_aws.sh
 
 IMAGE_NAME="$ECR_NAME:latest"
+FULL_KEY_PATH=""
 
-# Get data from user
-read -p "Enter the ECR image name: " IMAGE_NAME
+read -p "Enter your AWS Key absoluet path: " FULL_KEY_PATH
 
 # Get the public IP of EC2 instance from previus script
 echo "Getting public IP address of EC2 instance..."
@@ -33,7 +33,7 @@ fi
 
 # SSH to EC2 and run instance
 echo "SSH-ing to EC2 instance and running Docker image from ECR..."
-ssh -i /path/to/your/private-key.pem ec2-user@"$PUBLIC_IP" <<EOF
+ssh -i "$FULL_KEY_PATH" ec2-user@"$PUBLIC_IP" <<EOF
 docker pull "$IMAGE_NAME"
 docker run -d -p 80:8080 "$IMAGE_NAME"
 EOF
diff --git a/send_image_to_aws.sh b/send_image_to_aws.sh
index 3652a3b1b..1c01b01a3 100644
--- a/send_image_to_aws.sh
+++ b/send_image_to_aws.sh
@@ -8,15 +8,13 @@
 source ./prepare_aws_enviroment.sh
 
 AWS_ACCOUNT_ID=""
-DOCKERFILE_DIR=""
 
 # Get data from user
 read -p "Enter your AWS account ID: " AWS_ACCOUNT_ID
-read -p "Enter the path to Dockerfile directory: " DOCKERFILE_DIR
 
 # Build docker image locally
 echo "Building Docker image..."
-if docker build -t spring-petclinic "$DOCKERFILE_DIR"; then
+if docker build -t spring-petclinic .; then
     echo "Docker image built successfully."
 else
     echo "Error: Failed to build Docker image."