From 894035209772c4086d8bfdb4f269dfd66fe0d172 Mon Sep 17 00:00:00 2001 From: Antonin Stefanutti Date: Wed, 9 Mar 2022 19:57:29 +0100 Subject: [PATCH] Use edge branch globally as it's required by Chromium --- Dockerfile | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9c10416..9fb0229 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,5 @@ +# syntax=docker/dockerfile:1.3.0-labs + FROM node:17.2.0-alpine as builder ENV NODE_ENV production @@ -18,22 +20,25 @@ LABEL org.opencontainers.image.source="https://github.com/astefanutti/decktape" ENV TERM xterm-color +RUN < /etc/apk/repositories +http://dl-cdn.alpinelinux.org/alpine/edge/main +http://dl-cdn.alpinelinux.org/alpine/edge/community +http://dl-cdn.alpinelinux.org/alpine/edge/testing +EOF + # Chromium, CA certificates, fonts # https://git.alpinelinux.org/cgit/aports/log/community/chromium RUN apk update && apk upgrade && \ - echo @edge http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories && \ - echo @edge http://nl.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories && \ - echo @edge http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ apk add --no-cache \ ca-certificates \ - libstdc++@edge \ - chromium@edge=99.0.4844.51-r0 \ - font-noto-emoji@edge \ - freetype@edge \ - harfbuzz@edge \ - nss@edge \ - ttf-freefont@edge \ - wqy-zenhei@edge && \ + libstdc++ \ + chromium=99.0.4844.51-r0 \ + font-noto-emoji \ + freetype \ + harfbuzz \ + nss \ + ttf-freefont \ + wqy-zenhei && \ # /etc/fonts/conf.d/44-wqy-zenhei.conf overrides 'monospace' matching FreeMono.ttf in /etc/fonts/conf.d/69-unifont.conf mv /etc/fonts/conf.d/44-wqy-zenhei.conf /etc/fonts/conf.d/74-wqy-zenhei.conf && \ rm -rf /var/cache/apk/*