update cosign, fix Dockerfile

earthrise-media · Aug 16, 2024 · 2ad0c97 · 2ad0c97
1 parent a2f5d62
commit 2ad0c97
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -40,9 +40,9 @@ jobs:
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign
         if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@f3c664df7af409cb4873aa5068053ba9d61a57b6 #v2.6.0
+        uses: sigstore/cosign-installer@v3.6.0
         with:
-          cosign-release: 'v1.11.0'
+          cosign-release: 'v2.4.0'
 
 
       # Workaround: https://github.com/docker/build-push-action/issues/461

diff --git a/lamp/Dockerfile b/lamp/Dockerfile
@@ -6,8 +6,6 @@ RUN docker-php-ext-install mysqli && \
     docker-php-ext-enable mysqli && \
     docker-php-ext-install exif && \
     docker-php-ext-enable exif && \
-    docker-php-ext-install intl && \
-    docker-php-ext-enable intl && \
     apt-get update && \
     apt-get upgrade -y && \
     apt-get install -y libpng-dev libfreetype6-dev libjpeg62-turbo-dev libgd-dev libpng-dev git libwebp-dev && \
@@ -17,3 +15,6 @@ RUN docker-php-ext-install mysqli && \
         --with-jpeg=/usr/include/ --with-webp && \
     docker-php-ext-install gd
 
+RUN apt-get install libicu-dev -y && \
+    docker-php-ext-install intl && \
+    docker-php-ext-enable intl