Merge pull request #6 from fullstack-devops/bugfix/kaniko-builder

Bugfix/kaniko builder

Author: eksrha

.gitignore

@@ -0,0 +1 @@
+.env

README.md

@@ -73,7 +73,7 @@ volumes:
 
 services:
   github-action-runner:
-    image: github-action-runner:base-latest
+    image: ghcr.io/fullstack-devops/github-actions-runner:base-latest
     environment:
       GH_ORG: fullstack-devops
       GH_ACCESS_TOKEN: ghp_****
@@ -82,7 +82,7 @@ services:
       - kaniko_workspace:/kaniko/workspace
 
   github-action-runner-kaniko:
-    image: github-action-runner:kaniko-sidecar-latest
+    image: ghcr.io/fullstack-devops/github-actions-runner:kaniko-sidecar-latest
     volumes:
       - kaniko_workspace:/kaniko/workspace
 ```

examples/docker-compose/.env-template

@@ -0,0 +1 @@
+export GH_ACCESS_TOKEN=""

examples/docker-compose/docker-compose.yml

@@ -0,0 +1,20 @@
+version: "3"
+
+volumes:
+  kaniko_workspace:
+      driver: local
+
+services:
+  github-action-runner:
+    image: ghcr.io/fullstack-devops/github-actions-runner:base-latest
+    environment:
+      GH_ORG: fullstack-devops
+      KANIKO_ENABLED: "true"
+      GH_ACCESS_TOKEN: ${GH_ACCESS_TOKEN}
+    volumes:
+      - kaniko_workspace:/kaniko/workspace
+
+  github-action-runner-kaniko:
+    image: ghcr.io/fullstack-devops/github-actions-runner:kaniko-sidecar-latest
+    volumes:
+      - kaniko_workspace:/kaniko/workspace

images/base/Dockerfile

@@ -45,7 +45,8 @@ WORKDIR /home/${USERNAME}/runner
 # add a non-sudo user
 RUN useradd -m $USERNAME \
   && usermod -aG sudo $USERNAME \
-  && chown -R $USERNAME /home/${USERNAME} \
+  && chown -R $USERNAME $GH_RUNNER_WORKDIR \
+  && chown -R $USERNAME $GH_KANIKO_WORKDIR \
   && mkdir -p ${RUNNER_HOME}
 
 # Install github runner

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

@@ -43,6 +43,7 @@ fi
 if [ "$KANIKO_ENABLED" == "true" ]; then
     readonly GH_WORKDIR=$GH_KANIKO_WORKDIR
     echo "Build container via Kaniko: enabled"
+    GH_RUNNER_LABELS="${GH_RUNNER_LABELS},kaniko"
 else
     readonly GH_WORKDIR=$GH_RUNNER_WORKDIR
     echo "Build container via Kaniko: disabled"

images/base/helper-scripts/kaniko-wrapper.sh

@@ -12,7 +12,7 @@ if [ -p $returnpipe ]; then
     echo "Warning: removed stale communication returncode file with kaniko"
 fi
 echo "cd ${PWD}" > /kaniko/workspace/start.sh
-echo "/kaniko/executor --cleanup $@" >> /kaniko/workspace/start.sh
+echo "/kaniko/executor --cleanup --force $@" >> /kaniko/workspace/start.sh
 mkfifo $returnpipe
 mkfifo $logpipe
 cat $logpipe