Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Plantuml Server
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
runcon
Plantuml Server
Commits
7fb25cae
Commit
7fb25cae
authored
7 years ago
by
David Ducatel
Browse files
Options
Downloads
Patches
Plain Diff
Fix docker build problem on jetty
parent
b9bb9c71
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.travis.yml
+3
-3
3 additions, 3 deletions
.travis.yml
Dockerfile.jetty
+8
-2
8 additions, 2 deletions
Dockerfile.jetty
Dockerfile.tomcat
+4
-2
4 additions, 2 deletions
Dockerfile.tomcat
with
15 additions
and
7 deletions
.travis.yml
+
3
−
3
View file @
7fb25cae
...
@@ -9,15 +9,15 @@ after_success:
...
@@ -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
This diff is collapsed.
Click to expand it.
Dockerfile.jetty
+
8
−
2
View file @
7fb25cae
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
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Dockerfile.tomcat
+
4
−
2
View file @
7fb25cae
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
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment