refactor: use cmake 3.22 from pip (pyodide#2489)

* refactor: use cmake 3.22 from pip * Fix dockerfile * Update image tags * Fix image * Switch to pyodide docker image Co-authored-by: Hood Chatham <roberthoodchatham@gmail.com>
rsohlot · May 4, 2022 · 1093b86 · 1093b86
1 parent 213288f
commit 1093b86
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,7 +6,7 @@ defaults: &defaults
     # Note: when updating the docker image version,
     #       make sure there are no extra old versions lying around.
     #       (e.g. `rg -F --hidden <old_tag>`)
-    - image: pyodide/pyodide-env:20220411-chrome99-firefox98
+    - image: pyodide/pyodide-env:20220504-py310-chrome101-firefox100
   environment:
     - EMSDK_NUM_CORES: 3
       EMCC_CORES: 3

diff --git a/Dockerfile b/Dockerfile
@@ -1,14 +1,15 @@
 FROM node:14.16.1-buster-slim AS node-image
 FROM python:3.10.2-slim-buster
 
+# Requirements for building packages
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
-        # building packages
-        bzip2 ccache clang-format-6.0 cmake f2c g++ gfortran git make \
+        bzip2 ccache f2c g++ gfortran git make \
         patch pkg-config swig unzip wget xz-utils \
         autoconf autotools-dev automake texinfo dejagnu \
         build-essential prelink autoconf libtool libltdl-dev \
-        gnupg2 libdbus-glib-1-2 sudo
+        gnupg2 libdbus-glib-1-2 sudo \
+  && rm -rf /var/lib/apt/lists/*
 
 ADD docs/requirements-doc.txt requirements.txt /
 
@@ -68,6 +69,7 @@ RUN if [ $CHROME_VERSION = "latest" ]; \
   fi \
   && CHROME_DOWNLOAD_URL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION_FULL}-1_amd64.deb" \
   && wget --no-verbose -O /tmp/google-chrome.deb ${CHROME_DOWNLOAD_URL} \
+  && apt-get update \
   && apt install -qqy /tmp/google-chrome.deb \
   && rm -f /tmp/google-chrome.deb \
   && rm -rf /var/lib/apt/lists/* \

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,5 @@
+  # build
+  cmake
   ruamel.yaml
   # lint
   pre-commit

diff --git a/run_docker b/run_docker
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 PYODIDE_IMAGE_REPO="pyodide"
-PYODIDE_IMAGE_TAG="20220411-chrome99-firefox98"
+PYODIDE_IMAGE_TAG="20220504-py310-chrome101-firefox100"
 PYODIDE_PREBUILT_IMAGE_TAG="0.20.0"
 DEFAULT_PYODIDE_DOCKER_IMAGE="${PYODIDE_IMAGE_REPO}/pyodide-env:${PYODIDE_IMAGE_TAG}"
 DEFAULT_PYODIDE_SYSTEM_PORT="none"