chore: clean up the dind rootless dockerfile so it aligns with the other runners (#1926)
* chore: align dockerfile with other runners * chore: superfluous comments * feat: make docker compose download arch aware * chore: stuff * chore: align runner tool cache set-up * fix: copy and paste error * feat: add container hooks * feat: add rootless into makefile * feat: support all architectures and fix compose * fix: export SKIP_IPTABLES correctly Co-authored-by: toast-gear <toast-gear@users.noreply.github.com>
This commit is contained in:
@@ -2,6 +2,7 @@ DOCKER_USER ?= summerwind
|
||||
DOCKER ?= docker
|
||||
NAME ?= ${DOCKER_USER}/actions-runner
|
||||
DIND_RUNNER_NAME ?= ${DOCKER_USER}/actions-runner-dind
|
||||
DIND_ROOTLESS_RUNNER_NAME ?= ${DOCKER_USER}/actions-runner-dind-rootless
|
||||
TAG ?= latest
|
||||
TARGETPLATFORM ?= $(shell arch)
|
||||
|
||||
@@ -40,10 +41,18 @@ docker-build-ubuntu:
|
||||
--build-arg DOCKER_VERSION=${DOCKER_VERSION} \
|
||||
-f actions-runner-dind.dockerfile \
|
||||
-t ${DIND_RUNNER_NAME}:${TAG} .
|
||||
${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-rootless.dockerfile \
|
||||
-t ${DIND_ROOTLESS_RUNNER_NAME}:${TAG} .
|
||||
|
||||
docker-push-ubuntu:
|
||||
${DOCKER} push ${NAME}:${TAG}
|
||||
${DOCKER} push ${DIND_RUNNER_NAME}:${TAG}
|
||||
${DOCKER} push ${DIND_ROOTLESS_RUNNER_NAME}:${TAG}
|
||||
|
||||
docker-buildx-ubuntu:
|
||||
export DOCKER_CLI_EXPERIMENTAL=enabled ;\
|
||||
|
||||
Reference in New Issue
Block a user