Sync from khs1994-docker/lnmp@7833431 by PCIT

Author: khs1994

.github/workflows/ci.yaml

@@ -31,10 +31,7 @@ jobs:
           # macOS
           - os: macos-latest
             docker_channel: stable
-            docker_version: 19.03
-          - os: macos-latest
-            docker_channel: edge
-            docker_version: 19.03
+            docker_version: 20.10
     runs-on: ${{ matrix.os }}
     timeout-minutes: 7
     steps:
@@ -116,7 +113,7 @@ jobs:
           # fix macos docker auth
           sed -i "" 's/credsStore/_credsStore/g' ${DOCKER_CONFIG}/config.json || true
 
-          tag=${version:-19.03}-${channel:-stable}-${os}
+          tag=${version:-20.10}-${channel:-stable}-${os}
           docker buildx build \
             -t khs1994/alpine:${tag} \
             ${push} \

action.yml

@@ -6,7 +6,7 @@ author: 'khs1994'
 inputs:
   docker_version:
     description: Docker Version
-    default: 19.03
+    default: "20.10"
     required: false
   docker_nightly_version:
     # https://github.com/AkihiroSuda/moby-snapshot/releases
@@ -19,7 +19,6 @@ inputs:
     default: stable
     # test
     # nightly # this channel use https://github.com/AkihiroSuda/moby-snapshot
-    # edge # for macos
     required: false
   docker_buildx:
     # https://docs.docker.com/engine/reference/commandline/buildx/

lib/setup-docker.js

@@ -122,7 +122,7 @@ async function run() {
     await exec.exec('brew', [
       'cask',
       'install',
-      DOCKER_CHANNEL !== 'stable' ? 'docker-edge' : 'docker'
+      DOCKER_CHANNEL !== 'stable' ? 'docker' : 'docker'
     ]);
     core.endGroup();
 
@@ -327,7 +327,7 @@ echo "-- Docker is ready."
       'docker-ce',
       '|',
       'grep',
-      '19.03'
+      '20.10'
     ]);
     core.endGroup()
 

package.json

@@ -12,8 +12,8 @@
   },
   "devDependencies": {},
   "scripts": {
-    "test": "cross-env INPUT_DOCKER_VERSION='19.03' INPUT_DOCKER_CHANNEL=stable node lib/setup-docker",
-    "test:noversion": "cross-env INPUT_DOCKER_VERSION='19.09' INPUT_DOCKER_CHANNEL=stable node lib/setup-docker"
+    "test": "cross-env INPUT_DOCKER_VERSION='20.10' INPUT_DOCKER_CHANNEL=stable node lib/setup-docker",
+    "test:noversion": "cross-env INPUT_DOCKER_VERSION='20.10' INPUT_DOCKER_CHANNEL=stable node lib/setup-docker"
   },
   "author": "",
   "license": "ISC"