ProjectSegfault/invidious-experimenting
4
0
Fork 0
forked from midou/invidious
Code Pull Requests Activity

Untrack config.yml (#1557)

Browse Source 
* 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
This commit is contained in:
saltycrys 2020-12-10 08:18:30 +01:00 committed by GitHub
parent 2349a6ab0c
commit b566c4ba1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,3 +6,4 @@
/.vscode/ /.vscode/
/invidious /invidious
/sentry /sentry
/config/config.yml

0
config/config.yml → config/config.example.yml
View File

6
docker/Dockerfile
View File

@ -2,7 +2,8 @@ FROM crystallang/crystal:0.35.1-alpine AS builder
RUN apk add --no-cache curl sqlite-static RUN apk add --no-cache curl sqlite-static
WORKDIR /invidious WORKDIR /invidious
COPY ./shard.yml ./shard.yml COPY ./shard.yml ./shard.yml
RUN shards update && shards install && \ COPY ./shard.lock ./shard.lock
RUN shards install && \
# TODO: Document build instructions # TODO: Document build instructions
# See https://github.com/omarroth/boringssl-alpine/blob/master/APKBUILD, # See https://github.com/omarroth/boringssl-alpine/blob/master/APKBUILD,
# https://github.com/omarroth/lsquic-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 && \ RUN addgroup -g 1000 -S invidious && \
adduser -u 1000 -S invidious -G invidious adduser -u 1000 -S invidious -G invidious
COPY ./assets/ ./assets/ 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 RUN sed -i 's/host: \(127.0.0.1\|localhost\)/host: postgres/' config/config.yml
COPY ./config/sql/ ./config/sql/ COPY ./config/sql/ ./config/sql/
COPY ./locales/ ./locales/ COPY ./locales/ ./locales/

2
spec/helpers_spec.cr
View File

@ -12,7 +12,7 @@ require "../src/invidious/search"
require "../src/invidious/trending" require "../src/invidious/trending"
require "../src/invidious/users" 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 "Helper" do
describe "#produce_channel_videos_url" do describe "#produce_channel_videos_url" do