Skip to content

Commit 3d64c15

Browse files
authored
Remove WASI from the dev container (#55)
It will be moved to a dedicated WASI container.
1 parent 2c28764 commit 3d64c15

File tree

4 files changed

+12
-53
lines changed

4 files changed

+12
-53
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ on:
88
branches: [main]
99

1010
jobs:
11-
build_devcontainer:
12-
name: Build and test (Devcontainer)
11+
build_dev_container:
12+
name: Build and test (Dev container)
1313
strategy:
1414
fail-fast: false
1515
matrix:
1616
os: [ubuntu-latest, ubuntu-24.04-arm]
1717
runs-on: ${{ matrix.os }}
1818
env:
19+
# Dummy tag; version does not matter.
1920
TAG: cpython-devcontainer:1.0.0-${{ github.run_id }}
2021
steps:
2122
- name: Checkout Push to Registry action
@@ -28,10 +29,8 @@ jobs:
2829
context: ./devcontainer
2930
load: true
3031
tags: ${{ env.TAG }}
31-
- name: Test WASI SDK
32-
run: docker run --rm ${{ env.TAG }} /opt/wasi-sdk/bin/clang --version
33-
- name: Test Wasmtime
34-
run: docker run --rm ${{ env.TAG }} wasmtime --version
32+
- name: Test clang
33+
run: docker run --rm ${{ env.TAG }} clang --version
3534

3635
build_autoconf:
3736
name: Build and test (Autoconf)

devcontainer/Dockerfile

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,15 @@ FROM docker.io/library/fedora:41
33
LABEL org.opencontainers.image.base.name="docker.io/library/fedora:41"
44
LABEL org.opencontainers.image.source="https://github.com/python/cpython-devcontainers"
55
LABEL org.opencontainers.image.title="CPython development container"
6-
LABEL org.opencontainers.image.description="CPython development container with the tooling to work on Linux or WASI builds."
6+
LABEL org.opencontainers.image.description="CPython development container with the tooling to work on Linux builds."
77
LABEL org.opencontainers.image.authors="Brett Cannon"
88

9-
ARG TARGETARCH
10-
119
ENV CC=clang
1210

1311
# Remove a video codec repository to speed up installs.
1412
RUN dnf config-manager setopt fedora-cisco-openh264.enabled=False
1513

16-
# Update only after consulting with WASI support maintainers (see PEP 11).
17-
ENV WASI_SDK_VERSION=24
18-
19-
# Update as desired.
20-
ENV WASMTIME_VERSION=35.0.0
21-
ENV WASMTIME_HOME=/opt/wasmtime
22-
23-
2414
RUN mkdir -p /opt/cpython-devcontainer/bin
25-
COPY --chmod=755 install-builddeps.sh install-wasi.sh /opt/cpython-devcontainer/bin/
15+
COPY --chmod=755 install-builddeps.sh /opt/cpython-devcontainer/bin/
2616

2717
RUN /opt/cpython-devcontainer/bin/install-builddeps.sh
28-
RUN /opt/cpython-devcontainer/bin/install-wasi.sh

devcontainer/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
A container for developing CPython for Linux.
2+
3+
Various common utilities are included to make getting started easier.
4+
See https://devguide.python.org/getting-started/setup-building/#using-a-container
5+
for instructions on ways to use this container.

devcontainer/install-wasi.sh

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)