chore(pack-images): use podman replace docker

Author: duanhongyi

.woodpecker/build-linux-buildpacks.yml

@@ -12,14 +12,7 @@ pipeline:
 - name: publish-linux
   image: bash
   commands:
-  - echo $CONTAINER_PASSWORD | docker login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
-  - docker run --rm
-      -v "/usr/local/bin:/tmp/bin"
-      --env CODENAME=$${CODENAME}
-      --env DRYCC_REGISTRY=$DRYCC_REGISTRY
-      --entrypoint init-stack
-      $DRYCC_REGISTRY/drycc/imagebuilder:canary
-      bash -c "cp /opt/drycc/pack/bin/pack /tmp/bin"
+  - echo $CONTAINER_PASSWORD | podman login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
   - sed -i "s/registry.drycc.cc/$${DRYCC_REGISTRY}/g" builder.toml
   - sed -i "s/{{CODENAME}}/$${CODENAME}/g" builder.toml
   - export PACK_HOME=$CI_WORKSPACE

.woodpecker/build-linux-pack.yml

@@ -12,7 +12,7 @@ pipeline:
 - name: publish-linux
   image: bash
   commands:
-  - echo $CONTAINER_PASSWORD | docker login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
+  - echo $CONTAINER_PASSWORD | podman login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
   - make publish-pack
   secrets:
   - codename

.woodpecker/manifest-buildpacks.yml

@@ -23,7 +23,7 @@ pipeline:
 - name: publish-buildpacks-image
   image: bash
   commands:
-  - docker run --rm
+  - podman run --rm
     -e PLUGIN_SPEC=.woodpecker/manifest-buildpacks.tmpl
     -e PLUGIN_USERNAME=$CONTAINER_USERNAME
     -e PLUGIN_PASSWORD=$CONTAINER_PASSWORD

.woodpecker/manifest-pack.yml

@@ -21,14 +21,14 @@ pipeline:
 - name: publish-run-image
   image: bash
   commands:
-  - docker run --rm
+  - podman run --rm
     -e PLUGIN_SPEC=.woodpecker/manifest-run.tmpl
     -e PLUGIN_USERNAME=$CONTAINER_USERNAME
     -e PLUGIN_PASSWORD=$CONTAINER_PASSWORD
     -e DRONE_TAG=$CI_COMMIT_TAG
     -v $(pwd):$(pwd)
     -w $(pwd)
-    plugins/manifest
+    docker.io/plugins/manifest
   secrets:
   - container_username
   - container_password
@@ -40,14 +40,14 @@ pipeline:
 - name: publish-build-image
   image: bash
   commands:
-  - docker run --rm
+  - podman run --rm
     -e PLUGIN_SPEC=.woodpecker/manifest-build.tmpl
     -e PLUGIN_USERNAME=$CONTAINER_USERNAME
     -e PLUGIN_PASSWORD=$CONTAINER_PASSWORD
     -e DRONE_TAG=$CI_COMMIT_TAG
     -v $(pwd):$(pwd)
     -w $(pwd)
-    plugins/manifest
+    docker.io/plugins/manifest
   secrets:
   - container_username
   - container_password

Dockerfile.run

@@ -10,7 +10,7 @@ ENV CNB_APP_DIR /workspace
 
 RUN groupadd drycc --gid ${CNB_USER_ID} \
   && useradd drycc -u ${CNB_USER_ID} -g ${CNB_GROUP_ID} -s /bin/bash -m \
-  && chown -R ${CNB_USER_ID}:${CNB_GROUP_ID} /opt /etc
+  && chown -hR ${CNB_USER_ID}:${CNB_GROUP_ID} /opt /etc
 
 USER ${CNB_USER_ID}:${CNB_GROUP_ID}
 

Makefile

@@ -15,24 +15,24 @@ STACK_RUN_IMAGE = ${DRYCC_REGISTRY}/drycc/pack:${CODENAME}-${PLATFORM}-${ARCH}
 STACK_BUILD_IMAGE = ${DRYCC_REGISTRY}/drycc/pack:${CODENAME}-${PLATFORM}-${ARCH}-build
 BUILDPACKS_IMAGE = ${DRYCC_REGISTRY}/drycc/buildpacks:${CODENAME}-${PLATFORM}-${ARCH}
 
-SHELLCHECK_PREFIX := docker run --rm -v ${CURDIR}:/workdir -w /workdir ${DRYCC_REGISTRY}/drycc/go-dev shellcheck
+SHELLCHECK_PREFIX := podman run --rm -v ${CURDIR}:/workdir -w /workdir ${DRYCC_REGISTRY}/drycc/go-dev shellcheck
 SHELL_SCRIPTS = $(shell find "buildpacks" -name '*.sh') $(shell find "rootfs" -name '*.sh') $(wildcard buildpacks/*/bin/*)
 
 SHELL=/bin/bash -o pipefail
 
 pack:
-	@docker build --pull -f Dockerfile.run \
+	@podman build --pull -f Dockerfile.run \
 	  --build-arg STACK_ID=${STACK_ID} \
 	  --build-arg BASE_IMAGE=${DRYCC_REGISTRY}/drycc/base:${CODENAME} \
 	  -t ${STACK_RUN_IMAGE} .
-	@docker build -f Dockerfile.build \
+	@podman build -f Dockerfile.build \
 	  --build-arg BASE_IMAGE=${STACK_RUN_IMAGE} \
 	  --build-arg PLATFORM_API=${PLATFORM_API} \
 	  -t ${STACK_BUILD_IMAGE} .
 
 publish-pack: pack
-	@docker push ${STACK_RUN_IMAGE}
-	@docker push ${STACK_BUILD_IMAGE}
+	@podman push ${STACK_RUN_IMAGE}
+	@podman push ${STACK_BUILD_IMAGE}
 
 buildpack:
 	STACK_ID=${STACK_ID} python3 _scripts/utils.py toml buildpacks/go/buildpack.tmpl buildpacks/go/buildpack.toml
@@ -42,12 +42,14 @@ buildpack:
 	STACK_ID=${STACK_ID} python3 _scripts/utils.py toml buildpacks/python/buildpack.tmpl buildpacks/python/buildpack.toml
 	STACK_ID=${STACK_ID} python3 _scripts/utils.py toml buildpacks/ruby/buildpack.tmpl buildpacks/ruby/buildpack.toml
 	STACK_ID=${STACK_ID} python3 _scripts/utils.py toml buildpacks/rust/buildpack.tmpl buildpacks/rust/buildpack.toml
-	STACK_ID=${STACK_ID} LIFECYCLE_URL=${LIFECYCLE_URL} STACK_RUN_IMAGE=${STACK_RUN_IMAGE} STACK_BUILD_IMAGE=${STACK_BUILD_IMAGE} python3 _scripts/utils.py toml builder.toml builder.toml.${PLATFORM}.${ARCH}
-	@pack builder create ${BUILDPACKS_IMAGE} --config builder.toml.${PLATFORM}.${ARCH} --pull-policy if-not-present
+	STACK_ID=${STACK_ID} LIFECYCLE_URL=${LIFECYCLE_URL} STACK_RUN_IMAGE=${STACK_RUN_IMAGE} STACK_BUILD_IMAGE=${STACK_BUILD_IMAGE} \
+	    python3 _scripts/utils.py toml builder.toml builder.toml.${PLATFORM}.${ARCH}
+	DOCKER_HOST=unix://$(shell podman info -f "{{.Host.RemoteSocket.Path}}") \
+		pack builder create ${BUILDPACKS_IMAGE} --config builder.toml.${PLATFORM}.${ARCH} --pull-policy if-not-present
 	@rm -rf builder.toml.${PLATFORM}.${ARCH} buildpacks/*/buildpack.toml
 
 publish-buildpack: buildpack
-	@docker push ${BUILDPACKS_IMAGE}
+	@podman push ${BUILDPACKS_IMAGE}
 
 publish: publish-pack publish-buildpack
 

README.md

@@ -6,9 +6,9 @@ This repository is responsible for building and publishing images that builds
 with [Cloud Native Buildpacks'](https://buildpacks.io)
 [`pack`](https://github.com/buildpacks/pack) command.
 
-* [drycc/pack:$codename](https://hub.docker.com/r/drycc/pack/tags/) - A CNB
+* [drycc/pack:$codename](https://registry.drycc.cc) - A CNB
   compatible run image based on drycc/pack:$codename
-* [drycc/pack:$codename-build](https://hub.docker.com/r/drycc/pack/tags/) - A CNB
+* [drycc/pack:$codename-build](https://registry.drycc.cc) - A CNB
   compatible build image based on drycc/pack:$codename-build
 
 ## Usage