Merge pull request #75 from laradock/base-image-jammy

bestlong · web-flow · commit 4d643795f350 · 2025-06-03T12:35:45.000+08:00
Base image jammy
diff --git a/.github/workflows/dockerpublish_old_php.yml b/.github/workflows/dockerpublish_old_php.yml
@@ -52,6 +52,6 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           file: Dockerfile-${{ matrix.php_version }}
-          platforms: linux/amd64, linux/386, linux/arm64
+          platforms: linux/amd64, linux/arm/v7, linux/arm64
           push: ${{ (github.event_name != 'pull_request') && (github.repository == 'laradock/workspace') && (github.ref == 'refs/heads/master') }}
           tags: ${{ steps.meta.outputs.tags }}
diff --git a/Dockerfile-5.6 b/Dockerfile-5.6
@@ -4,7 +4,7 @@
 #--------------------------------------------------------------------------
 #
 
-FROM phusion/baseimage:focal-1.0.0
+FROM phusion/baseimage:jammy-1.0.4
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
diff --git a/Dockerfile-7.0 b/Dockerfile-7.0
@@ -4,7 +4,7 @@
 #--------------------------------------------------------------------------
 #
 
-FROM phusion/baseimage:focal-1.0.0
+FROM phusion/baseimage:jammy-1.0.4
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
diff --git a/Dockerfile-7.1 b/Dockerfile-7.1
@@ -4,7 +4,7 @@
 #--------------------------------------------------------------------------
 #
 
-FROM phusion/baseimage:focal-1.0.0
+FROM phusion/baseimage:jammy-1.0.4
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
diff --git a/Dockerfile-7.2 b/Dockerfile-7.2
@@ -4,7 +4,7 @@
 #--------------------------------------------------------------------------
 #
 
-FROM phusion/baseimage:focal-1.0.0
+FROM phusion/baseimage:jammy-1.0.4
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
diff --git a/Dockerfile-7.3 b/Dockerfile-7.3
@@ -4,7 +4,7 @@
 #--------------------------------------------------------------------------
 #
 
-FROM phusion/baseimage:focal-1.0.0
+FROM phusion/baseimage:jammy-1.0.4
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
diff --git a/Dockerfile-7.4 b/Dockerfile-7.4
@@ -4,7 +4,7 @@
 #--------------------------------------------------------------------------
 #
 
-FROM phusion/baseimage:focal-1.0.0
+FROM phusion/baseimage:jammy-1.0.4
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
diff --git a/Dockerfile-8.0 b/Dockerfile-8.0
@@ -4,7 +4,7 @@
 #--------------------------------------------------------------------------
 #
 
-FROM phusion/baseimage:focal-1.0.0
+FROM phusion/baseimage:jammy-1.0.4
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#--------------------------------------------------------------------------`
`5`	`5`	`#`
`6`	`6`
`7`		`-FROM phusion/baseimage:focal-1.0.0`
	`7`	`+FROM phusion/baseimage:jammy-1.0.4`
`8`	`8`
`9`	`9`	`LABEL maintainer="Mahmoud Zalt <[email protected]>"`
`10`	`10`