Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ on:
branches: [main]

jobs:
build_devcontainer:
name: Build and test (Devcontainer)
build_dev_container:
name: Build and test (Dev container)
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, ubuntu-24.04-arm]
runs-on: ${{ matrix.os }}
env:
# Dummy tag; version does not matter.
TAG: cpython-devcontainer:1.0.0-${{ github.run_id }}
steps:
- name: Checkout Push to Registry action
Expand All @@ -28,10 +29,8 @@ jobs:
context: ./devcontainer
load: true
tags: ${{ env.TAG }}
- name: Test WASI SDK
run: docker run --rm ${{ env.TAG }} /opt/wasi-sdk/bin/clang --version
- name: Test Wasmtime
run: docker run --rm ${{ env.TAG }} wasmtime --version
- name: Test clang
run: docker run --rm ${{ env.TAG }} clang --version

build_autoconf:
name: Build and test (Autoconf)
Expand Down
15 changes: 2 additions & 13 deletions devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,15 @@ FROM docker.io/library/fedora:41
LABEL org.opencontainers.image.base.name="docker.io/library/fedora:41"
LABEL org.opencontainers.image.source="https://github.com/python/cpython-devcontainers"
LABEL org.opencontainers.image.title="CPython development container"
LABEL org.opencontainers.image.description="CPython development container with the tooling to work on Linux or WASI builds."
LABEL org.opencontainers.image.description="CPython development container with the tooling to work on Linux builds."
LABEL org.opencontainers.image.authors="Brett Cannon"

ARG TARGETARCH

ENV CC=clang

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

# Update only after consulting with WASI support maintainers (see PEP 11).
ENV WASI_SDK_VERSION=24

# Update as desired.
ENV WASMTIME_VERSION=35.0.0
ENV WASMTIME_HOME=/opt/wasmtime


RUN mkdir -p /opt/cpython-devcontainer/bin
COPY --chmod=755 install-builddeps.sh install-wasi.sh /opt/cpython-devcontainer/bin/
COPY --chmod=755 install-builddeps.sh /opt/cpython-devcontainer/bin/

RUN /opt/cpython-devcontainer/bin/install-builddeps.sh
RUN /opt/cpython-devcontainer/bin/install-wasi.sh
5 changes: 5 additions & 0 deletions devcontainer/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
A container for developing CPython for Linux.

Various common utilities are included to make getting started easier.
See https://devguide.python.org/getting-started/setup-building/#using-a-container
for instructions on ways to use this container.
34 changes: 0 additions & 34 deletions devcontainer/install-wasi.sh

This file was deleted.