build(deps): version bumps

.gitlab-ci.yml

@@ -3,15 +3,15 @@ variables:
   IMAGE_TAG_COMPOSE: $CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-compose
   DOCKER_HUB_REPOSITORY: k911/docker-client
   DOCKER_TLS_CERTDIR: /certs
-  DOCKER_RUNNER_VERSION: 20.10.5
-  DOCKER_VERSION: 20.10.5
+  DOCKER_RUNNER_VERSION: 20.10.17
+  DOCKER_VERSION: 20.10.17
   DOCKER_COMPOSE_VERSION: 1.29.0
   TRIVY_VERSION: 0.16.0
   DOCKER_BUILDX_VERSION: 0.5.1
   DOCKER_AWS_ECR_CREDENTIAL_HELPER_VERSION: 0.5.0
   DOCKER_PASS_CREDENTIAL_HELPER_VERSION: 0.6.3
   PYTHON_VERSION: "3.9"
-  ALPINE_VERSION: "3.13"
+  ALPINE_VERSION: "3.16"
 
 # do not run duplicate "detached" pipelines
 # https://docs.gitlab.com/ee/ci/yaml/README.html#workflowrules-templates

Dockerfile

@@ -1,21 +1,21 @@
 # https://github.com/moby/moby/releases
-ARG DOCKER_VERSION="20.10.5"
+ARG DOCKER_VERSION="20.10.17"
 
 # https://github.com/docker/compose/releases
-ARG DOCKER_COMPOSE_VERSION="1.29.0"
+ARG DOCKER_COMPOSE_VERSION="1.29.2"
 
 FROM docker:${DOCKER_VERSION} as client
 
-RUN apk add --update jq bash curl git openssh-client pass && \
+RUN apk add --update jq bash curl git openssh-client pass dirmngr gpg-agent && \
     apk upgrade && \
     rm -rf /var/cache/apk/*
 
 # https://github.com/docker/buildx/releases
-ARG DOCKER_BUILDX_VERSION="0.5.1"
+ARG DOCKER_BUILDX_VERSION="0.8.2"
 # https://github.com/awslabs/amazon-ecr-credential-helper/releases
-ARG DOCKER_AWS_ECR_CREDENTIAL_HELPER_VERSION="0.5.0"
+ARG DOCKER_AWS_ECR_CREDENTIAL_HELPER_VERSION="0.6.0"
 # https://github.com/docker/docker-credential-helpers/releases
-ARG DOCKER_PASS_CREDENTIAL_HELPER_VERSION="0.6.3"
+ARG DOCKER_PASS_CREDENTIAL_HELPER_VERSION="0.6.4"
 
 # install docker buildx
 RUN wget "https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-amd64" && \

README.md

@@ -13,18 +13,18 @@ docker-compose build --pull
 ### Docker only
 
 ```sh
-DOCKER_VERSION="20.10.5"
-DOCKER_BUILDX_VERSION="0.5.1"
+DOCKER_VERSION="20.10.17"
+DOCKER_BUILDX_VERSION="0.8.2"
 DOCKER_AWS_ECR_CREDENTIAL_HELPER_VERSION="0.5.0"
 docker build --pull --build-arg "DOCKER_VERSION=$DOCKER_VERSION" \
     --build-arg "DOCKER_BUILDX_VERSION=$DOCKER_BUILDX_VERSION" \
     --build-arg "DOCKER_AWS_ECR_CREDENTIAL_HELPER_VERSION=$DOCKER_AWS_ECR_CREDENTIAL_HELPER_VERSION" \
-    --tag "registry.gitlab.com/swoole-bundle/docker-client:$DOCKER_VERSION" .
+    --tag "docker.io/pixelfederation/docker-client:$DOCKER_VERSION" .
 
-docker run --rm -ti -v "/var/run/docker.sock:/var/run/docker.sock" "registry.gitlab.com/swoole-bundle/docker-client:$DOCKER_VERSION" info
+docker run --rm -ti -v "/var/run/docker.sock:/var/run/docker.sock" "docker.io/pixelfederation/docker-client:$DOCKER_VERSION" info
 ```
 
-docker push registry.gitlab.com/swoole-bundle/docker-client
+docker push docker.io/pixelfederation/docker-client
 
 ## GitLab Examples
 
@@ -33,7 +33,7 @@ docker push registry.gitlab.com/swoole-bundle/docker-client
 ```yaml
 build-docker-image:
   stage: build
-  image: registry.gitlab.com/swoole-bundle/docker-client:latest
+  image: docker.io/pixelfederation/docker-client:latest
   variables:
     DOCKER_TLS_CERTDIR: /certs
     DOCKER_BUILDX_CONTEXT_CREATE: "1"
@@ -56,15 +56,15 @@ build-docker-image:
 ```yaml
 build-docker-image:
   stage: build
-  image: registry.gitlab.com/swoole-bundle/docker-client:latest
+  image: docker.io/pixelfederation/docker-client:latest
   variables:
     DOCKER_TLS_CERTDIR: /certs
     AWS_ACCOUNT_ID: xxxxx
     AWS_DEFAULT_REGION: xxxxx
     AWS_ACCESS_KEY_ID: xxxxx
     AWS_SECRET_ACCESS_KEY: xxxxx
   services:
-    - docker:20.10.5-dind
+    - docker:20.10.17-dind
   before_script:
     - aws-ecr-login
   script:
@@ -77,11 +77,11 @@ build-docker-image:
 ```yaml
 build-docker-image:
   stage: build
-  image: registry.gitlab.com/swoole-bundle/docker-client:latest
+  image: docker.io/pixelfederation/docker-client:latest
   variables:
     DOCKER_TLS_CERTDIR: /certs
   services:
-    - docker:20.10.5-dind
+    - docker:20.10.17-dind
   before_script:
     - gitlab-docker-registry-login
   script:

docker-compose.yml

@@ -2,9 +2,9 @@ version: "3.9"
 
 x-aliases:
   - &DEFAULT_ARGS
-    DOCKER_VERSION: ${DOCKER_VERSION:-20.10.5}
+    DOCKER_VERSION: ${DOCKER_VERSION:-20.10.17}
     DOCKER_COMPOSE_VERSION: ${DOCKER_COMPOSE_VERSION:-1.29.0}
-    DOCKER_BUILDX_VERSION: ${DOCKER_BUILDX_VERSION:-0.5.1}
+    DOCKER_BUILDX_VERSION: ${DOCKER_BUILDX_VERSION:-0.8.2}
     DOCKER_AWS_ECR_CREDENTIAL_HELPER_VERSION: ${DOCKER_AWS_ECR_CREDENTIAL_HELPER_VERSION:-0.5.0}
     DOCKER_PASS_CREDENTIAL_HELPER_VERSION: ${DOCKER_PASS_CREDENTIAL_HELPER_VERSION:-0.6.3}
 
@@ -18,7 +18,7 @@ networks:
 
 services:
   local:
-    image: ${REGISTRY:-registry.gitlab.com}/${NAMESPACE:-swoole-bundle}/${PROJECT_NAME:-docker-client}-local:${IMAGE_TAG:-local}
+    image: ${REGISTRY:-docker.io}/${NAMESPACE:-pixelfederation}/${PROJECT_NAME:-docker-client}-local:${IMAGE_TAG:-local}
     build:
       context: .
       target: "${TARGET:-client}"
@@ -29,7 +29,7 @@ services:
       - ./examples:/workspace:ro
 
   dind:
-    image: docker.io/docker:${DOCKER_VERSION:-20.10.5}-dind
+    image: docker.io/docker:${DOCKER_VERSION:-20.10.17}-dind
     restart: always
     privileged: true
     environment:
@@ -44,7 +44,7 @@ services:
       - dind
 
   remote:
-    image: ${REGISTRY:-registry.gitlab.com}/${NAMESPACE:-swoole-bundle}/${PROJECT_NAME:-docker-client}-remote:${IMAGE_TAG:-local}
+    image: ${REGISTRY:-docker.io}/${NAMESPACE:-pixelfederation}/${PROJECT_NAME:-docker-client}-remote:${IMAGE_TAG:-local}
     depends_on:
       - dind
     build:
@@ -66,6 +66,6 @@ services:
       - dind
 
   example-nginx:
-    image: ${REGISTRY:-registry.gitlab.com}/${NAMESPACE:-swoole-bundle}/${PROJECT_NAME:-docker-client}-example-nginx:${IMAGE_TAG:-local}
+    image: ${REGISTRY:-docker.io}/${NAMESPACE:-pixelfederation}/${PROJECT_NAME:-docker-client}-example-nginx:${IMAGE_TAG:-local}
     build:
       context: examples/nginx