diff --git a/deployments/helm-ubi8-test.yml b/deployments/helm-ubi8-test.yml index fdf271d..e21c5f4 100644 --- a/deployments/helm-ubi8-test.yml +++ b/deployments/helm-ubi8-test.yml @@ -33,4 +33,4 @@ template: - name: runner image: ghcr.io/some-natalie/kubernoodles/ubi8:test imagePullPolicy: Always - command: ["/actions-runner/run.sh"] + command: ["/home/runner/run.sh"] diff --git a/deployments/helm-ubi8.yml b/deployments/helm-ubi8.yml index 7ea3a43..450fc99 100644 --- a/deployments/helm-ubi8.yml +++ b/deployments/helm-ubi8.yml @@ -32,4 +32,4 @@ template: containers: - name: runner image: ghcr.io/some-natalie/kubernoodles/ubi8:latest - command: ["/actions-runner/run.sh"] \ No newline at end of file + command: ["/home/runner/run.sh"] \ No newline at end of file diff --git a/deployments/helm-ubi9-test.yml b/deployments/helm-ubi9-test.yml index b1b06fb..a48a938 100644 --- a/deployments/helm-ubi9-test.yml +++ b/deployments/helm-ubi9-test.yml @@ -33,4 +33,4 @@ template: - name: runner image: ghcr.io/some-natalie/kubernoodles/ubi9:test imagePullPolicy: Always - command: ["/actions-runner/run.sh"] \ No newline at end of file + command: ["/home/runner/run.sh"] \ No newline at end of file diff --git a/deployments/helm-ubi9.yml b/deployments/helm-ubi9.yml index ee31161..87ea4a0 100644 --- a/deployments/helm-ubi9.yml +++ b/deployments/helm-ubi9.yml @@ -32,4 +32,4 @@ template: containers: - name: runner image: ghcr.io/some-natalie/kubernoodles/ubi9:latest - command: ["/actions-runner/run.sh"] + command: ["/home/runner/run.sh"] diff --git a/deployments/helm-wolfi-test.yml b/deployments/helm-wolfi-test.yml index 24ea23c..feae0e0 100644 --- a/deployments/helm-wolfi-test.yml +++ b/deployments/helm-wolfi-test.yml @@ -40,13 +40,13 @@ template: containers: - name: runner image: ghcr.io/some-natalie/kubernoodles/wolfi-runner:test - command: ["/actions-runner/run.sh"] + command: ["/home/runner/run.sh"] securityContext: runAsUser: 100 runAsGroup: 100 env: - name: ACTIONS_RUNNER_CONTAINER_HOOKS - value: /actions-runner/k8s/index.js + value: /home/runner/k8s/index.js - name: ACTIONS_RUNNER_POD_NAME valueFrom: fieldRef: @@ -55,7 +55,7 @@ template: value: "false" # allow non-container steps volumeMounts: - name: work - mountPath: /actions-runner/_work + mountPath: /home/runner/_work containerMode: type: "kubernetes" diff --git a/deployments/helm-wolfi.yml b/deployments/helm-wolfi.yml index 6d42388..b0a461a 100644 --- a/deployments/helm-wolfi.yml +++ b/deployments/helm-wolfi.yml @@ -39,13 +39,13 @@ template: containers: - name: runner image: ghcr.io/some-natalie/kubernoodles/wolfi-runner:test - command: ["/actions-runner/run.sh"] + command: ["/home/runner/run.sh"] securityContext: runAsUser: 100 runAsGroup: 100 env: - name: ACTIONS_RUNNER_CONTAINER_HOOKS - value: /actions-runner/k8s/index.js + value: /home/runner/k8s/index.js - name: ACTIONS_RUNNER_POD_NAME valueFrom: fieldRef: @@ -54,7 +54,7 @@ template: value: "false" # allow non-container steps volumeMounts: - name: work - mountPath: /actions-runner/_work + mountPath: /home/runner/_work containerMode: type: "kubernetes" diff --git a/images/ubi8.Dockerfile b/images/ubi8.Dockerfile index ac8fd58..d5e42a8 100644 --- a/images/ubi8.Dockerfile +++ b/images/ubi8.Dockerfile @@ -45,10 +45,10 @@ RUN useradd -G 0 $USERNAME ENV HOME /home/${USERNAME} # Make and set the working directory -RUN mkdir -p /actions-runner \ - && chown -R $USERNAME:$GID /actions-runner +RUN mkdir -p /home/runner \ + && chown -R $USERNAME:$GID /home/runner -WORKDIR /actions-runner +WORKDIR /home/runner # Install GitHub CLI COPY images/software/gh-cli.sh gh-cli.sh @@ -80,7 +80,7 @@ RUN curl -f -L -o runner-container-hooks.zip /~https://github.com/actions/runner-c # Copy in custom logger and startup script COPY images/logger.sh images/startup.sh /usr/bin/ RUN chmod +x /usr/bin/startup.sh \ - && chown -R $USERNAME:$UID /actions-runner + && chown -R $USERNAME:$UID /home/runner USER $USERNAME diff --git a/images/ubi9.Dockerfile b/images/ubi9.Dockerfile index c90305e..26cdc74 100644 --- a/images/ubi9.Dockerfile +++ b/images/ubi9.Dockerfile @@ -45,10 +45,10 @@ RUN useradd -G 0 $USERNAME ENV HOME /home/${USERNAME} # Make and set the working directory -RUN mkdir -p /actions-runner \ - && chown -R $USERNAME:$GID /actions-runner +RUN mkdir -p /home/runner \ + && chown -R $USERNAME:$GID /home/runner -WORKDIR /actions-runner +WORKDIR /home/runner # Install GitHub CLI COPY images/software/gh-cli.sh gh-cli.sh @@ -80,7 +80,7 @@ RUN curl -f -L -o runner-container-hooks.zip /~https://github.com/actions/runner-c # Copy in custom logger and startup script COPY images/logger.sh images/startup.sh /usr/bin/ RUN chmod +x /usr/bin/startup.sh \ - && chown -R $USERNAME:$UID /actions-runner + && chown -R $USERNAME:$UID /home/runner USER $USERNAME diff --git a/images/wolfi.Dockerfile b/images/wolfi.Dockerfile index c55a5fc..121f52d 100644 --- a/images/wolfi.Dockerfile +++ b/images/wolfi.Dockerfile @@ -43,10 +43,10 @@ RUN apk update \ RUN export PATH=$HOME/.local/bin:$PATH # Make and set the working directory -RUN mkdir -p /actions-runner \ - && chown -R runner:runner /actions-runner +RUN mkdir -p /home/runner \ + && chown -R runner:runner /home/runner -WORKDIR /actions-runner +WORKDIR /home/runner RUN test -n "$TARGETPLATFORM" || (echo "TARGETPLATFORM must be set" && false) @@ -58,8 +58,8 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \ && rm runner.tar.gz # remove bundled nodejs and symlink to system nodejs -RUN rm /actions-runner/externals/node16/bin/node && ln -s /usr/bin/node /actions-runner/externals/node16/bin/node -RUN rm /actions-runner/externals/node20/bin/node && ln -s /usr/bin/node /actions-runner/externals/node20/bin/node +RUN rm /home/runner/externals/node16/bin/node && ln -s /usr/bin/node /home/runner/externals/node16/bin/node +RUN rm /home/runner/externals/node20/bin/node && ln -s /usr/bin/node /home/runner/externals/node20/bin/node # Install container hooks RUN curl -f -L -o runner-container-hooks.zip /~https://github.com/actions/runner-container-hooks/releases/download/v${RUNNER_CONTAINER_HOOKS_VERSION}/actions-runner-hooks-k8s-${RUNNER_CONTAINER_HOOKS_VERSION}.zip \ @@ -75,7 +75,7 @@ RUN chmod -R 777 /opt /usr/share # Copy in custom logger and startup script COPY images/logger.sh images/startup.sh /usr/bin/ RUN chmod +x /usr/bin/startup.sh \ - && chown -R runner:runner /actions-runner + && chown -R runner:runner /home/runner USER runner