chore(builder): use podman replace docker

Author: duanhongyi

.woodpecker/build-linux.yml

@@ -13,8 +13,8 @@ pipeline:
   image: bash
   commands:
   - export VERSION=$([ -z $CI_COMMIT_TAG ] && echo latest || echo $CI_COMMIT_TAG)-$(sed 's#/#-#g' <<< $CI_SYSTEM_ARCH)
-  - echo $CONTAINER_PASSWORD | docker login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
-  - make docker-build docker-immutable-push
+  - echo $CONTAINER_PASSWORD | podman login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
+  - make podman-build podman-immutable-push
   secrets:
   - codename
   - dev_registry

.woodpecker/manifest.yml

@@ -19,14 +19,14 @@ pipeline:
 - name: publish-manifest
   image: bash
   commands:
-  - docker run --rm
+  - podman run --rm
     -e PLUGIN_SPEC=.woodpecker/manifest.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

@@ -19,20 +19,20 @@ RUN groupadd drycc --gid ${DRYCC_GID} \
 
 COPY rootfs/bin /bin/
 COPY rootfs/etc/ssh /etc/ssh/
-COPY rootfs/docker-entrypoint.sh /docker-entrypoint.sh
+COPY rootfs/container-entrypoint.sh /container-entrypoint.sh
 COPY --from=build /usr/local/bin/boot /usr/bin/boot
 
 RUN install-packages git openssh-server coreutils xz-utils tar \
   && install-stack mc $MC_VERSION \
   && install-stack jq $JQ_VERSION \
   && mkdir -p /var/run/sshd \
   && rm -rf /etc/ssh/ssh_host* \
-  && chmod +x /bin/create_bucket /docker-entrypoint.sh
+  && chmod +x /bin/create_bucket /container-entrypoint.sh
 
 USER ${DRYCC_UID}
 WORKDIR ${DRYCC_HOME_DIR}
 
-ENTRYPOINT ["init-stack", "/docker-entrypoint.sh"]
+ENTRYPOINT ["init-stack", "/container-entrypoint.sh"]
 CMD ["/usr/bin/boot", "server"]
 
 EXPOSE 2223

Makefile

@@ -3,28 +3,28 @@ SHORT_NAME ?= builder
 include versioning.mk
 DRYCC_REGISTRY ?= ${DEV_REGISTRY}
 
-# dockerized development environment variables
+# container development environment variables
 REPO_PATH := github.com/drycc/${SHORT_NAME}
 DEV_ENV_IMAGE := ${DEV_REGISTRY}/drycc/go-dev
 DEV_ENV_WORK_DIR := /opt/drycc/go/src/${REPO_PATH}
-DEV_ENV_PREFIX := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} --entrypoint testdata/bin/fake-k8s
+DEV_ENV_PREFIX := podman run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} --entrypoint testdata/bin/fake-k8s
 DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
 PLATFORM ?= linux/amd64,linux/arm64
 
-# SemVer with build information is defined in the SemVer 2 spec, but Docker
+# SemVer with build information is defined in the SemVer 2 spec, but podman
 # doesn't allow +, so we use -.
 BINARY_DEST_DIR := rootfs/usr/bin
 # Common flags passed into Go's linker.
 LDFLAGS := "-s -w -X main.version=${VERSION}"
-# Docker Root FS
+# Container Root FS
 BINDIR := ./rootfs
 
 bootstrap:
 	${DEV_ENV_CMD} go mod vendor
 
-# This illustrates a two-stage Docker build. docker-compile runs inside of
-# the Docker environment. Other alternatives are cross-compiling, doing
-# the build as a `docker build`.
+# This illustrates a two-stage Podman build. podman-compile runs inside of
+# the container environment. Other alternatives are cross-compiling, doing
+# the build as a `podman build`.
 build-binary:
 	CGO_ENABLED=0 go build -ldflags ${LDFLAGS} -o ${BINARY_DEST_DIR}/boot boot.go
 
@@ -42,20 +42,17 @@ test-unit:
 test-cover:
 	${DEV_ENV_CMD} test-cover.sh
 
-docker-build:
-	docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} --build-arg LDFLAGS=${LDFLAGS} --build-arg CODENAME=${CODENAME} .
-	docker tag ${IMAGE} ${MUTABLE_IMAGE}
-
-docker-buildx:
-	docker buildx build --platform ${PLATFORM} -t ${IMAGE} --build-arg LDFLAGS=${LDFLAGS} --build-arg CODENAME=${CODENAME} --push .
+podman-build:
+	podman build -t ${IMAGE} --build-arg LDFLAGS=${LDFLAGS} --build-arg CODENAME=${CODENAME} .
+	podman tag ${IMAGE} ${MUTABLE_IMAGE}
 
 check-kubectl:
 	@if [ -z $$(which kubectl) ]; then \
 		echo "kubectl binary could not be located"; \
 		exit 2; \
 	fi
 
-deploy: check-kubectl docker-build docker-push
+deploy: check-kubectl podman-build podman-push
 	kubectl --namespace=drycc patch deployment drycc-$(SHORT_NAME) --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"$(IMAGE)"}]'
 
-.PHONY: bootstrap depup build docker-build test test-style test-unit test-cover deploy
+.PHONY: bootstrap depup build podman-build test test-style test-unit test-cover deploy

README.md

@@ -44,24 +44,16 @@ The Drycc project welcomes contributions from all developers. The high level pro
 	* If your PR fixes any [issues][issues], make sure you write `Fixes #1234` in your PR description (where `#1234` is the number of the issue you're closing)
 * The Drycc core contributors will review your code. After each of them sign off on your code, they'll label your PR with `LGTM1` and `LGTM2` (respectively). Once that happens, a contributor will merge it
 
-## Docker Based Development Environment
+## Container Based Development Environment
 
-The preferred environment for development uses [the `go-dev` Docker image](https://github.com/drycc/docker-go-dev). The tools described in this section are used to build, test, package and release each version of Drycc.
+The preferred environment for development uses [the `go-dev` Container image](https://github.com/drycc/go-dev). The tools described in this section are used to build, test, package and release each version of Drycc.
 
-To use it yourself, you must have [make](https://www.gnu.org/software/make/) installed and Docker installed and running on your local development machine.
+To use it yourself, you must have [make](https://www.gnu.org/software/make/) installed and Container installed and running on your local development machine.
 
-If you don't have Docker installed, please go to https://www.docker.com/ to install it.
+If you don't have Podman installed, please go to https://podman.io/ to install it.
 
 After you have those dependencies, grab Go dependencies with `make bootstrap`, build your code with `make build` and execute unit tests with `make test`.
 
-## Native Go Development Environment
-
-You can also use the standard `go` toolchain to build and test if you prefer. To do so, you'll need [glide](https://github.com/Masterminds/glide) 0.9 or above and [Go 1.6](http://golang.org) or above installed.
-
-After you have those dependencies, you can build and unit-test your code with `go build` and `go test $(glide nv)`, respectively.
-
-Note that you will not be able to build or push Docker images using this method of development.
-
 # Testing
 
 The Drycc project requires that as much code as possible is unit tested, but the core contributors also recognize that some code must be tested at a higher level (functional or integration tests, for example).

charts/builder/templates/_helpers.tpl

@@ -63,7 +63,7 @@ env:
       name: registry-secret
       key: host
 {{- if eq .Values.global.registryLocation "on-cluster" }}
-# NOTE(bacongobbler): use drycc/registry_proxy to work around Docker --insecure-registry requirements
+# NOTE(bacongobbler): use drycc/registry_proxy to work around --insecure-registry requirements
 - name: "DRYCC_REGISTRY_PROXY_HOST"
   value: {{ print "127.0.0.1"  ":" .Values.global.registryProxyPort }}
 {{- else }}

pkg/builder.go

@@ -1,6 +1,6 @@
 // Package pkg provides common libraries for the Drycc builder.
 //
-// The Drycc builder is responsible for building buildpack and docker images for use in the Drycc
+// The Drycc builder is responsible for building buildpack and container images for use in the Drycc
 // on the Drycc PaaS platform.
 package pkg
 

pkg/gitreceive/k8s_util.go

@@ -2,7 +2,6 @@ package gitreceive
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"os"
 	"strconv"
@@ -54,18 +53,6 @@ func createBuilderJob(
 ) *batchv1.Job {
 
 	job := buildJob(debug, name, namespace, pullPolicy, securityContext, nodeSelector, env)
-
-	// inject application envvars as a special envvar which will be handled by imagebuilder to
-	// inject them as build-time variables.
-	// NOTE(bacongobbler): image-py takes buildargs as a json string in the form of
-	//
-	// {"KEY": "value"}
-	//
-	// So we need to translate the map into json.
-	if _, ok := env["DRYCC_DOCKER_BUILD_ARGS_ENABLED"]; ok {
-		imageBuildArgs, _ := json.Marshal(env)
-		addEnvToJob(job, "DOCKER_BUILD_ARGS", string(imageBuildArgs))
-	}
 	job.Spec.Template.Spec.Containers[0].Name = builderName
 	job.Spec.Template.Spec.Containers[0].Image = builderImage
 

pkg/gitreceive/k8s_util_test.go

@@ -47,9 +47,6 @@ func TestBuildJob(t *testing.T) {
 
 	env := make(map[string]interface{})
 	env["KEY"] = "VALUE"
-	buildArgsEnv := make(map[string]interface{})
-	buildArgsEnv["DRYCC_DOCKER_BUILD_ARGS_ENABLED"] = "1"
-	buildArgsEnv["KEY"] = "VALUE"
 	var job *batchv1.Job
 
 	emptyNodeSelector := make(map[string]string)
@@ -69,7 +66,6 @@ func TestBuildJob(t *testing.T) {
 		{true, "test", "default", env, "tar", "deadbeef", "img", "imagebuilder", "customimage", corev1.PullAlways, emptyNodeSelector},
 		{true, "test", "default", env, "tar", "deadbeef", "img", "imagebuilder", "customimage", corev1.PullIfNotPresent, emptyNodeSelector},
 		{true, "test", "default", env, "tar", "deadbeef", "img", "imagebuilder", "customimage", corev1.PullNever, nil},
-		{true, "test", "default", buildArgsEnv, "tar", "deadbeef", "img", "imagebuilder", "customimage", corev1.PullIfNotPresent, emptyNodeSelector},
 	}
 	buildImageEnv := map[string]string{"DRYCC_REGISTRY_LOCATION": "on-cluster"}
 	for _, build := range imageBuilds {
@@ -100,9 +96,6 @@ func TestBuildJob(t *testing.T) {
 		checkForEnv(t, job, "TAR_PATH", build.tarKey)
 		checkForEnv(t, job, "IMAGE_NAME", build.imgName)
 		checkForEnv(t, job, "DRYCC_REGISTRY_LOCATION", "on-cluster")
-		if _, ok := build.env["DRYCC_DOCKER_BUILD_ARGS_ENABLED"]; ok {
-			checkForEnv(t, job, "DOCKER_BUILD_ARGS", `{"DRYCC_DOCKER_BUILD_ARGS_ENABLED":"1","KEY":"VALUE"}`)
-		}
 		if build.imagebuilderImage != "" {
 			if job.Spec.Template.Spec.Containers[0].Image != build.imagebuilderImage {
 				t.Errorf("expected %v but returned %v", build.imagebuilderImage, job.Spec.Template.Spec.Containers[0].Image)

rootfs/README.md

@@ -1,8 +1,8 @@
 # RootFS
 
 This directory stores all files that should be copied to the rootfs of a
-Docker container. The files should be stored according to the correct
-directory structure of the destination container. For example:
+container. The files should be stored according to the correct directory
+structure of the destination container. For example:
 
 ```
 rootfs/bin -> /bin