Skip to content

Commit

Permalink
Untrack config.yml (iv-org#1557)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
saltycrys authored Dec 10, 2020
1 parent 2349a6a commit b566c4b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
/.vscode/
/invidious
/sentry
/config/config.yml
File renamed without changes.
6 changes: 4 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion spec/helpers_spec.cr
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b566c4b

Please sign in to comment.