Bump to 0.3.0

williamdes · williamdes · commit 1d65dc9cf5f2 · 2023-10-15T13:57:09.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
                 platform: ["linux/arm/v6", "linux/arm/v7", "linux/arm64/v8", "linux/386", "linux/ppc64le", "linux/amd64"]
         steps:
             - name: Checkout repository
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
             # https://github.com/docker/setup-qemu-action
             - name: Set up QEMU
               uses: docker/setup-qemu-action@v2
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -22,8 +22,8 @@ jobs:
                     - { platform: "linux/ppc64le", internal-tag: "ppc64le" }
                     - { platform: "linux/amd64", internal-tag: "amd64" }
         steps:
-            - name: Check out the repository
-              uses: actions/checkout@v3
+            - name: Checkout repository
+              uses: actions/checkout@v4
             # https://github.com/docker/setup-qemu-action
             - name: Set up QEMU
               uses: docker/setup-qemu-action@v2
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # A docker rustpython image
 
-This is a Docker image for the RustPython project.
+This is a Docker image for the [RustPython](https://github.com/RustPython/RustPython#readme) project.
 It had the default feature flags + `freeze-stdlib`.
 
 You can find it on [Docker Hub](https://hub.docker.com/r/botsudo/docker-rustpython) and the sources on [GitHub](https://github.com/sudo-bot/docker-rustpython).
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,8 +1,8 @@
-FROM alpine:3.17 as builder
+FROM alpine:3.18 as builder
 
 WORKDIR /workdir
 
-ARG RUST_PYTHON_VERSION="0.2.0"
+ARG RUST_PYTHON_VERSION="0.3.0"
 ARG BUILD_DATE
 ARG VCS_REF
 
@@ -12,36 +12,26 @@ ENV CARGO_INSTALL_ROOT="/workdir"
 # See: https://github.com/rust-lang/cargo/issues/6513#issuecomment-1440029221
 ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
 
-# Newer rust needed due to let...else feature
-RUN apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community rust cargo
-
-RUN apk --no-cache add musl-dev git
-
-ADD https://github.com/RustPython/RustPython/archive/refs/tags/v$RUST_PYTHON_VERSION.tar.gz /tmp/v$RUST_PYTHON_VERSION.tar.gz
-ADD https://github.com/RustPython/__doc__/archive/d927debd491e4c45b88e953e6e50e4718e0f2965.tar.gz /tmp/rp__doc__.tar.gz
-
-# See: https://github.com/RustPython/RustPython/pull/4499
-ADD https://github.com/RustPython/RustPython/commit/9cac89347e2276fcb309f108561e99f4be5baff2.patch /tmp/9cac89347e2276fcb309f108561e99f4be5baff2.patch
-
-RUN mkdir /workdir/rp__doc__/ && tar --strip-components=1 -C /workdir/rp__doc__/ -xzf /tmp/rp__doc__.tar.gz
+ADD https://github.com/RustPython/RustPython/archive/refs/tags/$RUST_PYTHON_VERSION.tar.gz /tmp/v$RUST_PYTHON_VERSION.tar.gz
 
 RUN tar --strip-components=1 -C /workdir -xzf /tmp/v$RUST_PYTHON_VERSION.tar.gz
-RUN git apply /tmp/9cac89347e2276fcb309f108561e99f4be5baff2.patch
 
 # Remove the git mode that triggers an error on armv6 and armv7
 # Ref: https://github.com/rust-lang/cargo/issues/2808 (failed to mmap. Could not write data: Out of memory; class=Os (2))
 RUN sed -i 's#{ git = .*#{ path = "/workdir/rp__doc__/" }#' /workdir/derive-impl/Cargo.toml
 
+RUN apk add --no-cache rust cargo musl-dev git
+
 RUN cargo fetch
 
 RUN cargo build --features freeze-stdlib --release --locked --offline --bin rustpython
 
-FROM alpine:3.17
+FROM alpine:3.18
 
 RUN apk --no-cache add musl libgcc
 
 COPY --from=builder /workdir/target/release/rustpython /usr/local/bin/rustpython
-COPY <<-EOT /usr/local/share/sbom/rustpython.spdx.json
+COPY <<-"EOT" /usr/local/share/sbom/rustpython.spdx.json
 {
     "spdxVersion": "SPDX-2.3",
     "dataLicense": "CC0-1.0",
