Merge pull request #49 from laradock/develop

bestlong · web-flow · commit 1ae231c153fd · 2021-05-19T10:11:31.000+08:00
upgrade base image
diff --git a/.github/workflows/dockerpublish.yml b/.github/workflows/dockerpublish.yml
@@ -2,8 +2,7 @@ name: Docker Image CI
 
 on:
   push:
-    branches:
-      - 'master'
+    branches: '**'
     tags: '**'
   pull_request:
     branches:
@@ -53,6 +52,6 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           file: Dockerfile-${{ matrix.php_version }}
-          platforms: linux/amd64,linux/arm64,linux/386,linux/arm/v7,linux/arm/v6
+          platforms: linux/amd64,linux/arm64,linux/386
           push: ${{ (github.repository == 'laradock/workspace') }}
           tags: ${{ steps.meta.outputs.tags }}
diff --git a/Dockerfile-5.6 b/Dockerfile-5.6
@@ -4,7 +4,7 @@
 #--------------------------------------------------------------------------
 #
 
-FROM phusion/baseimage:0.11
+FROM phusion/baseimage:focal-1.0.0
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
diff --git a/Dockerfile-7.0 b/Dockerfile-7.0
@@ -4,7 +4,7 @@
 #--------------------------------------------------------------------------
 #
 
-FROM phusion/baseimage:0.11
+FROM phusion/baseimage:focal-1.0.0
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
diff --git a/Dockerfile-7.1 b/Dockerfile-7.1
@@ -4,7 +4,7 @@
 #--------------------------------------------------------------------------
 #
 
-FROM phusion/baseimage:0.11
+FROM phusion/baseimage:focal-1.0.0
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
diff --git a/Dockerfile-7.2 b/Dockerfile-7.2
@@ -4,7 +4,7 @@
 #--------------------------------------------------------------------------
 #
 
-FROM phusion/baseimage:0.11
+FROM phusion/baseimage:focal-1.0.0
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
diff --git a/Dockerfile-7.3 b/Dockerfile-7.3
@@ -4,7 +4,7 @@
 #--------------------------------------------------------------------------
 #
 
-FROM phusion/baseimage:0.11
+FROM phusion/baseimage:focal-1.0.0
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
diff --git a/Dockerfile-7.4 b/Dockerfile-7.4
@@ -4,7 +4,7 @@
 #--------------------------------------------------------------------------
 #
 
-FROM phusion/baseimage:0.11
+FROM phusion/baseimage:focal-1.0.0
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
diff --git a/Dockerfile-8.0 b/Dockerfile-8.0
@@ -4,7 +4,7 @@
 #--------------------------------------------------------------------------
 #
 
-FROM phusion/baseimage:0.11
+FROM phusion/baseimage:focal-1.0.0
 
 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
 
diff --git a/Makefile b/Makefile
@@ -0,0 +1,20 @@
+
+build: all
+
+all:
+    docker build -f ./Dockerfile-5.6 .
+    docker build -f ./Dockerfile-7.0 .
+    docker build -f ./Dockerfile-7.1 .
+    docker build -f ./Dockerfile-7.2 .
+    docker build -f ./Dockerfile-7.3 .
+    docker build -f ./Dockerfile-7.4 .
+    docker build -f ./Dockerfile-8.0 .
+
+all-nc:
+    docker build -f ./Dockerfile-5.6 --no-cache --pull .
+    docker build -f ./Dockerfile-7.0 --no-cache --pull .
+    docker build -f ./Dockerfile-7.1 --no-cache --pull .
+    docker build -f ./Dockerfile-7.2 --no-cache --pull .
+    docker build -f ./Dockerfile-7.3 --no-cache --pull .
+    docker build -f ./Dockerfile-7.4 --no-cache --pull .
+    docker build -f ./Dockerfile-8.0 --no-cache --pull .

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#--------------------------------------------------------------------------`
`5`	`5`	`#`
`6`	`6`
`7`		`-FROM phusion/baseimage:0.11`
	`7`	`+FROM phusion/baseimage:focal-1.0.0`
`8`	`8`
`9`	`9`	`LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"`
`10`	`10`