chore(controller): 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,7 +19,7 @@ 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

.woodpecker/test-linux.yml

@@ -12,7 +12,7 @@ pipeline:
 - name: test-linux
   image: bash
   commands:
-  - make test docker-build-test upload-coverage
+  - make test podman-build-test upload-coverage
   secrets:
   - codename
   - dev_registry

Makefile

@@ -7,7 +7,7 @@ PLATFORM ?= linux/amd64,linux/arm64
 
 include versioning.mk
 
-SHELLCHECK_PREFIX := docker run -v ${CURDIR}:/workdir -w /workdir ${DEV_REGISTRY}/drycc/go-dev shellcheck
+SHELLCHECK_PREFIX := podman run -v ${CURDIR}:/workdir -w /workdir ${DEV_REGISTRY}/drycc/go-dev shellcheck
 SHELL_SCRIPTS = $(wildcard rootfs/bin/*) $(shell find "rootfs" -name '*.sh') $(wildcard _scripts/*.sh)
 
 # Test processes used in quick unit testing
@@ -19,44 +19,41 @@ check-kubectl:
 	  exit 2; \
 	fi
 
-check-docker:
-	@if [ -z $$(which docker) ]; then \
-	  echo "Missing \`docker\` client which is required for development"; \
+check-podman:
+	@if [ -z $$(which podman) ]; then \
+	  echo "Missing \`podman\` client which is required for development"; \
 	  exit 2; \
 	fi
 
-build: docker-build
+build: podman-build
 
-docker-build: check-docker
-	docker build ${DOCKER_BUILD_FLAGS} --build-arg CODENAME=${CODENAME} -t ${IMAGE} rootfs
-	docker tag ${IMAGE} ${MUTABLE_IMAGE}
+podman-build: check-podman
+	podman build --build-arg CODENAME=${CODENAME} -t ${IMAGE} rootfs
+	podman tag ${IMAGE} ${MUTABLE_IMAGE}
 
-docker-buildx: check-docker
-	docker buildx build --build-arg CODENAME=${CODENAME} --platform ${PLATFORM} -t ${IMAGE} rootfs --push
+podman-build-test: check-podman
+	podman build --build-arg CODENAME=${CODENAME} -t ${IMAGE}.test -f rootfs/Dockerfile.test rootfs
 
-docker-build-test: check-docker
-	docker build ${DOCKER_BUILD_FLAGS} --build-arg CODENAME=${CODENAME} -t ${IMAGE}.test -f rootfs/Dockerfile.test rootfs
-
-deploy: check-kubectl docker-build docker-push
+deploy: check-kubectl podman-build podman-push
 	kubectl --namespace=drycc patch deployment drycc-$(COMPONENT) --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"$(IMAGE)"}]'
 
-clean: check-docker
-	docker rmi $(IMAGE)
+clean: check-podman
+	podman rmi $(IMAGE)
 
 commit-hook:
 	cp _scripts/util/commit-msg .git/hooks/commit-msg
 
-full-clean: check-docker
-	docker images -q $(IMAGE_PREFIX)/$(COMPONENT) | xargs docker rmi -f
+full-clean: check-podman
+	podman images -q $(IMAGE_PREFIX)/$(COMPONENT) | xargs podman rmi -f
 
 test: test-style test-unit test-functional
 
-test-style: docker-build-test
-	docker run -v ${CURDIR}:/test -w /test/rootfs ${IMAGE}.test /test/rootfs/bin/test-style
+test-style: podman-build-test
+	podman run -v ${CURDIR}:/test -w /test/rootfs ${IMAGE}.test /test/rootfs/bin/test-style
 	${SHELLCHECK_PREFIX} $(SHELL_SCRIPTS)
 
-test-unit: docker-build-test
-	docker run -v ${CURDIR}:/test -w /test/rootfs ${IMAGE}.test /test/rootfs/bin/test-unit
+test-unit: podman-build-test
+	podman run -v ${CURDIR}:/test -w /test/rootfs ${IMAGE}.test /test/rootfs/bin/test-unit
 
 test-functional:
 	@echo "Implement functional tests in _tests directory"
@@ -66,6 +63,6 @@ test-integration:
 
 upload-coverage:
 	$(eval CI_ENV := $(shell curl -s https://codecov.io/env | bash))
-	docker run --rm ${CI_ENV} -v ${CURDIR}:/test -w /test/rootfs ${IMAGE}.test /test/rootfs/bin/upload-coverage
+	podman run --rm ${CI_ENV} -v ${CURDIR}:/test -w /test/rootfs ${IMAGE}.test /test/rootfs/bin/upload-coverage
 
-.PHONY: check-kubectl check-docker build docker-build docker-build-test deploy clean commit-hook full-clean test test-style test-unit test-functional test-integration upload-coverage
+.PHONY: check-kubectl check-podman build podman-build podman-build-test deploy clean commit-hook full-clean test test-style test-unit test-functional test-integration upload-coverage

README.md

@@ -33,10 +33,10 @@ The Drycc project welcomes contributions from all developers. The high-level pro
 
 ## Prerequisites
 
-### Docker
+### Podman
 
-Unit tests and code linters for controller run in a Docker container with your local code directory
-mounted in. You need [Docker][] to run `make test`.
+Unit tests and code linters for controller run in a container with your local code directory
+mounted in. You need [Podman][] to run `make test`.
 
 ### Kubernetes
 
@@ -53,13 +53,13 @@ When you've built your new feature or fixed a bug, make sure you've added approp
 
 Also, since this component is central to the platform, it's recommended that you manually test and verify that your feature or fix works as expected. To do so, ensure the following environment variables are set:
 
-* `DRYCC_REGISTRY` - A Docker registry that you have push access to and your Kubernetes cluster can pull from
-  * If this is [Docker Hub](https://hub.docker.com/), leave this variable empty
-* `IMAGE_PREFIX` - The organization in the Docker repository. This defaults to `drycc`, but if you don't have access to that organization, set this to one you have push access to.
+* `DRYCC_REGISTRY` - A Container registry that you have push access to and your Kubernetes cluster can pull from
+  * If this is [Drycc Registry](https://registry.drycc.cc/), leave this variable empty
+* `IMAGE_PREFIX` - The organization in the Container repository. This defaults to `drycc`, but if you don't have access to that organization, set this to one you have push access to.
 * `SHORT_NAME` (optional) - The name of the image. This defaults to `controller`
-* `VERSION` (optional) - The tag of the Docker image. This defaults to the current Git SHA (the output of `git rev-parse --short HEAD`)
+* `VERSION` (optional) - The tag of the Container image. This defaults to the current Git SHA (the output of `git rev-parse --short HEAD`)
 
-Then, run `make deploy` to build and push a new Docker image with your changes and replace the existing one with your new one in the Kubernetes cluster. See below for an example with appropriate environment variables.
+Then, run `make deploy` to build and push a new Container image with your changes and replace the existing one with your new one in the Kubernetes cluster. See below for an example with appropriate environment variables.
 
 ```console
 export IMAGE_PREFIX=arschles
@@ -76,7 +76,7 @@ kubectl get pod --namespace=drycc -w | grep drycc-controller
 [issues]: https://github.com/drycc/controller/issues
 [prs]: https://github.com/drycc/controller/pulls
 [workflow]: https://github.com/drycc/workflow
-[Docker]: https://www.docker.com/
+[Podman]: https://podman.io/
 
 
 ## License

charts/controller/values.yaml

@@ -132,7 +132,7 @@ global:
   #
   # Valid values are:
   # - on-cluster: Run registry within the Kubernetes cluster
-  # - off-cluster: Use registry outside the Kubernetes cluster (example: dockerhub,self-hosted)
+  # - off-cluster: Use registry outside the Kubernetes cluster (example: drycc registry,self-hosted)
   registryLocation: "on-cluster"
   # The host port to which registry proxy binds to
   registryProxyPort: 5555

rootfs/api/models/build.py

@@ -37,7 +37,7 @@ def type(self):
         elif self.sha:
             return 'buildpack'
         else:
-            # docker image (or any sort of image) used via drycc pull
+            # container image (or any sort of image) used via drycc pull
             return 'image'
 
     @property

rootfs/api/models/release.py

@@ -61,7 +61,7 @@ def get_port(self):
         """
         Get application port for a given release. If pulling from private registry
         then use default port or read from ENV var, otherwise attempt to pull from
-        the docker image
+        the container image
         """
         try:
             envs = self.config.values

rootfs/api/tests/test_pods.py

@@ -131,7 +131,7 @@ def test_container_api_heroku(self, mock_requests):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200, response.data)
 
-    def test_container_api_docker(self, mock_requests):
+    def test_container_api(self, mock_requests):
         app_id = self.create_app()
 
         # should start with zero
@@ -519,7 +519,7 @@ def test_command_good(self, mock_requests):
         self.assertEqual(app._get_command('web'), [])
         self.assertEqual(app._get_command('worker'), [])
 
-        # switch to docker image app
+        # switch to container image app
         build.sha = ''
         build.save()
         self.assertEqual(app._get_command('web'), ['node server.js'])

rootfs/scheduler/mock.py

@@ -1110,7 +1110,7 @@ def __init__(self, url, k8s_api_verify_tls=True):
                         "bootID": "11895587-b7f1-4332-8e33-ec222c147d0b",
                         "kernelVersion": "4.2.2-coreos-r2",
                         "osImage": "CoreOS 835.12.0",
-                        "containerRuntimeVersion": "docker://1.8.3",
+                        "containerRuntimeVersion": "oci://1.8.3",
                         "kubeletVersion": "v1.1.7",
                         "kubeProxyVersion": "v1.1.7"
                     }