Merge pull request #26 from fullstack-devops/bugfix/fix-entrypoint.sh-else

fix entrypoint.sh

Author: eksrha

README.md

@@ -53,12 +53,12 @@ If you are using `docker` or `podman` the options and commands are basically the
 
 Run registerd to an Organisation:
 ```bash
-docker run -e GH_ORG=fullstack-devops -e GH_ACCESS_TOKEN=ghp_**** github-actions-runner:latest
+docker run -e GH_ORG=fullstack-devops -e GH_ACCESS_TOKEN=ghp_**** ghcr.io/fullstack-devops/github-actions-runner:latest-base
 ```
 
 Run registerd to an Organisation and Repo:
 ```bash
-docker run -e GH_ORG=fullstack-devops -e GH_REPO=github-runner-testing -e GH_ACCESS_TOKEN=ghp_**** github-actions-runner:latest
+docker run -e GH_ORG=fullstack-devops -e GH_REPO=github-runner-testing -e GH_ACCESS_TOKEN=ghp_**** ghcr.io/fullstack-devops/github-actions-runner:latest-base
 ```
 
 > Replace the `ghp_****` with your own valid personal access token

images/base/Dockerfile

@@ -5,6 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 ARG PACKAGES="libffi-dev libicu-dev build-essential libssl-dev ca-certificates software-properties-common jq sed grep git curl wget zip python3-pip"
 
 ENV USERNAME="runner"
+ENV USERID=1000
 ENV UBUNTU_VERSION=20.04
 ENV RUNNER_HOME="/home/${USERNAME}/runner"
 
@@ -45,7 +46,7 @@ RUN export ARCH=$(/helper-scripts/translate-aarch.sh a-short)  \
 WORKDIR /home/${USERNAME}/runner
 
 # add a non-sudo user
-RUN useradd -m $USERNAME \
+RUN useradd -m -u $USERID $USERNAME \
   && usermod -aG sudo $USERNAME \
   && chown -R $USERNAME $GH_RUNNER_WORKDIR \
   && chown -R $USERNAME $GH_KANIKO_WORKDIR \

images/base/helper-scripts/gh-entrypoint.sh

@@ -65,7 +65,7 @@ cleanup() {
     echo "Removing runner..."
     if [ ! -z "$RUNNER_TOKEN" ]; then
         readonly REG_TOKEN=$RUNNER_TOKEN
-    else [ ! -z $GH_ACCESS_TOKEN ]; then
+    elif [ ! -z $GH_ACCESS_TOKEN ]; then
         readonly REG_TOKEN=$(curl -s -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: token $GH_ACCESS_TOKEN" $RUNNER_REG_TOKEN_URL | jq .token --raw-output)
     fi
     ${RUNNER_HOME}/config.sh remove --token ${REG_TOKEN}

images/kaniko-sidecar/Dockerfile

@@ -1,4 +1,4 @@
-FROM gcr.io/kaniko-project/executor:v1.8.0-debug
+FROM gcr.io/kaniko-project/executor:v1.8.1-debug
 
 COPY kaniko-entrypoint.sh /kaniko/kaniko-entrypoint.sh
 WORKDIR /