Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions Docker-files/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM openjdk:11 AS BUILD_IMAGE
RUN apt update && apt install maven -y
RUN git clone https://github.com/devopshydclub/vprofile-project.git
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
Expand All @@ -10,4 +10,23 @@ RUN rm -rf /usr/local/tomcat/webapps/*
COPY --from=BUILD_IMAGE vprofile-project/target/vprofile-v2.war /usr/local/tomcat/webapps/ROOT.war

EXPOSE 8080
CMD ["catalina.sh", "run"]
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"]
4 changes: 2 additions & 2 deletions Docker-files/db/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Docker-files/web/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -28,7 +28,7 @@ services:
vproapp:
build:
context: ./Docker-files/app
image: vprocontainers/vprofileapp
image: zevenfox/vprofileapp
container_name: vproapp
ports:
- "8080:8080"
Expand All @@ -38,7 +38,7 @@ services:
vproweb:
build:
context: ./Docker-files/web
image: vprocontainers/vprofileweb
image: zevenfox/vprofileweb
container_name: vproweb
ports:
- "80:80"
Expand Down