From 2196b53075b5a2d71de848532aede54ffb955c51 Mon Sep 17 00:00:00 2001
From: Redblueflame <redblueflame1@gmail.Com>
Date: Sat, 29 Aug 2020 16:56:50 +0200
Subject: [PATCH] Switched base container for the docker build (#57)

---
 .dockerignore                               | 3 ++-
 .github/workflows/docker-compile-master.yml | 7 +++----
 .github/workflows/docker-compile-tag.yml    | 7 +++----
 .github/workflows/docker-compile.yml        | 4 ++--
 Dockerfile                                  | 9 +++++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 796603f34..633fa76f3 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,3 @@
 target
-.env
\ No newline at end of file
+.env
+Dockerfile
\ No newline at end of file
diff --git a/.github/workflows/docker-compile-master.yml b/.github/workflows/docker-compile-master.yml
index c942698cf..fb3b44b93 100644
--- a/.github/workflows/docker-compile-master.yml
+++ b/.github/workflows/docker-compile-master.yml
@@ -16,10 +16,9 @@ jobs:
       - name: Build and push Docker images
         uses: docker/build-push-action@v1
         with:
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          registry: docker.pkg.github.com
-          repository: modrinth/labrinth/labrinth
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: modrinth/labrinth
           tag_with_ref: false
           tags: master
           tag_with_sha: true
\ No newline at end of file
diff --git a/.github/workflows/docker-compile-tag.yml b/.github/workflows/docker-compile-tag.yml
index a0088ef65..42398a94d 100644
--- a/.github/workflows/docker-compile-tag.yml
+++ b/.github/workflows/docker-compile-tag.yml
@@ -17,10 +17,9 @@ jobs:
       - name: Build and push Docker images
         uses: docker/build-push-action@v1
         with:
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          registry: docker.pkg.github.com
-          repository: modrinth/labrinth/labrinth
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: modrinth/labrinth
           tag_with_ref: true
           tags: latest
           tag_with_sha: true
\ No newline at end of file
diff --git a/.github/workflows/docker-compile.yml b/.github/workflows/docker-compile.yml
index 728ec34cd..cec1e2d8a 100644
--- a/.github/workflows/docker-compile.yml
+++ b/.github/workflows/docker-compile.yml
@@ -2,8 +2,8 @@ name: Docker image build
 
 on:
   push:
-    branches:
-    - !master
+    branches-ignore:
+    - master
   pull_request:
 env:
   CARGO_TERM_COLOR: always
diff --git a/Dockerfile b/Dockerfile
index 2006f252d..6f716e860 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,10 +23,11 @@ ARG SQLX_OFFLINE=true
 RUN cargo build --release
 
 
-FROM gcr.io/distroless/cc-debian10
-COPY --from=build /usr/src/labrinth/target/release/labrinth /labrinth
-COPY --from=build /usr/src/labrinth/target/release/migrations/* /labrinth/migrations/
+FROM bitnami/minideb:latest
+RUN install_packages openssl
+COPY --from=build /usr/src/labrinth/target/release/labrinth /labrinth/labrinth
+COPY --from=build /usr/src/labrinth/migrations/* /labrinth/migrations/
 COPY --from=build /wait /wait
 WORKDIR /labrinth
 
-CMD /wait && /opt/labrinth
+CMD /wait && /labrinth/labrinth