From e3f3421dc8778a4c530927fb36b5cf66465a631d Mon Sep 17 00:00:00 2001 From: kollawat rupanya Date: Tue, 30 Jan 2024 02:05:11 +0700 Subject: [PATCH 1/5] build Docker Image --- Docker-files/app/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Docker-files/app/Dockerfile b/Docker-files/app/Dockerfile index b95501b63..b6ef52b98 100755 --- a/Docker-files/app/Dockerfile +++ b/Docker-files/app/Dockerfile @@ -1,13 +1,15 @@ FROM openjdk:11 AS BUILD_IMAGE RUN apt update && apt install maven -y -RUN git clone https://github.com/devopshydclub/vprofile-project.git -RUN cd vprofile-project && git checkout docker && mvn install +FROM tomcat:9-jre11 + +RUN git clone https://github.com/zevenfox/devops-vprofile-project.git +RUN cd devops-vprofile-project && git checkout docker mvn install FROM tomcat:9-jre11 LABEL "Project"="Vprofile" -LABEL "Author"="Imran" +LABEL "Author"="zevenfox" RUN rm -rf /usr/local/tomcat/webapps/* -COPY --from=BUILD_IMAGE vprofile-project/target/vprofile-v2.war /usr/local/tomcat/webapps/ROOT.war +COPY --from=BUILD_IMAGE devops-vprofile-project/target/vprofile-v2.war /usr/local/tomcat/webapps/ROOT.war EXPOSE 8080 CMD ["catalina.sh", "run"] \ No newline at end of file From d2e09b2a1b6c500e70bbce5c55ebe61fa6cd8e9a Mon Sep 17 00:00:00 2001 From: kollawat rupanya Date: Tue, 30 Jan 2024 10:46:37 +0700 Subject: [PATCH 2/5] build Docker Image --- Docker-files/app/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Docker-files/app/Dockerfile b/Docker-files/app/Dockerfile index b6ef52b98..9dda5be6a 100755 --- a/Docker-files/app/Dockerfile +++ b/Docker-files/app/Dockerfile @@ -12,4 +12,5 @@ RUN rm -rf /usr/local/tomcat/webapps/* COPY --from=BUILD_IMAGE devops-vprofile-project/target/vprofile-v2.war /usr/local/tomcat/webapps/ROOT.war EXPOSE 8080 -CMD ["catalina.sh", "run"] \ No newline at end of file +CMD ["catalina.sh", "run"] + From 8ebaa8c8aaa34f2ff683bc9d8ea1eac2750d6d43 Mon Sep 17 00:00:00 2001 From: kollawat rupanya Date: Tue, 30 Jan 2024 10:48:33 +0700 Subject: [PATCH 3/5] build Docker Image --- Docker-files/app/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Docker-files/app/Dockerfile b/Docker-files/app/Dockerfile index 9dda5be6a..b6ef52b98 100755 --- a/Docker-files/app/Dockerfile +++ b/Docker-files/app/Dockerfile @@ -12,5 +12,4 @@ RUN rm -rf /usr/local/tomcat/webapps/* COPY --from=BUILD_IMAGE devops-vprofile-project/target/vprofile-v2.war /usr/local/tomcat/webapps/ROOT.war EXPOSE 8080 -CMD ["catalina.sh", "run"] - +CMD ["catalina.sh", "run"] \ No newline at end of file From d6e563a8f4032e4d738ac3489a6fc23992df2e13 Mon Sep 17 00:00:00 2001 From: kollawat rupanya Date: Tue, 30 Jan 2024 11:22:04 +0700 Subject: [PATCH 4/5] fix docker compose --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3326ed7b5..30547f487 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,14 +3,14 @@ services: vprodb: build: context: ./Docker-files/db - image: vprocontainers/vprofiledb + image: zevenfox/vprofiledb container_name: vprodb ports: - "3306:3306" volumes: - vprodbdata:/var/lib/mysql environment: - - MYSQL_ROOT_PASSWORD=vprodbpass + - MYSQL_ROOT_PASSWORD=root vprocache01: image: memcached @@ -28,7 +28,7 @@ services: vproapp: build: context: ./Docker-files/app - image: vprocontainers/vprofileapp + image: zevenfox/vprofileapp container_name: vproapp ports: - "8080:8080" @@ -38,7 +38,7 @@ services: vproweb: build: context: ./Docker-files/web - image: vprocontainers/vprofileweb + image: zevenfox/vprofileweb container_name: vproweb ports: - "80:80" From c1f594be0d3dc73db1981cd90794985e53a643b3 Mon Sep 17 00:00:00 2001 From: kollawat rupanya Date: Tue, 30 Jan 2024 19:00:31 +0700 Subject: [PATCH 5/5] Fix docker compose --- Docker-files/app/Dockerfile | 31 ++++++++++++++++++++++++------- Docker-files/db/Dockerfile | 4 ++-- Docker-files/web/Dockerfile | 2 +- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/Docker-files/app/Dockerfile b/Docker-files/app/Dockerfile index b6ef52b98..0cb48aa97 100755 --- a/Docker-files/app/Dockerfile +++ b/Docker-files/app/Dockerfile @@ -1,15 +1,32 @@ FROM openjdk:11 AS BUILD_IMAGE RUN apt update && apt install maven -y -FROM tomcat:9-jre11 - -RUN git clone https://github.com/zevenfox/devops-vprofile-project.git -RUN cd devops-vprofile-project && git checkout docker mvn install +RUN git clone https://github.com/zevenfox/devops-vprofile-project.git vprofile-project +RUN cd vprofile-project && git checkout docker && mvn install FROM tomcat:9-jre11 LABEL "Project"="Vprofile" -LABEL "Author"="zevenfox" +LABEL "Author"="Imran" RUN rm -rf /usr/local/tomcat/webapps/* -COPY --from=BUILD_IMAGE devops-vprofile-project/target/vprofile-v2.war /usr/local/tomcat/webapps/ROOT.war +COPY --from=BUILD_IMAGE vprofile-project/target/vprofile-v2.war /usr/local/tomcat/webapps/ROOT.war EXPOSE 8080 -CMD ["catalina.sh", "run"] \ No newline at end of file +CMD ["catalina.sh", "run"] +# # Stage 1: Build image with Maven +# FROM openjdk:11 AS BUILD_IMAGE +# RUN apt update && apt install maven -y +# WORKDIR /app +# RUN git clone https://github.com/zevenfox/devops-vprofile-project.git +# WORKDIR /app/devops-vprofile-project +# RUN git checkout docker && mvn install + +# # Stage 2: Copy the WAR file to Tomcat +# FROM tomcat:9-jre11 +# LABEL "Project"="Vprofile" +# LABEL "Author"="zevenfox" +# COPY --from=BUILD_IMAGE /app/devops-vprofile-project/target/vprofile-v2.war /usr/local/tomcat/webapps/ROOT.war + +# # Clear default Tomcat webapps +# RUN rm -rf /usr/local/tomcat/webapps/* + +# EXPOSE 8080 +# CMD ["catalina.sh", "run"] diff --git a/Docker-files/db/Dockerfile b/Docker-files/db/Dockerfile index 26dde86a3..2fc9edab1 100755 --- a/Docker-files/db/Dockerfile +++ b/Docker-files/db/Dockerfile @@ -1,8 +1,8 @@ FROM mysql:8.0.33 LABEL "Project"="Vprofile" -LABEL "Author"="Imran" +LABEL "Author"="zevenfox" -ENV MYSQL_ROOT_PASSWORD="vprodbpass" +ENV MYSQL_ROOT_PASSWORD="root" ENV MYSQL_DATABASE="accounts" ADD db_backup.sql docker-entrypoint-initdb.d/db_backup.sql diff --git a/Docker-files/web/Dockerfile b/Docker-files/web/Dockerfile index 99d468509..bf787cb0b 100755 --- a/Docker-files/web/Dockerfile +++ b/Docker-files/web/Dockerfile @@ -1,6 +1,6 @@ FROM nginx LABEL "Project"="Vprofile" -LABEL "Author"="Imran" +LABEL "Author"="zevenfox" RUN rm -rf /etc/nginx/conf.d/default.conf COPY nginvproapp.conf /etc/nginx/conf.d/vproapp.conf \ No newline at end of file