chore(monitor): use podman replace docker

Author: duanhongyi

.woodpecker/build-linux.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
   - export VERSION=$([ -z $CI_COMMIT_TAG ] && echo latest || echo $CI_COMMIT_TAG)-$(sed 's#/#-#g' <<< $CI_SYSTEM_ARCH)
   - cd grafana && make build-all push-all && cd ..
   - cd telegraf && make build-all push-all && cd ..

.woodpecker/manifest-grafana.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/manifest-telegraf.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

default.mk

@@ -1,7 +1,6 @@
 SHELL := /bin/bash
 
 # all monitor components share/use the following targets/exports
-DOCKER_HOST = $(shell echo $$DOCKER_HOST)
 BUILD_TAG ?= git-$(shell git rev-parse --short HEAD)
 DRYCC_REGISTRY ?= ${DEV_REGISTRY}
 IMAGE_PREFIX ?= drycc
@@ -11,33 +10,33 @@ include ../includes.mk
 include ../versioning.mk
 include ../deploy.mk
 
-TEST_ENV_PREFIX := docker run --rm -v ${CURDIR}:/bash -w /bash ${DEV_REGISTRY}/drycc/go-dev
+TEST_ENV_PREFIX := podman run --rm -v ${CURDIR}:/bash -w /bash ${DEV_REGISTRY}/drycc/go-dev
 
-build: docker-build
-push: docker-push
-deploy: check-kubectl docker-build docker-push install
+build: podman-build
+push: podman-push
+deploy: check-kubectl podman-build podman-push install
 
-docker-build:
-	docker build ${DOCKER_BUILD_FLAGS} --build-arg CODENAME=${CODENAME} -t ${IMAGE} rootfs
-	docker tag ${IMAGE} ${MUTABLE_IMAGE}
+podman-build:
+	podman build --build-arg CODENAME=${CODENAME} -t ${IMAGE} rootfs
+	podman tag ${IMAGE} ${MUTABLE_IMAGE}
 
-docker-buildx:
-	docker buildx build --build-arg CODENAME=${CODENAME} --platform ${PLATFORM} -t ${IMAGE} rootfs --push
+podman-buildx:
+	podman buildx build --build-arg CODENAME=${CODENAME} --platform ${PLATFORM} -t ${IMAGE} rootfs --push
 
-clean: check-docker
-	docker rmi $(IMAGE)
+clean: check-podman
+	podman rmi $(IMAGE)
 
 test: test-style
 
 test-style:
 	${TEST_ENV_PREFIX} shellcheck $(SHELL_SCRIPTS)
 
-.PHONY: build push docker-build clean upgrade deploy test test-style
+.PHONY: build push podman-build clean upgrade deploy test test-style
 
 build-all:
-	docker build ${DOCKER_BUILD_FLAGS} --build-arg CODENAME=${CODENAME} -t ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/grafana:${VERSION} ../grafana/rootfs
-	docker build ${DOCKER_BUILD_FLAGS} --build-arg CODENAME=${CODENAME} -t ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/telegraf:${VERSION} ../telegraf/rootfs
+	podman build --build-arg CODENAME=${CODENAME} -t ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/grafana:${VERSION} ../grafana/rootfs
+	podman build --build-arg CODENAME=${CODENAME} -t ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/telegraf:${VERSION} ../telegraf/rootfs
 
 push-all:
-	docker push ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/grafana:${VERSION}
-	docker push ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/telegraf:${VERSION}
+	podman push ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/grafana:${VERSION}
+	podman push ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/telegraf:${VERSION}

grafana/README.md

@@ -108,15 +108,15 @@ The provided `Makefile` has various targets to help support building and publish
 ### Environment variables
 There are a few key environment variables you should be aware of when interacting with the `make` targets.
 
-* `BUILD_TAG` - The tag provided to the docker image when it is built (defaults to the git-sha)
+* `BUILD_TAG` - The tag provided to the podman image when it is built (defaults to the git-sha)
 * `SHORT_NAME` - The name of the image (defaults to `grafana`)
-* `DRYCC_REGISTRY` - This is the registry you are using (default `dockerhub`)
+* `DRYCC_REGISTRY` - This is the registry you are using (default `registry.drycc.cc`)
 * `IMAGE_PREFIX` - This is the account for the registry you are using (default `drycc`)
 
 ### Make targets
 
-* `make build` - Build docker image
-* `make push` - Push docker image to a registry
+* `make build` - Build container image
+* `make push` - Push container image to a registry
 * `make upgrade` - Replaces the running grafana instance with a new one
 
 The typical workflow will look something like this - `DRYCC_REGISTRY= IMAGE_PREFIX=foouser make build push upgrade`

includes.mk

@@ -1,7 +1,7 @@
-.PHONY: check-docker
-check-docker:
-	@if [ -z $$(which docker) ]; then \
-		echo "Missing \`docker\` client which is required for development"; \
+.PHONY: check-podman
+check-podman:
+	@if [ -z $$(which podman) ]; then \
+		echo "Missing \`podman\` client which is required for development"; \
 		exit 2; \
 	fi
 

telegraf/README.md

@@ -1,7 +1,7 @@
 # [Telegraf](https://influxdata.com/time-series-platform/telegraf/)
 
 ## Description
-Telegraf is a metrics collection daemon from InfluxData. It contains numerous input and output plugins that allows the user to customize what data they collect and where it is sent. This image is based on the official [drycc base image](https://github.com/drycc/docker-base).
+Telegraf is a metrics collection daemon from InfluxData. It contains numerous input and output plugins that allows the user to customize what data they collect and where it is sent. This image is based on the official [drycc base image](https://github.com/drycc/base).
 
 ## Configuration
 Telegraf configuration is based largely on a toml file that is passed in when the binary starts. The issue with doing this in a containerized environment is how can you "dynamically" build this file based on values passed into the container at runtime. Therefore, this image relies on a project called [envtpl](https://github.com/arschles/envtpl) to produce the telegraf configuration file. It can take environment variables and through using go templates produce the necessary stanzas in the toml file to start telegraf. Currently, the go template only supports basic if checks and outputting values that have been set.
@@ -29,15 +29,15 @@ The provided `Makefile` has various targets to help support building and publish
 ### Environment variables
 There are a few key environment variables you should be aware of when interacting with the `make` targets.
 
-* `BUILD_TAG` - The tag provided to the docker image when it is built (defaults to the git-sha)
+* `BUILD_TAG` - The tag provided to the container image when it is built (defaults to the git-sha)
 * `SHORT_NAME` - The name of the image (defaults to `grafana`)
 * `DRYCC_REGISTRY` - This is the registry you are using (default `dockerhub`)
 * `IMAGE_PREFIX` - This is the account for the registry you are using (default `drycc`)
 
 ### Make targets
 
-* `make build` - Build docker image
-* `make push` - Push docker image to a registry
+* `make build` - Build container image
+* `make push` - Push container image to a registry
 * `make upgrade` - Replaces the running grafana instance with a new one
 
 The typical workflow will look something like this - `DRYCC_REGISTRY= IMAGE_PREFIX=foouser make build push upgrade``

versioning.mk

@@ -10,13 +10,13 @@ info:
 	@echo "Immutable tag:   ${IMAGE}"
 	@echo "Mutable tag:     ${MUTABLE_IMAGE}"
 
-.PHONY: docker-push
-docker-push: docker-mutable-push docker-immutable-push
+.PHONY: podman-push
+podman-push: podman-mutable-push podman-immutable-push
 
-.PHONY: docker-immutable-push
-docker-immutable-push:
-	docker push ${IMAGE}
+.PHONY: podman-immutable-push
+podman-immutable-push:
+	podman push ${IMAGE}
 
-.PHONY: docker-mutable-push
-docker-mutable-push:
-	docker push ${MUTABLE_IMAGE}
+.PHONY: podman-mutable-push
+podman-mutable-push:
+	podman push ${MUTABLE_IMAGE}