From 993a44ff58fa501cc2effa96e5159ac311e1034a Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Tue, 2 Mar 2021 12:46:14 -0800 Subject: [PATCH 1/3] Update dockerfiles --- dockers/release-docker/Dockerfile | 6 +++++- dockers/wasm-docker/Dockerfile | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dockers/release-docker/Dockerfile b/dockers/release-docker/Dockerfile index c35e4e9f64..7edc72649c 100644 --- a/dockers/release-docker/Dockerfile +++ b/dockers/release-docker/Dockerfile @@ -18,7 +18,8 @@ RUN apt-get update -qqy && apt-get install -qqy \ lsb-release \ openssh-client \ git \ - gnupg && \ + gnupg + file && \ pip3 install -U crcmod && \ export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \ echo "deb https://packages.cloud.google.com/apt $CLOUD_SDK_REPO main" > /etc/apt/sources.list.d/google-cloud-sdk.list && \ @@ -38,3 +39,6 @@ RUN npm install -g yarn # Install virtualenv RUN pip3 install virtualenv + +# Install absl +RUN pip3 install absl-py diff --git a/dockers/wasm-docker/Dockerfile b/dockers/wasm-docker/Dockerfile index a94b771c3b..ef5047ec97 100644 --- a/dockers/wasm-docker/Dockerfile +++ b/dockers/wasm-docker/Dockerfile @@ -3,3 +3,19 @@ # Install yarn RUN npm install -g yarn + +RUN apt-get update -qqy && apt-get install -qqy \ + curl \ + gcc \ + python \ + python3 \ + python3-setuptools \ + python3-dev \ + python3-pip \ + apt-transport-https \ + lsb-release \ + openssh-client \ + git \ + gnupg \ + file && \ + pip3 install -U absl-py From 905ebee2238add2b1dbaf2fc3e5dcd198f6fc34b Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Tue, 2 Mar 2021 13:06:24 -0800 Subject: [PATCH 2/3] Add trailing slash to shell command --- dockers/release-docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockers/release-docker/Dockerfile b/dockers/release-docker/Dockerfile index 7edc72649c..81413d6d11 100644 --- a/dockers/release-docker/Dockerfile +++ b/dockers/release-docker/Dockerfile @@ -18,7 +18,7 @@ RUN apt-get update -qqy && apt-get install -qqy \ lsb-release \ openssh-client \ git \ - gnupg + gnupg \ file && \ pip3 install -U crcmod && \ export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \ From 6d562b69a301c4e88c882ff17709a67c8cafdcc7 Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Tue, 2 Mar 2021 13:51:00 -0800 Subject: [PATCH 3/3] Remove unneeded packages --- dockers/wasm-docker/Dockerfile | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/dockers/wasm-docker/Dockerfile b/dockers/wasm-docker/Dockerfile index ef5047ec97..f0d3ea48e0 100644 --- a/dockers/wasm-docker/Dockerfile +++ b/dockers/wasm-docker/Dockerfile @@ -1,21 +1,14 @@ # Official emsdk docker: https://hub.docker.com/r/emscripten/emsdk - FROM emscripten/emsdk:2.0.14 +FROM emscripten/emsdk:2.0.14 - # Install yarn - RUN npm install -g yarn +# Install yarn +RUN npm install -g yarn RUN apt-get update -qqy && apt-get install -qqy \ - curl \ gcc \ - python \ python3 \ - python3-setuptools \ - python3-dev \ python3-pip \ - apt-transport-https \ - lsb-release \ - openssh-client \ - git \ - gnupg \ - file && \ - pip3 install -U absl-py + file + +# Install absl +RUN pip3 install -U absl-py