From 1617ee541bf738fe541b5ed047cbd46032b85651 Mon Sep 17 00:00:00 2001
From: Jusong Yu <jusong.yeu@gmail.com>
Date: Wed, 12 Oct 2022 23:51:44 +0200
Subject: [PATCH 1/2] aiida-core installed by pip

---
 build.json                  | 2 +-
 stack/base/Dockerfile       | 9 +++------
 stack/full-stack/Dockerfile | 2 +-
 stack/lab/Dockerfile        | 4 +---
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/build.json b/build.json
index 3a625f9f..043155a1 100644
--- a/build.json
+++ b/build.json
@@ -1,7 +1,7 @@
 {
   "variable": {
     "PYTHON_VERSION": {
-      "default": "3.9.4"
+      "default": "3.10.6"
     },
     "AIIDA_VERSION": {
       "default": "2.0.3"
diff --git a/stack/base/Dockerfile b/stack/base/Dockerfile
index f4dbc3d9..895b7175 100644
--- a/stack/base/Dockerfile
+++ b/stack/base/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE=jupyter/minimal-notebook:python-3.9.4
+ARG BASE=jupyter/minimal-notebook:python-3.10.6
 FROM ${BASE}
 
 LABEL maintainer="AiiDAlab Team <aiidalab@materialscloud.org>"
@@ -10,14 +10,11 @@ ARG AIIDA_VERSION
 
 # Install the shared requirements.
 COPY requirements.txt .
-RUN mamba install --yes \
-     aiida-core=${AIIDA_VERSION} \
-     --file requirements.txt \
-     && mamba clean --all -f -y && \
+RUN pip install --no-cache-dir aiida-core==${AIIDA_VERSION} \
+     -r requirements.txt && \
      fix-permissions "${CONDA_DIR}" && \
      fix-permissions "/home/${NB_USER}"
 
-
 # Pin shared requirements in the base environemnt.
 RUN cat requirements.txt | xargs -I{} conda config --system --add pinned_packages {}
 
diff --git a/stack/full-stack/Dockerfile b/stack/full-stack/Dockerfile
index 332454ff..6e9a53fb 100644
--- a/stack/full-stack/Dockerfile
+++ b/stack/full-stack/Dockerfile
@@ -10,7 +10,7 @@ COPY --from=base "${CONDA_DIR}/envs/aiida-core-services" "${CONDA_DIR}/envs/aiid
 COPY --from=base /usr/local/bin/before-notebook.d /usr/local/bin/before-notebook.d
 
 RUN fix-permissions "${CONDA_DIR}"
-RUN fix-permissions "/home/${NB_USER}/.aiida"
+RUN fix-permissions "/home/${NB_USER}"
 
 USER ${NB_USER}
 
diff --git a/stack/lab/Dockerfile b/stack/lab/Dockerfile
index 306638fe..84411e93 100644
--- a/stack/lab/Dockerfile
+++ b/stack/lab/Dockerfile
@@ -15,9 +15,7 @@ RUN apt-get update --yes && \
 
 # Install aiidalab package
 ARG AIIDALAB_VERSION=22.08.0
-RUN mamba install --yes \
-     aiidalab=${AIIDALAB_VERSION} \
-     && mamba clean --all -f -y && \
+RUN pip install --no-cache-dir aiidalab==${AIIDALAB_VERSION} && \
      fix-permissions "${CONDA_DIR}" && \
      fix-permissions "/home/${NB_USER}"
 

From d4838e0c918f78f63b172e239732b7c14b8530c1 Mon Sep 17 00:00:00 2001
From: Jusong Yu <jusong.yeu@gmail.com>
Date: Thu, 13 Oct 2022 18:48:03 +0200
Subject: [PATCH 2/2] drop arm64 support

---
 docker-bake.hcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index 23610dc1..5f2f9507 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -21,7 +21,7 @@ variable "REGISTRY" {
 }
 
 variable "PLATFORMS" {
-  default = ["linux/amd64", "linux/arm64"]
+  default = ["linux/amd64"]
 }
 
 function "tags" {