diff options
| -rw-r--r-- | docker/Dockerfile | 10 | ||||
| -rw-r--r-- | spec/helpers_spec.cr | 2 | ||||
| -rw-r--r-- | src/invidious/channels.cr | 2 |
3 files changed, 5 insertions, 9 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" ] diff --git a/spec/helpers_spec.cr b/spec/helpers_spec.cr index 2719af8d..95222e0b 100644 --- a/spec/helpers_spec.cr +++ b/spec/helpers_spec.cr @@ -34,7 +34,7 @@ describe "Helper" do describe "#produce_channel_playlists_url" do it "correctly produces a /browse_ajax URL with the given UCID and cursor" do - produce_channel_playlists_url("UCCj956IF62FbT7Gouszaj9w", "AIOkY9EQpi_gyn1_QrFuZ1reN81_MMmI1YmlBblw8j7JHItEFG5h7qcJTNd4W9x5Quk_CVZ028gW").should eq("/browse_ajax?continuation=4qmFsgLJARIYVUNDajk1NklGNjJGYlQ3R291c3phajl3GqwBRWdod2JHRjViR2x6ZERBQ09BRmdBV29BdUFFQWVtWlJWV3hRWVRGck5WSldSbmRoVmpsdVpWYzBlRmd4Um5sU2JsWmhUVmhLYkZScVozaFlNREZPWWxWcmVGZFhNWE5SYlVwelpIcG9jVTR3Y0VsVFdGSkdVbXRqTVdGRVpIaFpNSEJWVkcxUk1GWjZiRFJPVmtZeFlURTVSRlpzYjNkTmFtaHVWbmNnQVJnRA%3D%3D&gl=US&hl=en") + produce_channel_playlists_url("UCCj956IF62FbT7Gouszaj9w", "AIOkY9EQpi_gyn1_QrFuZ1reN81_MMmI1YmlBblw8j7JHItEFG5h7qcJTNd4W9x5Quk_CVZ028gW").should eq("/browse_ajax?continuation=4qmFsgLNARIYVUNDajk1NklGNjJGYlQ3R291c3phajl3GrABRWdsd2JHRjViR2x6ZEhNd0FqZ0JZQUZxQUxnQkFIcG1VVlZzVUdFeGF6VlNWa1ozWVZZNWJtVlhOSGhZTVVaNVVtNVdZVTFZU214VWFtZDRXREF4VG1KVmEzaFhWekZ6VVcxS2MyUjZhSEZPTUhCSlUxaFNSbEpyWXpGaFJHUjRXVEJ3VlZSdFVUQldlbXcwVGxaR01XRXhPVVJXYkc5M1RXcG9ibFozSUFFWUF3PT0%3D&gl=US&hl=en") end end diff --git a/src/invidious/channels.cr b/src/invidious/channels.cr index 71ed4d59..10e826e5 100644 --- a/src/invidious/channels.cr +++ b/src/invidious/channels.cr @@ -484,7 +484,7 @@ def produce_channel_playlists_url(ucid, cursor, sort = "newest", auto_generated "80226972:embedded" => { "2:string" => ucid, "3:base64" => { - "2:string" => "playlist", + "2:string" => "playlists", "6:varint": 2_i64, "7:varint": 1_i64, "12:varint": 1_i64, |