From 37766347a5fc5b78998ab72a2060d92e830b5418 Mon Sep 17 00:00:00 2001
From: tleydxdy <koubeshio@tutanota.com>
Date: Wed, 13 Nov 2019 08:57:12 -0500
Subject: [PATCH] Fix docker build for now

---
 docker/Dockerfile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 024b8416..f6e99ca9 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,6 @@
-FROM alpine:edge AS builder
+FROM alpine:edge
 RUN apk add --no-cache crystal shards libc-dev \
-    yaml-dev libxml2-dev sqlite-dev zlib-dev openssl-dev \
-    sqlite-static zlib-static openssl-libs-static
+    yaml-dev libxml2-dev sqlite-dev zlib-dev openssl-dev
 WORKDIR /invidious
 COPY ./shard.yml ./shard.yml
 RUN shards update && shards install
@@ -9,14 +8,12 @@ COPY ./src/ ./src/
 # TODO: .git folder is required for building – this is destructive.
 # See definition of CURRENT_BRANCH, CURRENT_COMMIT and CURRENT_VERSION.
 COPY ./.git/ ./.git/
-RUN crystal build --static --release --warnings all --error-on-warnings \
+RUN crystal build --release --warnings all --error-on-warnings \
 # TODO: Remove next line, see https://github.com/crystal-lang/crystal/issues/7946
     -Dmusl \
     ./src/invidious.cr
 
-FROM alpine:latest
 RUN apk add --no-cache librsvg ttf-opensans
-WORKDIR /invidious
 RUN addgroup -g 1000 -S invidious && \
     adduser -u 1000 -S invidious -G invidious
 COPY ./assets/ ./assets/
@@ -24,6 +21,5 @@ COPY ./config/config.yml ./config/config.yml
 COPY ./config/sql/ ./config/sql/
 COPY ./locales/ ./locales/
 RUN sed -i 's/host: \(127.0.0.1\|localhost\)/host: postgres/' config/config.yml
-COPY --from=builder /invidious/invidious .
 USER invidious
 CMD [ "/invidious/invidious" ]