From a6f62a55b6c7679b4d6828b079a92f1a25d38eef Mon Sep 17 00:00:00 2001
From: Jimisola Laursen <jimisola@jimisola.com>
Date: Tue, 6 Aug 2024 09:55:34 +0200
Subject: [PATCH] ci: Debugging

---
 .github/workflows/publish-containers.yml | 11 ++++++++++-
 Dockerfile                               |  8 ++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish-containers.yml b/.github/workflows/publish-containers.yml
index 0594349..e469926 100644
--- a/.github/workflows/publish-containers.yml
+++ b/.github/workflows/publish-containers.yml
@@ -116,7 +116,7 @@ jobs:
             type=ref,event=pr
             type=semver,pattern={{version}}
           annotations: |
-            org.opencontainers.image.description=Container image that contains unoserver and libreoffice including large set of fonts for file format conversions
+            org.opencontainers.image.description="Container image that contains unoserver and LibreOffice including large set of fonts for file format conversions"
             org.opencontainers.image.licenses=MIT
             org.opencontainers.image.source=https://github.com/unoconv/unoserver-docker
         env:
@@ -155,11 +155,20 @@ jobs:
       - name: Create manifest list and push
         working-directory: /tmp/digests
         run: |
+          set +ex
           docker buildx imagetools create \
             $(echo $DOCKER_METADATA_OUTPUT_JSON | jq -cr '.tags | map("-t " + .) | join(" ")') \
             $(echo $DOCKER_METADATA_OUTPUT_JSON | jq -r '.annotations | map("--annotation \"" + . + "\"") | join(" ")') \
             $(printf '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@sha256:%s ' *)
 
+      # - name: Create manifest list and push
+      #   working-directory: /tmp/digests
+      #   run: |
+      #     docker buildx imagetools create \
+      #       $(echo $DOCKER_METADATA_OUTPUT_JSON | jq -cr '.tags | map("-t " + .) | join(" ")') \
+      #       $(echo $DOCKER_METADATA_OUTPUT_JSON | jq -r '.annotations | map("--annotation \"" + . + "\"") | join(" ")') \
+      #       $(printf '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@sha256:%s ' *)
+
       - name: Inspect image
         run: |
           docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}
diff --git a/Dockerfile b/Dockerfile
index f3860f7..91cae7f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM eclipse-temurin:21.0.2_13-jdk-alpine
+FROM --platform=$BUILDPLATFORM eclipse-temurin:22.0.1_8-jdk-alpine
 
 ARG BUILD_CONTEXT="build-context"
 ARG UID=worker
@@ -45,9 +45,9 @@ RUN pip install --break-system-packages -U unoserver==${VERSION_UNOSERVER}
 # setup supervisor
 COPY --chown=${UID}:${GID} ${BUILD_CONTEXT} /
 RUN chmod +x entrypoint.sh && \
-#    mkdir -p /var/log/supervisor && \
-#    chown ${UID}:${GID} /var/log/supervisor && \
-#    mkdir -p /var/run && \
+    #    mkdir -p /var/log/supervisor && \
+    #    chown ${UID}:${GID} /var/log/supervisor && \
+    #    mkdir -p /var/run && \
     chown -R ${UID}:0 /run && \
     chmod -R g=u /run