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

Merge pull request #907 from tleydxdy/patch-2

Browse Source 
Fix docker build for now
This commit is contained in:
Omar Roth 2019-11-14 10:38:12 -05:00 committed by GitHub
commit 59fcb56972
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/Dockerfile
View File

@ -1,7 +1,6 @@
FROM alpine:edge AS builder FROM alpine:edge
RUN apk add --no-cache crystal shards libc-dev \ RUN apk add --no-cache crystal shards libc-dev \
yaml-dev libxml2-dev sqlite-dev zlib-dev openssl-dev \ yaml-dev libxml2-dev sqlite-dev zlib-dev openssl-dev
sqlite-static zlib-static openssl-libs-static
WORKDIR /invidious WORKDIR /invidious
COPY ./shard.yml ./shard.yml COPY ./shard.yml ./shard.yml
RUN shards update && shards install RUN shards update && shards install
@ -9,14 +8,12 @@ COPY ./src/ ./src/
# TODO: .git folder is required for building – this is destructive. # TODO: .git folder is required for building – this is destructive.
# See definition of CURRENT_BRANCH, CURRENT_COMMIT and CURRENT_VERSION. # See definition of CURRENT_BRANCH, CURRENT_COMMIT and CURRENT_VERSION.
COPY ./.git/ ./.git/ 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 # TODO: Remove next line, see https://github.com/crystal-lang/crystal/issues/7946
-Dmusl \ -Dmusl \
./src/invidious.cr ./src/invidious.cr
FROM alpine:latest
RUN apk add --no-cache librsvg ttf-opensans RUN apk add --no-cache librsvg ttf-opensans
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/
@ -24,6 +21,5 @@ COPY ./config/config.yml ./config/config.yml
COPY ./config/sql/ ./config/sql/ COPY ./config/sql/ ./config/sql/
COPY ./locales/ ./locales/ COPY ./locales/ ./locales/
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 --from=builder /invidious/invidious .
USER invidious USER invidious
CMD [ "/invidious/invidious" ] CMD [ "/invidious/invidious" ]