add: fix docker image platforms

kochetkov-ma · Jul 1, 2024 · 4723ef2 · 4723ef2
1 parent 96475f3
commit 4723ef2
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -12,7 +12,7 @@ max_line_length = 200
 [*.java]
 max_line_length = 180
 
-[*.yml}]
+[*.yml]
 indent_size = 2
 
 [*.yaml]

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
             java-version: '21'
-            distribution: 'temurin'
+            distribution: 'corretto'
       - name: Use Node.js ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v4
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: '21'
-          distribution: 'temurin'
+          distribution: 'corretto'
       - name: Use Node.js ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v4
         with:
@@ -43,6 +43,7 @@ jobs:
           RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
           ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
         with:
+          platforms: linux/amd64,linux/arm64
           name: kochetkovma/allure-server
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

diff --git a/.helm/allure-server/values.yaml b/.helm/allure-server/values.yaml
@@ -4,7 +4,7 @@ image:
   repository: kochetkovma/allure-server
   pullPolicy: IfNotPresent
   ## Don't use 'latest' ;)
-  tag: 2.12.0
+  tag: 2.13.4
 
 ## Add 'key: value collection' and delete '{ }' if need
 ## Uncomment and remove '{ }' if need

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:21-slim
+FROM amazoncorretto:21-alpine
 COPY build/libs/*.jar /allure-server-docker.jar
 # Set port
 EXPOSE ${PORT:-8080}

diff --git a/docker-compose-h2.yml b/docker-compose-h2.yml
@@ -3,11 +3,11 @@ services:
   allure-server:
     # For local debug #
     # build: .
-    image: kochetkovma/allure-server:2.12.0
+    image: kochetkovma/allure-server:2.13.5
     ports:
       - 8080:8080
     volumes:
       - ./tmp/allure:/allure/:rw
     environment:
       SPRING_PROFILES_ACTIVE: oauth
-      # BASIC_AUTH_ENABLE: true
+      # BASIC_AUTH_ENABLE: true
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ services:
   allure-server:
     # For local debug #
     # build: .
-    image: kochetkovma/allure-server:2.12.0
+    image: kochetkovma/allure-server:2.13.5
     environment:
       SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/allure
       SPRING_DATASOURCE_USERNAME: postgres
@@ -26,4 +26,4 @@ services:
       POSTGRES_USER: postgres
       POSTGRES_DB: allure
     ports:
-      - 5432:5432
+      - 5432:5432