diff --git a/images/docker/ubuntu/Dockerfile b/images/docker/ubuntu/Dockerfile index 5dfe3d41..03f17db3 100644 --- a/images/docker/ubuntu/Dockerfile +++ b/images/docker/ubuntu/Dockerfile @@ -16,4 +16,14 @@ # FROM ubuntu:focal-20210723 -RUN apt-get -y update && apt-get install -y openjdk-11-jre-headless && rm -rf /var/lib/apt/lists +RUN apt-get -y update && apt-get install -y openjdk-11-jre-headless curl bash wget gnupg && rm -rf /var/lib/apt/lists +# Install latest chrome dev package and fonts to support major charsets (Chinese, Japanese, Arabic, Hebrew, Thai and a few others) +# This installs the necessary libs to make the bundled version of Chromium that Puppeteer installs, work. +RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \ + && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \ + && apt-get update \ + && apt-get install -y google-chrome-stable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 \ + --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* +RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - +RUN apt-get -y install nodejs && npm install -g pnpm diff --git a/library/crates/Cargo.lock b/library/crates/Cargo.lock index f40b03b8..b0d198e4 100644 --- a/library/crates/Cargo.lock +++ b/library/crates/Cargo.lock @@ -3517,6 +3517,7 @@ dependencies = [ "tonic", "tonic-build", "tower", + "tower-http", "tracing", "tracing-subscriber", "uuid", diff --git a/library/crates/Cargo.toml b/library/crates/Cargo.toml index c36ea781..ce0d375c 100644 --- a/library/crates/Cargo.toml +++ b/library/crates/Cargo.toml @@ -56,6 +56,7 @@ tokio-stream = "=0.1.11" tonic = { version = "=0.8.0", features = ["tls"] } tonic-build = "=0.8.0" tower = "=0.4.13" +tower-http = { version = "=0.3.5", features = ["cors"] } tracing = "=0.1.37" tracing-subscriber = "=0.3.16" uuid = { version = "=1.1.2", features = ["fast-rng", "v4"] }