Merge pull request #2072 from Maykin-99/revert-2062-patch-1

Revert "Set correct permissions in Dockerfile"
pull/2101/head
TheFrenchGhosty 2021-05-13 10:29:45 +02:00 zatwierdzone przez GitHub
commit 7a93af1786
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 4 dodań i 3 usunięć

Wyświetl plik

@ -18,13 +18,14 @@ RUN apk add --no-cache librsvg ttf-opensans
WORKDIR /invidious 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 --chown=invidious ./assets/ ./assets/ COPY ./assets/ ./assets/
COPY --chown=invidious ./config/config.* ./config/ COPY --chown=invidious ./config/config.* ./config/
RUN mv -n config/config.example.yml config/config.yml 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 --chown=invidious ./config/sql/ ./config/sql/ COPY ./config/sql/ ./config/sql/
COPY --chown=invidious ./locales/ ./locales/ COPY ./locales/ ./locales/
COPY --from=builder /invidious/invidious . COPY --from=builder /invidious/invidious .
RUN chmod o+rX -R ./assets ./config ./locales
EXPOSE 3000 EXPOSE 3000
USER invidious USER invidious