upgrade community.docker

ansible-galaxy collection install community.docker
HillLiu · Feb 19, 2024 · 6111026 · 6111026
1 parent ace3722
commit 6111026
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,18 +3,28 @@ version: 2.1
 commands:
   install-docker-buildx:
     description: Install Docker Buildx
+    parameters:
+      docker-tag:
+        type: string
+      buildx-version:
+        type: string
+        default: v0.12.0
     steps:
+      - run:
+          name: Install package
+          command: sudo apt-get update && sudo apt-get install -qq -y --no-install-recommends binfmt-support qemu-user-static
+      - run:
+          name: Init VM
+          command: |
+            docker context create CIContext
+            docker run --rm --privileged tonistiigi/binfmt --install arm64 
       - run:
           name: Install Docker Buildx
           command: |
             mkdir -vp ~/.docker/cli-plugins/
-            curl --silent -L "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
+            curl --silent -L "https://github.com/docker/buildx/releases/download/<< parameters.buildx-version >>/buildx-<< parameters.buildx-version >>.linux-arm64" > ~/.docker/cli-plugins/docker-buildx
             chmod a+x ~/.docker/cli-plugins/docker-buildx
-            docker buildx version
-            sudo apt-get update && sudo apt-get install -y binfmt-support qemu-user-static
-            docker run --rm --privileged tonistiigi/binfmt --install arm64
-            docker context create buildcontext
-            docker buildx create buildcontext --use
+            docker buildx create --name joyful-<< parameters.docker-tag >>- --append CIContext --use
 
 executors:
   docker-publisher:
@@ -29,7 +39,6 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker:
-          version: 20.10.18
           docker_layer_caching: true
       - run:
           name: "Test with terratest"
@@ -46,11 +55,13 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker:
-          version: 20.10.18
           docker_layer_caching: true
       - run:
           name: Log time
           command: date
+      - run:
+          name: Get Rate Limit
+          command: ./compile.sh rate
       - run:
           name: Gen Docker file
           command: |
@@ -68,7 +79,8 @@ jobs:
               cat ${BUILD_FOLDER}/$file
               echo ""
             done
-      - install-docker-buildx
+      - install-docker-buildx:
+          docker-tag: << parameters.docker-tag >>
       - run:
           name: login
           command: ./compile.sh login
@@ -90,9 +102,17 @@ jobs:
                 LATEST_TAG="-t $IMAGE_NAME:latest"
             fi
             echo "Build ARGS: ${BUILD_ARG}"
+            docker pull $IMAGE_NAME:${BUILD_VERSION} || true
             docker buildx inspect --bootstrap
+            echo "# ------ Start to Login ------ #"
+            ./compile.sh login
+            ./compile.sh rate
+            echo "# ------ End to Login ------ #"
             docker buildx build ${BUILD_ARG} -f ${BUILD_FOLDER}/Dockerfile \
+              --cache-to=type=inline,mode=all \
+              --cache-from $IMAGE_NAME:${BUILD_VERSION} \
               --push \
+              --progress=plain \
               --platform linux/amd64,linux/arm64/v8 \
               -t $IMAGE_NAME:${BUILD_VERSION} ${LATEST_TAG} \
               ./${BUILD_FOLDER}

diff --git a/compile.sh b/compile.sh
@@ -74,6 +74,14 @@ updateDockerHubDesc() {
   echo $RESULT
 }
 
+getRateLimit() {
+  # https://docs.docker.com/docker-hub/download-rate-limit/
+  token=$(curl -s --user "${DOCKER_LOGIN}:${DOCKER_PASSWORD}" "https://auth.docker.io/token?service=registry.docker.io&scope=repository:ratelimitpreview/test:pull" | jq -r .token)
+  curl -s -I \
+    -H "Authorization: Bearer $token" \
+    "https://registry-1.docker.io/v2/ratelimitpreview/test/manifests/latest" | grep "ratelimit-"
+}
+
 push() {
   login
   PUSH_VERSION=${1:-$VERSION}
@@ -147,6 +155,9 @@ case "$1" in
   updateDockerHubDesc)
     updateDockerHubDesc
     ;;
+  rate)
+    getRateLimit
+    ;;
   p)
     push $2 $3
     ;;

diff --git a/docs/overview.md b/docs/overview.md
@@ -4,6 +4,9 @@
 
 ```
 docker run --rm -u $(id -u):$(id -g) -it -v $(pwd):/app hillliu/ansible ansible-playbook --version
+
+ansible-galaxy collection list
+ansible --version
 ```
 
 ## Explore more Doc from command

diff --git a/install-packages.sh b/install-packages.sh
@@ -41,6 +41,9 @@ pip3 install -U \
   molecule \
   'molecule[docker]' || exit 2
 
+# Install new ansible module
+ansible-galaxy collection install community.docker
+
 apk del -f .build-deps && rm -rf /var/cache/apk/* || exit 1
 
 exit 0