From b566c4ba1a4b44044154b54e33f1fa45fc5b1e90 Mon Sep 17 00:00:00 2001
From: saltycrys <73420320+saltycrys@users.noreply.github.com>
Date: Thu, 10 Dec 2020 08:18:30 +0100
Subject: [PATCH] Untrack config.yml (#1557)

* Untrack config.yml

`config/config.yml` has been untracked and moved to `config/config.example.yml`.

The Dockerfile has been updated to copy all `config/config.*` files and to try
to move `config/config.example.yml` to `config/config.yml`. If a user supplied
`config/config.yml` exists it is not overwritten.

* Update Dockerfile to use `shard.lock`

* Fix tests
---
 .gitignore                                | 1 +
 config/{config.yml => config.example.yml} | 0
 docker/Dockerfile                         | 6 ++++--
 spec/helpers_spec.cr                      | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 rename config/{config.yml => config.example.yml} (100%)

diff --git a/.gitignore b/.gitignore
index 3bbfccf0c..1779a73d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /.vscode/
 /invidious
 /sentry
+/config/config.yml
diff --git a/config/config.yml b/config/config.example.yml
similarity index 100%
rename from config/config.yml
rename to config/config.example.yml
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 96f844fe0..7d4932fc5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,7 +2,8 @@ FROM crystallang/crystal:0.35.1-alpine AS builder
 RUN apk add --no-cache curl sqlite-static
 WORKDIR /invidious
 COPY ./shard.yml ./shard.yml
-RUN shards update && shards install && \
+COPY ./shard.lock ./shard.lock
+RUN shards install && \
     # TODO: Document build instructions
     # See https://github.com/omarroth/boringssl-alpine/blob/master/APKBUILD,
     # https://github.com/omarroth/lsquic-alpine/blob/master/APKBUILD,
@@ -23,7 +24,8 @@ WORKDIR /invidious
 RUN addgroup -g 1000 -S invidious && \
     adduser -u 1000 -S invidious -G invidious
 COPY ./assets/ ./assets/
-COPY --chown=invidious ./config/config.yml ./config/config.yml
+COPY --chown=invidious ./config/config.* ./config/
+RUN mv -n config/config.example.yml config/config.yml
 RUN sed -i 's/host: \(127.0.0.1\|localhost\)/host: postgres/' config/config.yml
 COPY ./config/sql/ ./config/sql/
 COPY ./locales/ ./locales/
diff --git a/spec/helpers_spec.cr b/spec/helpers_spec.cr
index dd7640749..d297759ec 100644
--- a/spec/helpers_spec.cr
+++ b/spec/helpers_spec.cr
@@ -12,7 +12,7 @@ require "../src/invidious/search"
 require "../src/invidious/trending"
 require "../src/invidious/users"
 
-CONFIG = Config.from_yaml(File.open("config/config.yml"))
+CONFIG = Config.from_yaml(File.open("config/config.example.yml"))
 
 describe "Helper" do
   describe "#produce_channel_videos_url" do