From a4d1fdfb152c46e3e05aa6e91a44a9fd0323b632 Mon Sep 17 00:00:00 2001
From: Donghee Na <donghee.na@python.org>
Date: Thu, 26 Sep 2024 12:58:15 -0700
Subject: [PATCH] gh-124612: Good bye dockerfile and use GHCR package
 (gh-124626)

---
 .devcontainer/Dockerfile        | 24 ------------------------
 .devcontainer/devcontainer.json |  4 +---
 2 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 .devcontainer/Dockerfile

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
deleted file mode 100644
index ada5fb0fe64..00000000000
--- a/.devcontainer/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM docker.io/library/fedora:40
-
-ENV CC=clang
-
-ENV WASI_SDK_VERSION=24
-ENV WASI_SDK_PATH=/opt/wasi-sdk
-
-ENV WASMTIME_HOME=/opt/wasmtime
-ENV WASMTIME_VERSION=22.0.0
-ENV WASMTIME_CPU_ARCH=x86_64
-
-RUN dnf -y --nodocs --setopt=install_weak_deps=False install /usr/bin/{blurb,clang,curl,git,ln,tar,xz} 'dnf-command(builddep)' && \
-    dnf -y --nodocs --setopt=install_weak_deps=False builddep python3 && \
-    dnf -y clean all
-
-RUN mkdir ${WASI_SDK_PATH} && \
-    curl --location https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}.0-x86_64-linux.tar.gz | \
-    tar --strip-components 1 --directory ${WASI_SDK_PATH} --extract --gunzip
-
-RUN mkdir --parents ${WASMTIME_HOME} && \
-    curl --location "https://github.com/bytecodealliance/wasmtime/releases/download/v${WASMTIME_VERSION}/wasmtime-v${WASMTIME_VERSION}-${WASMTIME_CPU_ARCH}-linux.tar.xz" | \
-    xz --decompress | \
-    tar --strip-components 1 --directory ${WASMTIME_HOME} -x && \
-    ln -s ${WASMTIME_HOME}/wasmtime /usr/local/bin
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 0dc303015df..64c85c1101e 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,7 +1,5 @@
 {
-    "build": {
-        "dockerfile": "Dockerfile"
-    },
+    "image": "ghcr.io/python/devcontainer:2024.09.25.11038928730",
     "onCreateCommand": [
         // Install common tooling.
         "dnf",