chore: add missing make targets and bcump
This commit is contained in:
parent
469cc8ac21
commit
ef79cfe6d0
|
|
@ -3,7 +3,7 @@ DOCKER ?= docker
|
||||||
DEFAULT_RUNNER_NAME ?= ${DOCKER_USER}/actions-runner
|
DEFAULT_RUNNER_NAME ?= ${DOCKER_USER}/actions-runner
|
||||||
DIND_RUNNER_NAME ?= ${DOCKER_USER}/actions-runner-dind
|
DIND_RUNNER_NAME ?= ${DOCKER_USER}/actions-runner-dind
|
||||||
DIND_ROOTLESS_RUNNER_NAME ?= ${DOCKER_USER}/actions-runner-dind-rootless
|
DIND_ROOTLESS_RUNNER_NAME ?= ${DOCKER_USER}/actions-runner-dind-rootless
|
||||||
OS_IMAGE ?= ubuntu-20.04
|
OS_IMAGE ?= ubuntu-22.04
|
||||||
TARGETPLATFORM ?= $(shell arch)
|
TARGETPLATFORM ?= $(shell arch)
|
||||||
|
|
||||||
RUNNER_VERSION ?= 2.299.1
|
RUNNER_VERSION ?= 2.299.1
|
||||||
|
|
@ -50,6 +50,7 @@ docker-build-set: check-target-platform
|
||||||
${DOCKER} build \
|
${DOCKER} build \
|
||||||
--build-arg TARGETPLATFORM=${TARGETPLATFORM} \
|
--build-arg TARGETPLATFORM=${TARGETPLATFORM} \
|
||||||
--build-arg RUNNER_VERSION=${RUNNER_VERSION} \
|
--build-arg RUNNER_VERSION=${RUNNER_VERSION} \
|
||||||
|
--build-arg RUNNER_CONTAINER_HOOKS_VERSION=${RUNNER_CONTAINER_HOOKS_VERSION} \
|
||||||
--build-arg DOCKER_VERSION=${DOCKER_VERSION} \
|
--build-arg DOCKER_VERSION=${DOCKER_VERSION} \
|
||||||
-f actions-runner-dind.${OS_IMAGE}.dockerfile \
|
-f actions-runner-dind.${OS_IMAGE}.dockerfile \
|
||||||
-t ${DIND_RUNNER_NAME}:${OS_IMAGE} .
|
-t ${DIND_RUNNER_NAME}:${OS_IMAGE} .
|
||||||
|
|
@ -60,6 +61,30 @@ docker-build-set: check-target-platform
|
||||||
-f actions-runner-dind-rootless.${OS_IMAGE}.dockerfile \
|
-f actions-runner-dind-rootless.${OS_IMAGE}.dockerfile \
|
||||||
-t "${DIND_ROOTLESS_RUNNER_NAME}:${OS_IMAGE}" .
|
-t "${DIND_ROOTLESS_RUNNER_NAME}:${OS_IMAGE}" .
|
||||||
|
|
||||||
|
docker-build-default: check-target-platform
|
||||||
|
${DOCKER} build \
|
||||||
|
--build-arg TARGETPLATFORM=${TARGETPLATFORM} \
|
||||||
|
--build-arg RUNNER_VERSION=${RUNNER_VERSION} \
|
||||||
|
--build-arg RUNNER_CONTAINER_HOOKS_VERSION=${RUNNER_CONTAINER_HOOKS_VERSION} \
|
||||||
|
--build-arg DOCKER_VERSION=${DOCKER_VERSION} \
|
||||||
|
-f actions-runner.${OS_IMAGE}.dockerfile \
|
||||||
|
-t ${DEFAULT_RUNNER_NAME}:${OS_IMAGE} .
|
||||||
|
|
||||||
|
docker-build-dind: check-target-platform
|
||||||
|
${DOCKER} build \
|
||||||
|
--build-arg TARGETPLATFORM=${TARGETPLATFORM} \
|
||||||
|
--build-arg RUNNER_VERSION=${RUNNER_VERSION} \
|
||||||
|
--build-arg RUNNER_CONTAINER_HOOKS_VERSION=${RUNNER_CONTAINER_HOOKS_VERSION} \
|
||||||
|
--build-arg DOCKER_VERSION=${DOCKER_VERSION} \
|
||||||
|
-f actions-runner-dind.${OS_IMAGE}.dockerfile \
|
||||||
|
-t ${DIND_RUNNER_NAME}:${OS_IMAGE} .
|
||||||
|
|
||||||
|
docker-push-default:
|
||||||
|
${DOCKER} push "${DEFAULT_RUNNER_NAME}:${OS_IMAGE}"
|
||||||
|
|
||||||
|
docker-push-dind:
|
||||||
|
${DOCKER} push "${DIND_RUNNER_NAME}:${OS_IMAGE}"
|
||||||
|
|
||||||
docker-push-set:
|
docker-push-set:
|
||||||
${DOCKER} push "${DEFAULT_RUNNER_NAME}:${OS_IMAGE}"
|
${DOCKER} push "${DEFAULT_RUNNER_NAME}:${OS_IMAGE}"
|
||||||
${DOCKER} push "${DIND_RUNNER_NAME}:${OS_IMAGE}"
|
${DOCKER} push "${DIND_RUNNER_NAME}:${OS_IMAGE}"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue