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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# devops
43 changes: 17 additions & 26 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,24 @@
version: "2"
version: "3"
services:
tomcat1:
build: tomcat9
env_file:
.env
container_name: builder
install:
build: install
container_name: install
volumes:
- ./:/opt/
# volumes:
# - D:\\учеба\\DevOps\\git\\test\\share/:/opt/
# command: ["/bin/sh", "-c", "cp /usr/local/tomcat/boxfuse-sample-java-war-hello/target /tmp"]
# /usr/local/tomcat/boxfuse-sample-java-war-hello/target
# command:
# sh "cp /usr/local/tomcat/usr/local/tomcat/boxfuse-sample-java-war-hello/hello-1.0.war /tmp"
- type: volume
source: war
target: /boxfuse-sample-java-war-hello/target/



tomcat2:
run:
build: prod
ports:
- "5555:8080"
container_name: prod
env_file:
.env
volumes:
- ./:/opt/
- type: volume
source: war
target: /usr/local/tomcat/webapps/
ports:
- 5555:8080
depends_on:
- "tomcat1"
#command: ["bash", "cp /tmp/hello-1.0.war /usr/local/tomcat/webapps/"]



- install

volumes:
war:
6 changes: 6 additions & 0 deletions install/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM ubuntu:18.04
RUN apt-get update
RUN apt-get install git maven mc -y
RUN git clone https://github.com/boxfuse/boxfuse-sample-java-war-hello
WORKDIR boxfuse-sample-java-war-hello/
RUN mvn package
File renamed without changes.
30 changes: 30 additions & 0 deletions not-work/2
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
version: "3"
services:
tomcat1:
build: tomcat9
#env_file:
# .env
container_name: builder
volumes:
- type: volume
sorce: war
target: /boxfuse-sample-java-war-hello/

tomcat2:
build: prod
ports:
- "5555:8080"
container_name: prod
#env_file:
# .env
volumes:
- type: volume
source: war
target: /usr/local/tomcat/webapps/
depends_on:
- "tomcat1"
volumes:
war:



29 changes: 29 additions & 0 deletions not-work/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
version: "3"
services:
tomcat1:
build: tomcat9
container_name: builder
volumes:
- type: volume
source: war
target: /boxfuse-sample-java-war-hello/


tomcat2:
build: prod
container_name: prod
volumes:
- type: volume
source: war
target: /usr/local/tomcat/webapps/boxfuse-sample-java-war-hello/
ports:
- "5555:8080"
depends_on:
- tomcat1


volumes:
war:



5 changes: 5 additions & 0 deletions not-work/prod/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM tomcat:latest
RUN apt-get update
#COPY D:\учеба\DevOps\git\test*.war /usr/local/tomcat/webapps/
CMD ["catalina.sh", "run"]
EXPOSE 8080
2 changes: 1 addition & 1 deletion tomcat9/Dockerfile → not-work/tomcat9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ RUN mvn -f /usr/local/tomcat/boxfuse-sample-java-war-hello/pom.xml package
#COPY script.sh /opt/
#RUN cd /opt
#RUN chmod +x /opt/script.sh
RUN cp -r /usr/local/tomcat/boxfuse-sample-java-war-hello/target/*.war /opt
#RUN cp -r /usr/local/tomcat/boxfuse-sample-java-war-hello/target/*.war /opt
#EXPOSE 8080
#mvn -f path/to/pom.xml
File renamed without changes.
14 changes: 10 additions & 4 deletions prod/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
FROM tomcat:latest
RUN apt-get update
COPY D:\учеба\DevOps\git\test*.war /usr/local/tomcat/webapps/
CMD ["catalina.sh", "run"]
FROM alpine:latest
RUN apk update
RUN apk add --no-cache openjdk8-jre-base curl && \
mkdir /usr/local/tomcat && \
curl -O https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.53/bin/apache-tomcat-9.0.53.tar.gz && \
tar xvzf apache-tomcat-9.0.53.tar.gz --strip-components 1 --directory /usr/local/tomcat && \
rm apache-tomcat-9.0.53.tar.gz && \
/usr/local/tomcat/bin/catalina.sh version && \
apk del curl
EXPOSE 8080
CMD ["/usr/local/tomcat/bin/catalina.sh", "run"]