octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-11-23 13:27:34 +00:00
Code Issues Releases Wiki Activity

1252: Use eclipse-temurin:17-jre-jammy and generate both amd64 and

Browse Source 
arm64 images
This commit is contained in:
Denis N. Antonioli 2023-01-12 17:47:30 -08:00
parent 97c7f1ed34
commit 5624575b08
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.github/workflows/ci.yml vendored
View File

@ -177,6 +177,10 @@ jobs:
steps: steps:
- name: Check out the repo - name: Check out the repo
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Docker meta - name: Docker meta
id: meta id: meta
uses: docker/metadata-action@v4 uses: docker/metadata-action@v4
@ -184,18 +188,18 @@ jobs:
# list of Docker images to use as base name for tags # list of Docker images to use as base name for tags
images: | images: |
${{ github.repository }} ${{ github.repository }}
ghcr.io/${{ github.repository }} ghcr.io/${{ github.repository }}
# generate Docker tags based on the following events/attributes # generate Docker tags based on the following events/attributes
tags: | tags: |
type=semver,pattern={{version}} type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}} type=semver,pattern={{major}}
type=sha type=sha
- name: Log into Docker Hub - name: Log into Docker Hub
uses: docker/login-action@v2 uses: docker/login-action@v2
with: with:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Log in to GitHub Docker Registry - name: Log in to GitHub Docker Registry
uses: docker/login-action@v2 uses: docker/login-action@v2
with: with:
@ -211,3 +215,4 @@ jobs:
PLANTUML_VERSION=${{ github.event.ref }} PLANTUML_VERSION=${{ github.event.ref }}
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
platforms: linux/amd64,linux/arm64

12
Dockerfile
View File

@ -10,13 +10,17 @@ RUN wget \
"https://github.com/plantuml/plantuml/releases/download/${PLANTUML_VERSION}/plantuml-${PLANTUML_VERSION#?}.jar" \ "https://github.com/plantuml/plantuml/releases/download/${PLANTUML_VERSION}/plantuml-${PLANTUML_VERSION#?}.jar" \
-O /opt/plantuml.jar -O /opt/plantuml.jar
FROM openjdk:17-alpine FROM eclipse-temurin:17-jre-jammy
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8
RUN apk add --no-cache \ RUN apt-get update \
graphviz \ && apt-get install --no-install-recommends -y \
ttf-dejavu graphviz \
fonts-dejavu \
&& apt-get autoremove \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
COPY --from=loader /opt/plantuml.jar /opt/plantuml.jar COPY --from=loader /opt/plantuml.jar /opt/plantuml.jar