From 6f90079e87deaaed456e7d62c0137439af299eb2 Mon Sep 17 00:00:00 2001
From: Elias Datler <46360620+fxgst@users.noreply.github.com>
Date: Wed, 20 Nov 2024 02:56:32 +0700
Subject: [PATCH] Update Dockerfile (#17)

- bump versions
- simplify azle Dockerfile as latest azle is a lot nicer :)
---
 Dockerfile      |  9 ++++-----
 azle/Dockerfile | 23 ++++++-----------------
 slim/Dockerfile |  4 +---
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2647038..6255a55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,9 +3,8 @@ FROM --platform=linux/amd64 rust:1.82-slim-bookworm
 ENV NVM_DIR=/root/.nvm
 ENV NVM_VERSION=v0.40.1
 ENV NODE_VERSION=22.10.0
-ENV DFX_VERSION=0.24.1
-ENV POCKET_IC_SERVER_VERSION=6.0.0
-ENV POCKET_IC_PYTHON_VERSION=2.1.0
+ENV POCKET_IC_SERVER_VERSION=7.0.0
+ENV POCKET_IC_PYTHON_VERSION=3.0.0
 
 RUN apt -yq update
 RUN apt -yqq install --no-install-recommends curl ca-certificates libunwind-dev git python3 python3-pip ssh
@@ -18,9 +17,8 @@ RUN . "${NVM_DIR}/nvm.sh" && nvm use v${NODE_VERSION}
 RUN . "${NVM_DIR}/nvm.sh" && nvm alias default v${NODE_VERSION}
 
 # Install dfx
-RUN DFXVM_INIT_YES=true sh -ci "$(curl -fsSL https://internetcomputer.org/install.sh)"
+RUN DFX_VERSION=0.24.2 DFXVM_INIT_YES=true sh -ci "$(curl -fsSL https://internetcomputer.org/install.sh)"
 ENV PATH="/root/.local/share/dfx/bin:$PATH"
-ENV DFX_VERSION=
 
 # Add wasm32-unknown-unknown target
 RUN rustup target add wasm32-unknown-unknown
@@ -32,6 +30,7 @@ RUN pip3 install pocket-ic==${POCKET_IC_PYTHON_VERSION} --break-system-packages
 RUN curl -Ls https://github.com/dfinity/pocketic/releases/download/${POCKET_IC_SERVER_VERSION}/pocket-ic-x86_64-linux.gz -o pocket-ic.gz
 RUN gzip -d pocket-ic.gz
 RUN chmod +x pocket-ic
+RUN mv pocket-ic /usr/local/bin
 
 # Clean apt
 RUN apt-get autoremove && apt-get clean
diff --git a/azle/Dockerfile b/azle/Dockerfile
index 43dab0d..cdf31e0 100644
--- a/azle/Dockerfile
+++ b/azle/Dockerfile
@@ -1,25 +1,14 @@
-FROM --platform=linux/amd64 node:20-bookworm-slim
+FROM --platform=linux/amd64 node:slim
 
-# Install a basic environment needed for our build tools
-RUN apt-get -yq update
-RUN apt-get -yqq install --no-install-recommends curl ca-certificates \
-    build-essential pkg-config libssl-dev llvm-dev liblmdb-dev clang cmake rsync git \
-    libunwind-dev
+RUN apt -yq update
+RUN apt -yqq install --no-install-recommends curl ca-certificates libunwind-dev git python3
 
 # Install dfx
-RUN DFX_VERSION=0.24.1 DFXVM_INIT_YES=true sh -ci "$(curl -fsSL https://internetcomputer.org/install.sh)"
+RUN DFX_VERSION=0.24.2 DFXVM_INIT_YES=true sh -ci "$(curl -fsSL https://internetcomputer.org/install.sh)"
 ENV PATH="/root/.local/share/dfx/bin:$PATH"
 
-# Dug out from [here](https://github.com/demergent-labs/azle/blob/main/.github/workflows/test.yml#L251)
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.73.0 --profile=minimal
-ENV PATH="/root/.cargo/bin:$PATH"
-RUN rustup target add wasm32-wasi
-
-RUN cargo install --git https://github.com/wasm-forge/wasi2ic --rev 806c3558aad24224852a9582f018178402cb3679
-
-RUN git clone https://github.com/demergent-labs/wasmedge-quickjs && cd wasmedge-quickjs && git checkout c21ff69f442998e4cda4619166e23a9bc91418be
-RUN mkdir -p ${HOME}/.config/azle
-RUN mv /wasmedge-quickjs ${HOME}/.config/azle/wasmedge-quickjs_$(npx azle@0.21.1 dockerfile-hash)
+# Install azle extension
+RUN npx azle@0.24.1 install-dfx-extension
 
 # Clean apt
 RUN apt-get autoremove && apt-get clean
diff --git a/slim/Dockerfile b/slim/Dockerfile
index 2f22f92..2ae25a7 100644
--- a/slim/Dockerfile
+++ b/slim/Dockerfile
@@ -3,7 +3,6 @@ FROM --platform=linux/amd64 rust:1.82-slim-bookworm
 ENV NVM_DIR=/root/.nvm
 ENV NVM_VERSION=v0.40.1
 ENV NODE_VERSION=22.10.0
-ENV DFX_VERSION=0.24.1
 
 RUN apt -yq update
 RUN apt -yqq install --no-install-recommends curl ca-certificates libunwind-dev git
@@ -19,9 +18,8 @@ RUN . "${NVM_DIR}/nvm.sh" && nvm alias default v${NODE_VERSION}
 RUN npm install -g ic-mops
 
 # Install dfx
-RUN DFXVM_INIT_YES=true sh -ci "$(curl -fsSL https://internetcomputer.org/install.sh)"
+RUN DFX_VERSION=0.24.2 DFXVM_INIT_YES=true sh -ci "$(curl -fsSL https://internetcomputer.org/install.sh)"
 ENV PATH="/root/.local/share/dfx/bin:$PATH"
-ENV DFX_VERSION=
 
 # Add wasm32-unknown-unknown target
 RUN rustup target add wasm32-unknown-unknown