From 04688cf4732cd5905c1529f3593ead0470d093ec Mon Sep 17 00:00:00 2001
From: Amit Kumar Nandi <11887616+aamitn@users.noreply.github.com>
Date: Sat, 2 Mar 2024 21:32:33 +0530
Subject: [PATCH] modified  the nmpl/shortener:latest dockerfile ti not rely on
 git during build

---
 Dockerfile                        | 8 +++++---
 k8s/docker-k8s/docker-compose.yml | 4 ----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 30870d6..7548364 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,10 +14,12 @@ ARG TAG=$VERSION
 FROM maven:3.9.6-eclipse-temurin-21 AS builder
 
 #Cloud Install :  Clone the repository
-RUN git clone https://github.com/aamitn/URLShortener.git
+#RUN git clone https://github.com/aamitn/URLShortener.git
+
+RUN mkdir -p URLShortener
 
 #Local Install
-#ADD . /UrlShortener
+ADD . /URLShortener
 
 # Change working directory to the repo directory
 WORKDIR /URLShortener
@@ -26,7 +28,7 @@ WORKDIR /URLShortener
 # Example real world db access url : mysql://127.0.0.1:3306
 # Example Docker  db access url : mysql://database:3306 (container name is datbase)
 # Change the database ip in app config to the database docker container name/service
-RUN sed -i "s|database.ip=127.0.0.1|database.ip=database |g" src/main/resources/application.properties
+RUN sed -i "s|database.ip=127.0.0.1|database.ip=database|g" src/main/resources/application.properties
 
 # Build the application
 RUN mvn clean install
diff --git a/k8s/docker-k8s/docker-compose.yml b/k8s/docker-k8s/docker-compose.yml
index 5f6deb3..7c3f61d 100644
--- a/k8s/docker-k8s/docker-compose.yml
+++ b/k8s/docker-k8s/docker-compose.yml
@@ -4,7 +4,6 @@ services:
   shortener-app:
     labels:
       - "TUSC"
-
     #Build from docker hub image .Comment/Uncomment Below
     image: nmpl/shortener:k8s
 
@@ -15,12 +14,9 @@ services:
     ports:
       - "8080:8080"
       - "3306:3306"
-
     volumes:
       - data:/var/lib/mysql
-
     restart: unless-stopped
 
-
 volumes:
   data: