From 06aea8bc1a00f839f5a358b82e35cc63e67530e7 Mon Sep 17 00:00:00 2001
From: Luke Childs <lukechilds123@gmail.com>
Date: Sat, 10 Apr 2021 22:30:37 +0700
Subject: [PATCH] Remove seperate build image (#86)

---
 .github/workflows/on-push-builder.yml | 49 ---------------------------
 Dockerfile                            |  5 ++-
 Dockerfile.builder                    |  8 -----
 3 files changed, 4 insertions(+), 58 deletions(-)
 delete mode 100644 .github/workflows/on-push-builder.yml
 delete mode 100644 Dockerfile.builder

diff --git a/.github/workflows/on-push-builder.yml b/.github/workflows/on-push-builder.yml
deleted file mode 100644
index 629a224..0000000
--- a/.github/workflows/on-push-builder.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-name: Build manager-builder image on push
-env:
-        DOCKER_CLI_EXPERIMENTAL: enabled
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-        build:
-                runs-on: ubuntu-18.04
-                name: Build and push manager-builder image
-                steps:                               
-                        - name: Login to Docker Hub
-                          run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-
-                        - name: Checkout project
-                          uses: actions/checkout@v2
-
-                        - name: Set up QEMU
-                          uses: docker/setup-qemu-action@v1
-                          id: qemu
-
-                        - name: Setup Docker buildx action
-                          uses: docker/setup-buildx-action@v1
-                          id: buildx
-
-                        - name: Cache Docker layers
-                          uses: actions/cache@v2
-                          id: cache
-                          with:
-                            path: /tmp/.buildx-cache
-                            key: ${{ runner.os }}-buildx-${{ github.sha }}
-                            restore-keys: |
-                              ${{ runner.os }}-buildx-
-
-                        - name: Show available buildx platforms
-                          run: echo ${{ steps.buildx.outputs.platforms }}
-                          
-                        - name: Run Docker buildx
-                          run: |
-                                  docker buildx build \
-                                  --cache-from "type=local,src=/tmp/.buildx-cache" \
-                                  --cache-to "type=local,dest=/tmp/.buildx-cache" \
-                                  --platform linux/amd64,linux/arm64,linux/arm/v7 \
-                                  --file Dockerfile.builder \
-                                  --tag ${{ secrets.DOCKER_HUB_USER }}/manager-builder:latest \
-                                  --output "type=registry" ./
diff --git a/Dockerfile b/Dockerfile
index 56e6690..8215d88 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,8 @@
 # Build Stage
-FROM getumbrel/manager-builder:latest AS umbrel-manager-builder
+FROM node:12-buster-slim as umbrel-manager-builder
+
+# Install tools
+RUN apt-get update && apt-get install -y build-essential libffi-dev libssl-dev python3
 
 # Create app directory
 WORKDIR /app
diff --git a/Dockerfile.builder b/Dockerfile.builder
deleted file mode 100644
index 6bb9bc5..0000000
--- a/Dockerfile.builder
+++ /dev/null
@@ -1,8 +0,0 @@
-# Build Stage
-FROM node:12-buster-slim
-
-# Install tools
-RUN apt-get update \
-    && apt-get install -y build-essential \
-    && apt-get install -y libffi-dev \
-    && apt-get install -y libssl-dev