From 743e6d620219d7b31e611c88051a560927b02780 Mon Sep 17 00:00:00 2001 From: toast-gear <15716903+toast-gear@users.noreply.github.com> Date: Fri, 30 Jul 2021 11:58:04 +0100 Subject: [PATCH] feat: bump runner version (#705) * feat: bump runner version * feat: remove deprecated env var * docs: updating the docs Co-authored-by: Callum James Tait --- .github/workflows/build-and-release-runners.yml | 2 +- README.md | 2 +- runner/Dockerfile | 2 +- runner/Dockerfile.dindrunner | 2 +- runner/Dockerfile.ubuntu.1804 | 2 +- runner/Makefile | 2 +- runner/entrypoint.sh | 7 +------ 7 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-and-release-runners.yml b/.github/workflows/build-and-release-runners.yml index e1a6149e..088d0680 100644 --- a/.github/workflows/build-and-release-runners.yml +++ b/.github/workflows/build-and-release-runners.yml @@ -35,7 +35,7 @@ jobs: os-version: 20.04 dockerfile: Dockerfile.dindrunner env: - RUNNER_VERSION: 2.278.0 + RUNNER_VERSION: 2.279.0 DOCKER_VERSION: 19.03.12 DOCKERHUB_USERNAME: ${{ secrets.DOCKER_USER }} steps: diff --git a/README.md b/README.md index d0413fe6..d1fdab03 100644 --- a/README.md +++ b/README.md @@ -1114,7 +1114,7 @@ configuration script tries to communicate with the network. > Newer Istio instances can use Istio's `holdApplicationUntilProxyStarts` attribute ([istio/istio#11130](https://github.com/istio/istio/issues/11130)) to avoid having to delay starting up the runner. > Please read the discussion in [#592](https://github.com/actions-runner-controller/actions-runner-controller/pull/592) for more information. -_Note: Prior to the runner immutable tag `82d1be7` or the date `2021-07-03` for the mutable tags, the environment variable referenced below was called `STARTUP_DELAY`. This has been deprecated and will be removed from the codebase later (currently we check for both). If you are using this feature please update to using `STARTUP_DELAY_IN_SECONDS` instead when you next upgrade your runner image to a current release._ +_Note: Prior to the runner version v2.279.0, the environment variable referenced below was called `STARTUP_DELAY`._ You can add a delay to the runner's entrypoint script by setting the `STARTUP_DELAY_IN_SECONDS` environment variable for the runner pod. This will cause the script to sleep X seconds, this works with any runner kind. diff --git a/runner/Dockerfile b/runner/Dockerfile index 8b9aa1a0..22bc8097 100644 --- a/runner/Dockerfile +++ b/runner/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:20.04 ARG TARGETPLATFORM -ARG RUNNER_VERSION=2.278.0 +ARG RUNNER_VERSION=2.279.0 ARG DOCKER_VERSION=19.03.12 RUN test -n "$TARGETPLATFORM" || (echo "TARGETPLATFORM must be set" && false) diff --git a/runner/Dockerfile.dindrunner b/runner/Dockerfile.dindrunner index abdf19a6..363d94a5 100644 --- a/runner/Dockerfile.dindrunner +++ b/runner/Dockerfile.dindrunner @@ -48,7 +48,7 @@ RUN adduser --disabled-password --gecos "" --uid 1000 runner \ && echo "%sudo ALL=(ALL:ALL) NOPASSWD:ALL" > /etc/sudoers ARG TARGETPLATFORM -ARG RUNNER_VERSION=2.278.0 +ARG RUNNER_VERSION=2.279.0 ARG DOCKER_CHANNEL=stable ARG DOCKER_VERSION=19.03.13 ARG DEBUG=false diff --git a/runner/Dockerfile.ubuntu.1804 b/runner/Dockerfile.ubuntu.1804 index ade028b1..f836d85d 100644 --- a/runner/Dockerfile.ubuntu.1804 +++ b/runner/Dockerfile.ubuntu.1804 @@ -1,7 +1,7 @@ FROM ubuntu:18.04 ARG TARGETPLATFORM -ARG RUNNER_VERSION=2.278.0 +ARG RUNNER_VERSION=2.279.0 ARG DOCKER_VERSION=19.03.12 RUN test -n "$TARGETPLATFORM" || (echo "TARGETPLATFORM must be set" && false) diff --git a/runner/Makefile b/runner/Makefile index cd10cfdb..65e06f55 100644 --- a/runner/Makefile +++ b/runner/Makefile @@ -2,7 +2,7 @@ NAME ?= summerwind/actions-runner DIND_RUNNER_NAME ?= ${NAME}-dind TAG ?= latest -RUNNER_VERSION ?= 2.278.0 +RUNNER_VERSION ?= 2.279.0 DOCKER_VERSION ?= 19.03.12 # default list of platforms for which multiarch image is built diff --git a/runner/entrypoint.sh b/runner/entrypoint.sh index a3bf4fc2..7716fc0f 100755 --- a/runner/entrypoint.sh +++ b/runner/entrypoint.sh @@ -1,11 +1,6 @@ #!/bin/bash -# TODO: Remove `STARTUP_DELAY` entirely. `STARTUP_DELAY` is deprecated -# Issue #673, PR #678 -if [ ! -z "${STARTUP_DELAY}" ]; then - echo "Delaying startup by ${STARTUP_DELAY} seconds" 1>&2 - sleep ${STARTUP_DELAY} -elif [ ! -z "${STARTUP_DELAY_IN_SECONDS}" ]; then +if [ ! -z "${STARTUP_DELAY_IN_SECONDS}" ]; then echo "Delaying startup by ${STARTUP_DELAY_IN_SECONDS} seconds" 1>&2 sleep ${STARTUP_DELAY_IN_SECONDS} fi