diff options
| author | Omar Roth <omarroth@protonmail.com> | 2019-08-04 08:07:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-04 08:07:16 -0500 |
| commit | f7dc4cca2cc1b09fdee08f61ec2b53c1d4f7ec4f (patch) | |
| tree | 1c8109d64b8050ba8b8a5f3f883efed0160649fa | |
| parent | 5680d5a7bebbb8e3c715e7f546bce49116b4a599 (diff) | |
| parent | ea39bb4334227804b95a2a084e51ae004d8f5f9e (diff) | |
| download | invidious-f7dc4cca2cc1b09fdee08f61ec2b53c1d4f7ec4f.tar.gz invidious-f7dc4cca2cc1b09fdee08f61ec2b53c1d4f7ec4f.tar.bz2 invidious-f7dc4cca2cc1b09fdee08f61ec2b53c1d4f7ec4f.zip | |
Merge pull request #665 from leonklingele/improve-dockerfile
docker: various improvements to Dockerfile
| -rw-r--r-- | docker/Dockerfile | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 043d950e..c9fa6367 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,15 +1,28 @@ -FROM archlinux/base - -RUN pacman -Sy --noconfirm shards crystal imagemagick librsvg \ - which pkgconf gcc ttf-liberation glibc -# base-devel contains many other basic packages, that are normally assumed to already exist on a clean arch system - -ADD . /invidious - +FROM alpine:latest AS builder +RUN apk add -u crystal shards libc-dev \ + yaml-dev libxml2-dev sqlite-dev sqlite-static zlib-dev openssl-dev WORKDIR /invidious +COPY ./shard.yml ./shard.yml +RUN shards update && shards install +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 \ +# TODO: Remove next line, see https://github.com/crystal-lang/crystal/issues/7946 + -Dmusl \ + ./src/invidious.cr -RUN sed -i 's/host: localhost/host: postgres/' config/config.yml && \ - shards update && shards install && \ - crystal build src/invidious.cr - +FROM alpine:latest +RUN apk add -u imagemagick ttf-opensans +WORKDIR /invidious +RUN addgroup -g 1000 -S invidious && \ + adduser -u 1000 -S invidious -G invidious +COPY ./assets/ ./assets/ +COPY ./config/config.yml ./config/config.yml +COPY ./config/sql/ ./config/sql/ +COPY ./locales/ ./locales/ +RUN sed -i 's/host: localhost/host: postgres/' config/config.yml +COPY --from=builder /invidious/invidious . +USER invidious CMD [ "/invidious/invidious" ] |