Skip to content

Commit

Permalink
Merge pull request #115 from galuszkak/feature/arm64-mac
Browse files Browse the repository at this point in the history
feat: add arm64 Docker Images for Mac users
  • Loading branch information
dirkgroot authored Jan 16, 2023
2 parents 3bb2df2 + b650c78 commit 9421dee
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 18
java-version: 19
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
- name: Execute Gradle build
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
builder: ${{ steps.buildx.outputs.name }}
context: .
file: ./Dockerfile
platforms: linux/amd64
platforms: linux/amd64,linux/arm64/v8
tags: |
ghcr.io/avisi-cloud/${{ env.IMAGE_NAME }}:${{ env.VERSION }}
ghcr.io/avisi-cloud/${{ env.IMAGE_NAME }}:latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 18
java-version: 19
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
- name: Execute Gradle build
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
builder: ${{ steps.buildx.outputs.name }}
context: .
file: ./Dockerfile
platforms: linux/amd64
platforms: linux/amd64,linux/arm64/v8
tags: |
ghcr.io/avisi-cloud/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
ghcr.io/avisi-cloud/${{ env.IMAGE_NAME }}:latest
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM eclipse-temurin:19-jre-alpine
FROM eclipse-temurin:19-jre-jammy

USER root
RUN apk add --no-cache graphviz
RUN apt update && apt install graphviz --yes && rm -rf /var/lib/apt/lists/*
RUN mkdir -p /var/model \
&& chown 65532:65532 /var/model
RUN adduser -h /home/generatr -u 65532 -D generatr
RUN useradd -d /home/generatr -u 65532 --create-home generatr

ENTRYPOINT ["/opt/structurizr-site-generatr/bin/structurizr-site-generatr"]

Expand Down

0 comments on commit 9421dee

Please sign in to comment.