octoleo/plantuml-server
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml-server.git synced 2024-12-22 08:48:54 +00:00
Code Issues Releases Wiki Activity

Fix docker build problem on jetty

Browse Source
This commit is contained in:
David Ducatel 2017-12-13 10:31:39 +01:00
parent b9bb9c71c5
commit 7fb25caeca
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -9,15 +9,15 @@ after_success:
- docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
- if [ "$TRAVIS_BRANCH" == "master" ]; then - if [ "$TRAVIS_BRANCH" == "master" ]; then
docker build -t plantuml/plantuml-server:jetty -f Dockerfile.jetty . ; docker build --pull -t plantuml/plantuml-server:jetty -f Dockerfile.jetty . ;
docker build -t plantuml/plantuml-server:tomcat -f Dockerfile.tomcat . ; docker build --pull -t plantuml/plantuml-server:tomcat -f Dockerfile.tomcat . ;
docker tag plantuml/plantuml-server:jetty plantuml/plantuml-server:latest ; docker tag plantuml/plantuml-server:jetty plantuml/plantuml-server:latest ;
docker push plantuml/plantuml-server:tomcat; docker push plantuml/plantuml-server:tomcat;
docker push plantuml/plantuml-server:jetty; docker push plantuml/plantuml-server:jetty;
docker push plantuml/plantuml-server:latest; docker push plantuml/plantuml-server:latest;
docker build -t plantuml/plantuml-server:armv8a -f Dockerfile.armv8a . ; docker build --pull -t plantuml/plantuml-server:armv8a -f Dockerfile.armv8a . ;
docker push plantuml/plantuml-server:armv8a; docker push plantuml/plantuml-server:armv8a;
fi fi

10
Dockerfile.jetty
View File

@ -1,6 +1,8 @@
FROM maven:3-jdk-8 AS builder FROM maven:3-jdk-8 AS builder
RUN apt-get update && apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && rm -rf /var/lib/apt/lists/* RUN apt-get update && \
apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && \
apt-get clean
COPY pom.xml /app/ COPY pom.xml /app/
COPY src /app/src/ COPY src /app/src/
@ -14,9 +16,13 @@ RUN mvn package
FROM jetty FROM jetty
MAINTAINER D.Ducatel MAINTAINER D.Ducatel
USER root
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && \ apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && \
rm -rf /var/lib/apt/lists/* apt-get clean
USER jetty
COPY --from=builder /app/target/plantuml.war /var/lib/jetty/webapps/ROOT.war COPY --from=builder /app/target/plantuml.war /var/lib/jetty/webapps/ROOT.war

6
Dockerfile.tomcat
View File

@ -1,6 +1,8 @@
FROM maven:3-jdk-8 AS builder FROM maven:3-jdk-8 AS builder
RUN apt-get update && apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && rm -rf /var/lib/apt/lists/* RUN apt-get update && \
apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && \
apt-get clean
COPY pom.xml /app/ COPY pom.xml /app/
COPY src /app/src/ COPY src /app/src/
@ -16,7 +18,7 @@ MAINTAINER D.Ducatel
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && \ apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && \
rm -rf /var/lib/apt/lists/* apt-get clean
RUN rm -rf /usr/local/tomcat/webapps/ROOT RUN rm -rf /usr/local/tomcat/webapps/ROOT
COPY --from=builder /app/target/plantuml.war /usr/local/tomcat/webapps/ROOT.war COPY --from=builder /app/target/plantuml.war /usr/local/tomcat/webapps/ROOT.war