Skip to content

Commit cc3d6c0

Browse files
committed
chore(redis): use podman replace docker
1 parent ffecec6 commit cc3d6c0

5 files changed

Lines changed: 20 additions & 23 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ 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
2626
-e DRONE_TAG=$CI_COMMIT_TAG
2727
-v $(pwd):$(pwd)
2828
-w $(pwd)
29-
plugins/manifest
29+
docker.io/plugins/manifest
3030
secrets:
3131
- container_username
3232
- container_password

Makefile

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Short name: Short name, following [a-zA-Z_], used all over the place.
22
# Some uses for short name:
3-
# - Docker image name
3+
# - Container image name
44
# - Kubernetes service, rc, pod, secret, volume names
55
SHORT_NAME := redis
66
DRYCC_REGISTRY ?= ${DEV_REGISTRY}
@@ -15,22 +15,19 @@ SHELL_SCRIPTS = $(wildcard _scripts/*.sh) rootfs/bin/boot
1515
# and other build options
1616
DEV_ENV_IMAGE := ${DEV_REGISTRY}/drycc/go-dev
1717
DEV_ENV_WORK_DIR := /opt/drycc/go/src/${REPO_PATH}
18-
DEV_ENV_CMD := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}
19-
DEV_ENV_CMD_INT := docker run -it --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}
18+
DEV_ENV_CMD := podman run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}
19+
DEV_ENV_CMD_INT := podman run -it --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}
2020

21-
all: docker-build docker-push
21+
all: podman-build podman-push
2222

2323
dev:
2424
${DEV_ENV_CMD_INT} bash
2525

2626
# For cases where we're building from local
2727
# We also alter the RC file to set the image name.
28-
docker-build:
29-
docker build ${DOCKER_BUILD_FLAGS} --build-arg CODENAME=${CODENAME} -t ${IMAGE} rootfs
30-
docker tag ${IMAGE} ${MUTABLE_IMAGE}
31-
32-
docker-buildx:
33-
docker buildx build --platform ${PLATFORM} ${DOCKER_BUILD_FLAGS} --build-arg CODENAME=${CODENAME} -t ${IMAGE} rootfs --push
28+
podman-build:
29+
podman build --build-arg CODENAME=${CODENAME} -t ${IMAGE} rootfs
30+
podman tag ${IMAGE} ${MUTABLE_IMAGE}
3431

3532
test: test-style
3633

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
Drycc (pronounced DAY-iss) Workflow is an open source Platform as a Service (PaaS) that adds a developer-friendly layer to any [Kubernetes](http://kubernetes.io) cluster, making it easy to deploy and manage applications on your own servers.
55

66
## Description
7-
A Docker image for running standalone (not clustered) Redis on a Kubernetes cluster.
7+
A Container image for running standalone (not clustered) Redis on a Kubernetes cluster.
88

99
[v2.18]: https://github.com/drycc/workflow/releases/tag/v2.18.0

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-immutable-push docker-mutable-push
13+
.PHONY: podman-push
14+
podman-push: podman-immutable-push podman-mutable-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)