Merge pull request #9 from github-developer/fix/issues/4

Fixes for issues/4

Author: imjohnbo

Dockerfile

@@ -4,7 +4,7 @@ FROM ubuntu:18.04
 RUN apt-get update
 RUN apt-get install -y libssl-dev curl iputils-ping jq wget
 
-# Docker in docker for container builds on Kubernetes. Otherwise, follow this guidance: https://jpetazzo.github.io/2015/09/03/do-not-use-docker-in-docker-for-ci/.
+# Download Docker for container builds on Kubernetes
 ENV DOCKER_CHANNEL stable
 ENV DOCKER_VERSION 18.09.1
 RUN wget -O docker.tgz "https://download.docker.com/linux/static/${DOCKER_CHANNEL}/x86_64/docker-${DOCKER_VERSION}.tgz" && \
@@ -15,8 +15,19 @@ RUN wget -O docker.tgz "https://download.docker.com/linux/static/${DOCKER_CHANNE
 RUN mkdir ./actions-runner
 WORKDIR /home/actions-runner
 
-COPY startup.sh .
+# Download Actions runner
+# https://github.com/terraform-google-modules/terraform-google-github-actions-runners/blob/598a38a72b7bbaf56be431c07de04752c521fd60/examples/gh-runner-gke-dind/Dockerfile#L28-L31
+ARG GH_RUNNER_VERSION="2.169.1"
+RUN curl -o actions.tar.gz --location "https://github.com/actions/runner/releases/download/v${GH_RUNNER_VERSION}/actions-runner-linux-x64-${GH_RUNNER_VERSION}.tar.gz" && \
+    tar -zxf actions.tar.gz && \
+    rm -f actions.tar.gz
+
+# Install dependencies
+RUN ./bin/installdependencies.sh
 
-EXPOSE 8080
+# Allow runner to run as root
+ENV RUNNER_ALLOW_RUNASROOT=1
+
+COPY startup.sh .
 
 ENTRYPOINT ["./startup.sh"]

deployment.yml

@@ -35,5 +35,18 @@ spec:
       # Docker-in-Docker not recommended for production
       - name: dind
         image: docker:18.09-dind
+        resources:
+            requests:
+              memory: "512Mi"
+              cpu: "500m"
+            limits:
+              memory: "1024Mi"
+              cpu: "1"
         securityContext:
-          privileged: true
+          privileged: true
+        volumeMounts:
+          - name: dind-storage
+            mountPath: /var/lib/docker
+      volumes:
+        - name: dind-storage
+          emptyDir: {}

startup.sh

@@ -11,34 +11,11 @@ function remove_runner {
 # Watch for EXIT signal to be able to shut down gracefully
 trap remove_runner EXIT
 
-echo "## Finding latest release binary for Linux x64..."
-
-# Get latest binary version for Linux x64
-BINARY_URL=$(curl \
-  --url https://api.github.com/repos/$GITHUB_REPO/actions/runners/downloads \
-  --header "authorization: Bearer $TOKEN" | \
-  jq -r '.[] | select(.os=="linux") | select(.architecture=="x64") | .download_url')
-
-echo "## Downloading ${BINARY_URL}..."
-
-# Follow any redirects to download and unpack the binary
-curl -L $BINARY_URL | tar xz
-
-echo "## Finished downloading ${BINARY_URL}."
-
 # Generate 
 CONFIG_TOKEN=$(curl --data "" --header "Authorization: Bearer $TOKEN" https://api.github.com/repos/$GITHUB_REPO/actions/runners/registration-token | jq -r '.token')
 
-echo "Installing dependencies..."
-
-# Install dependencies
-./bin/installdependencies.sh
-
-# Allow runner to run as root
-export RUNNER_ALLOW_RUNASROOT=1
-
 # Create the runner and configure it
 ./config.sh --url https://github.com/$GITHUB_REPO --token $CONFIG_TOKEN --unattended
 
 # Run it
-./run.sh
+./runsvc.sh