Skip to content

Commit b17b64d

Browse files
committed
chore(fluentbit): use podman replace docker
1 parent f78edc6 commit b17b64d

5 files changed

Lines changed: 23 additions & 27 deletions

File tree

.woodpecker/build-linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ pipeline:
1313
image: bash
1414
commands:
1515
- export VERSION=$([ -z $CI_COMMIT_TAG ] && echo latest || echo $CI_COMMIT_TAG)-$(sed 's#/#-#g' <<< $CI_SYSTEM_ARCH)
16-
- echo $CONTAINER_PASSWORD | docker login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
17-
- make docker-build docker-immutable-push
16+
- echo $CONTAINER_PASSWORD | podman login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
17+
- make podman-build podman-immutable-push
1818
secrets:
1919
- codename
2020
- dev_registry

.woodpecker/manifest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pipeline:
1919
- name: publish-manifest
2020
image: bash
2121
commands:
22-
- docker run --rm
22+
- podman run --rm
2323
-e PLUGIN_SPEC=.woodpecker/manifest.tmpl
2424
-e PLUGIN_USERNAME=$CONTAINER_USERNAME
2525
-e PLUGIN_PASSWORD=$CONTAINER_PASSWORD

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ ARG BUILD_TAG
33
ARG BUILD_DATE
44

55
FROM registry.drycc.cc/drycc/go-dev AS build
6-
ARG LDFLAGS
76
ADD . /workspace
87
RUN export GO111MODULE=on \
98
&& cd /workspace \

Makefile

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,36 +9,33 @@ REPO_PATH := github.com/drycc/${SHORT_NAME}
99
DEV_ENV_BUILD = go build -ldflags "-X 'main.Revision=$(BUILD_TAG)' -X 'main.BuildDate=$(BUILD_DATE)'" -buildmode=c-shared -o _dist/out_drycc.so plugin/out_drycc.go
1010
DEV_ENV_IMAGE := ${DEV_REGISTRY}/drycc/go-dev
1111
DEV_ENV_WORK_DIR := /opt/drycc/go/src/${REPO_PATH}
12-
DEV_ENV_PREFIX := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
12+
DEV_ENV_PREFIX := podman run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
1313

1414
include versioning.mk
1515

1616

17-
build: docker-build
18-
push: docker-push
17+
build: podman-build
18+
push: podman-push
1919

20-
check-docker:
21-
@if [ -z $$(which docker) ]; then \
22-
echo "Missing docker client which is required for development"; \
20+
check-podman:
21+
@if [ -z $$(which podman) ]; then \
22+
echo "Missing podman client which is required for development"; \
2323
exit 2; \
2424
fi
2525

26-
bootstrap: check-docker
26+
bootstrap: check-podman
2727
$(DEV_ENV_PREFIX) $(DEV_ENV_IMAGE) go mod vendor
2828

29-
build-binary: check-docker
29+
build-binary: check-podman
3030
$(DEV_ENV_PREFIX) $(DEV_ENV_IMAGE) $(DEV_ENV_BUILD)
3131

32-
docker-build: check-docker
33-
docker build --build-arg CODENAME=${CODENAME} --build-arg BUILD_TAG=${BUILD_TAG} --build-arg BUILD_DATE=${BUILD_DATE} -t ${IMAGE} .
34-
docker tag ${IMAGE} ${MUTABLE_IMAGE}
35-
36-
docker-buildx: check-docker
37-
docker buildx build --platform ${PLATFORM} --build-arg CODENAME=${CODENAME} --build-arg BUILD_TAG=${BUILD_TAG} --build-arg BUILD_DATE=${BUILD_DATE} -t ${IMAGE} . --push
32+
podman-build: check-podman
33+
podman build --build-arg CODENAME=${CODENAME} --build-arg BUILD_TAG=${BUILD_TAG} --build-arg BUILD_DATE=${BUILD_DATE} -t ${IMAGE} .
34+
podman tag ${IMAGE} ${MUTABLE_IMAGE}
3835

3936
test: test-style
4037

41-
test-style: check-docker
38+
test-style: check-podman
4239
$(DEV_ENV_PREFIX) $(DEV_ENV_IMAGE) make style-check
4340

4441
style-check:

versioning.mk

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ info:
1010
@echo "Immutable tag: ${IMAGE}"
1111
@echo "Mutable tag: ${MUTABLE_IMAGE}"
1212

13-
.PHONY: docker-push
14-
docker-push: docker-mutable-push docker-immutable-push
13+
.PHONY: podman-push
14+
podman-push: podman-mutable-push podman-immutable-push
1515

16-
.PHONY: docker-immutable-push
17-
docker-immutable-push:
18-
docker push ${IMAGE}
16+
.PHONY: podman-immutable-push
17+
podman-immutable-push:
18+
podman push ${IMAGE}
1919

20-
.PHONY: docker-mutable-push
21-
docker-mutable-push:
22-
docker push ${MUTABLE_IMAGE}
20+
.PHONY: podman-mutable-push
21+
podman-mutable-push:
22+
podman push ${MUTABLE_IMAGE}

0 commit comments

Comments
 (0)