Switch back to running on github action itself.

.github/workflows/bouncer.yml

@@ -14,7 +14,7 @@ on:
 jobs:
   bouncer-build:
     name: "Bake Bouncer Container"
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
       - uses: docker/setup-qemu-action@v1

.github/workflows/lint.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   lint:
     name: Lint Docker Files
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:

.github/workflows/mariadb.yml

@@ -14,7 +14,7 @@ on:
 jobs:
   mariadb-build:
     name: "MariaDB with Healthchecks"
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     needs: [ lint ]
     steps:
       - uses: actions/checkout@v1

.github/workflows/marshall.yml

@@ -15,7 +15,7 @@ jobs:
 
   build:
     name: "Build Marshall"
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
       - uses: docker/setup-qemu-action@v1

.github/workflows/mqtt.yml

@@ -14,7 +14,7 @@ on:
 jobs:
   MQTT-build:
     name: "MQTT"
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
       - uses: docker/setup-qemu-action@v1

.github/workflows/octoprint.yml

@@ -14,7 +14,7 @@ on:
 jobs:
   octoprint-build:
     name: "Bake Octoprint"
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
       - uses: docker/setup-qemu-action@v1
@@ -35,7 +35,7 @@ jobs:
           tags: matthewbaggett/octoprint:latest
   octoprint-mjpg-build:
     name: "Bake Octoprint for yuvu cameras"
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
       - uses: docker/setup-qemu-action@v1

.github/workflows/php-core.yml

@@ -16,7 +16,7 @@ jobs:
 
   php-build-core:
     name: "Build PHP Core"
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:

.github/workflows/php-flavours.yml

@@ -17,7 +17,7 @@ on:
 jobs:
   php-build-flavours:
     name: "Build PHP Flavours"
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:

.github/workflows/php-vanity-tags.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   php-vanity-tags:
     name: Vanity Tags
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     env:
       latest-stable-version: "7.4"
     strategy:

.github/workflows/redis.yml

@@ -14,7 +14,7 @@ on:
 jobs:
   redis-build:
     name: "Redis with Healthchecks"
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
       - uses: docker/setup-qemu-action@v1

.github/workflows/wordpress.yml

@@ -14,7 +14,7 @@ on:
 jobs:
   wordpress-build:
     name: "Bake Wordpress Container"
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
       - uses: docker/setup-qemu-action@v1

marshall/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM ubuntu:focal
 
 LABEL maintainer="Matthew Baggett <matthew@baggett.me>" \
       org.label-schema.vcs-url="https://github.com/benzine-framework/docker" \

marshall/installers/004_gpgagent.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+source /installers/config
+$APT_GET gpg-agent

php/Dockerfile.Flavours

@@ -144,7 +144,7 @@ RUN apt-get -qq update && \
         && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/lib/dpkg/status.old /var/cache/debconf/templates.dat /var/log/dpkg.log /var/log/lastlog /var/log/apt/*.log && \
-    \
+    \p
     sed -i "s/upload_max_filesize.*/upload_max_filesize = $PHP_DATA_MAX_SIZE/g" /etc/php/$PHP_VERSION/apache2/php.ini && \
     sed -i "s/post_max_size.*/post_max_size = $PHP_DATA_MAX_SIZE/g" /etc/php/$PHP_VERSION/apache2/php.ini && \
     sed -i "s/max_execution_time.*/max_execution_time = 0/g" /etc/php/$PHP_VERSION/apache2/php.ini && \

php/Makefile

@@ -3,9 +3,7 @@ BUILD:=docker build
 docker-marshall:
 	$(BUILD) \
 		--tag benzine/marshall:latest \
-		--target marshall \
-		--file Dockerfile.Marshall \
-		.
+ 		../marshall
 
 docker-php-core:
 	$(BUILD) \