From ba21e52876be0e9c09c9aea5cb3d94e4f767f5ad Mon Sep 17 00:00:00 2001 From: gor2d Date: Sun, 3 Oct 2021 11:35:05 +0400 Subject: [PATCH 1/2] fix --- docker-compose.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5aaa96c..3b6373f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "2" +version: "3" services: tomcat1: build: tomcat9 @@ -6,15 +6,9 @@ services: .env container_name: builder 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 + sorce: share + target: /boxfuse-sample-java-war-hello/ tomcat2: build: prod @@ -24,10 +18,13 @@ services: env_file: .env volumes: - - ./:/opt/ + - type: volume + source: share + target: /usr/local/tomcat/webapps/ depends_on: - "tomcat1" - #command: ["bash", "cp /tmp/hello-1.0.war /usr/local/tomcat/webapps/"] + volumes: + share: From 7437388639d91f8049a91c97d80441b3016db168 Mon Sep 17 00:00:00 2001 From: gor2d Date: Sun, 3 Oct 2021 12:29:23 +0400 Subject: [PATCH 2/2] fixit --- README.md | 1 + docker-compose.yml | 34 ++++++++++-------------- install/Dockerfile | 6 +++++ .env => not-work/.env | 0 not-work/2 | 30 +++++++++++++++++++++ not-work/docker-compose.yml | 29 ++++++++++++++++++++ not-work/prod/Dockerfile | 5 ++++ {tomcat9 => not-work/tomcat9}/Dockerfile | 2 +- {tomcat9 => not-work/tomcat9}/script.sh | 0 prod/Dockerfile | 14 +++++++--- 10 files changed, 96 insertions(+), 25 deletions(-) create mode 100644 README.md create mode 100644 install/Dockerfile rename .env => not-work/.env (100%) create mode 100644 not-work/2 create mode 100644 not-work/docker-compose.yml create mode 100644 not-work/prod/Dockerfile rename {tomcat9 => not-work/tomcat9}/Dockerfile (82%) rename {tomcat9 => not-work/tomcat9}/script.sh (100%) diff --git a/README.md b/README.md new file mode 100644 index 0000000..43a0c2c --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# devops diff --git a/docker-compose.yml b/docker-compose.yml index 3b6373f..253a6c0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,30 +1,24 @@ version: "3" services: - tomcat1: - build: tomcat9 - env_file: - .env - container_name: builder + install: + build: install + container_name: install volumes: - type: volume - sorce: share - target: /boxfuse-sample-java-war-hello/ - - tomcat2: + source: war + target: /boxfuse-sample-java-war-hello/target/ + + run: build: prod - ports: - - "5555:8080" container_name: prod - env_file: - .env volumes: - type: volume - source: share + source: war target: /usr/local/tomcat/webapps/ + ports: + - 5555:8080 depends_on: - - "tomcat1" - volumes: - share: - - - + - install + +volumes: + war: \ No newline at end of file diff --git a/install/Dockerfile b/install/Dockerfile new file mode 100644 index 0000000..b996ccb --- /dev/null +++ b/install/Dockerfile @@ -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 \ No newline at end of file diff --git a/.env b/not-work/.env similarity index 100% rename from .env rename to not-work/.env diff --git a/not-work/2 b/not-work/2 new file mode 100644 index 0000000..87e795f --- /dev/null +++ b/not-work/2 @@ -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: + + + diff --git a/not-work/docker-compose.yml b/not-work/docker-compose.yml new file mode 100644 index 0000000..9022a71 --- /dev/null +++ b/not-work/docker-compose.yml @@ -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: + + + diff --git a/not-work/prod/Dockerfile b/not-work/prod/Dockerfile new file mode 100644 index 0000000..9ae5116 --- /dev/null +++ b/not-work/prod/Dockerfile @@ -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 diff --git a/tomcat9/Dockerfile b/not-work/tomcat9/Dockerfile similarity index 82% rename from tomcat9/Dockerfile rename to not-work/tomcat9/Dockerfile index 4368ece..4eaf36d 100644 --- a/tomcat9/Dockerfile +++ b/not-work/tomcat9/Dockerfile @@ -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 \ No newline at end of file diff --git a/tomcat9/script.sh b/not-work/tomcat9/script.sh similarity index 100% rename from tomcat9/script.sh rename to not-work/tomcat9/script.sh diff --git a/prod/Dockerfile b/prod/Dockerfile index ceda290..ae64297 100644 --- a/prod/Dockerfile +++ b/prod/Dockerfile @@ -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"] \ No newline at end of file