diff options
| author | syeopite <syeopite@syeopite.dev> | 2021-09-11 23:06:15 -0700 |
|---|---|---|
| committer | syeopite <syeopite@syeopite.dev> | 2021-09-18 13:30:17 -0700 |
| commit | 6e1b62aedfa302409e0f991576660068b0015898 (patch) | |
| tree | 1c7eb4ced0ca079e03d76e365b043e8c0e5150f2 /docker | |
| parent | 2451497b3161a94299f2be08ddf805e6e0dd24d6 (diff) | |
| download | invidious-6e1b62aedfa302409e0f991576660068b0015898.tar.gz invidious-6e1b62aedfa302409e0f991576660068b0015898.tar.bz2 invidious-6e1b62aedfa302409e0f991576660068b0015898.zip | |
Fix docker
Clone scripts folder to docker container
Copy videojs-dependencies.yml to docker container
Copy assets folder eariler in build process
Copy assets folder from builder
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 7 | ||||
| -rw-r--r-- | docker/Dockerfile.arm64 | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 08feb554..87449453 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -15,6 +15,11 @@ COPY ./src/ ./src/ # See definition of CURRENT_BRANCH, CURRENT_COMMIT and CURRENT_VERSION. COPY ./.git/ ./.git/ +# Required for fetching player dependencies +COPY ./scripts/ ./scripts/ +COPY ./assets/ ./assets/ +COPY ./videojs-dependencies.yml ./videojs-dependencies.yml + RUN crystal spec --warnings all \ --link-flags "-lxml2 -llzma" @@ -35,12 +40,12 @@ 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/ 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/ +COPY --from=builder /invidious/assets ./assets/ COPY --from=builder /invidious/invidious . RUN chmod o+rX -R ./assets ./config ./locales diff --git a/docker/Dockerfile.arm64 b/docker/Dockerfile.arm64 index 063ba6d2..465c67e6 100644 --- a/docker/Dockerfile.arm64 +++ b/docker/Dockerfile.arm64 @@ -15,6 +15,11 @@ COPY ./src/ ./src/ # See definition of CURRENT_BRANCH, CURRENT_COMMIT and CURRENT_VERSION. COPY ./.git/ ./.git/ +# Required for fetching player dependencies +COPY ./scripts/ ./scripts/ +COPY ./assets/ ./assets/ +COPY ./videojs-dependencies.yml ./videojs-dependencies.yml + RUN crystal spec --warnings all \ --link-flags "-lxml2 -llzma" @@ -34,12 +39,12 @@ 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/ 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/ +COPY --from=builder /invidious/assets ./assets/ COPY --from=builder /invidious/invidious . RUN chmod o+rX -R ./assets ./config ./locales |