Skip to content

Commit 1d65dc9

Browse files
committed
Bump to 0.3.0
1 parent 15f5e7b commit 1d65dc9

File tree

4 files changed

+11
-21
lines changed

4 files changed

+11
-21
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
platform: ["linux/arm/v6", "linux/arm/v7", "linux/arm64/v8", "linux/386", "linux/ppc64le", "linux/amd64"]
2121
steps:
2222
- name: Checkout repository
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424
# https://github.com/docker/setup-qemu-action
2525
- name: Set up QEMU
2626
uses: docker/setup-qemu-action@v2

.github/workflows/publish.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
- { platform: "linux/ppc64le", internal-tag: "ppc64le" }
2323
- { platform: "linux/amd64", internal-tag: "amd64" }
2424
steps:
25-
- name: Check out the repository
26-
uses: actions/checkout@v3
25+
- name: Checkout repository
26+
uses: actions/checkout@v4
2727
# https://github.com/docker/setup-qemu-action
2828
- name: Set up QEMU
2929
uses: docker/setup-qemu-action@v2

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# A docker rustpython image
22

3-
This is a Docker image for the RustPython project.
3+
This is a Docker image for the [RustPython](https://github.com/RustPython/RustPython#readme) project.
44
It had the default feature flags + `freeze-stdlib`.
55

66
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).

docker/Dockerfile

+7-17
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM alpine:3.17 as builder
1+
FROM alpine:3.18 as builder
22

33
WORKDIR /workdir
44

5-
ARG RUST_PYTHON_VERSION="0.2.0"
5+
ARG RUST_PYTHON_VERSION="0.3.0"
66
ARG BUILD_DATE
77
ARG VCS_REF
88

@@ -12,36 +12,26 @@ ENV CARGO_INSTALL_ROOT="/workdir"
1212
# See: https://github.com/rust-lang/cargo/issues/6513#issuecomment-1440029221
1313
ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
1414

15-
# Newer rust needed due to let...else feature
16-
RUN apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community rust cargo
17-
18-
RUN apk --no-cache add musl-dev git
19-
20-
ADD https://github.com/RustPython/RustPython/archive/refs/tags/v$RUST_PYTHON_VERSION.tar.gz /tmp/v$RUST_PYTHON_VERSION.tar.gz
21-
ADD https://github.com/RustPython/__doc__/archive/d927debd491e4c45b88e953e6e50e4718e0f2965.tar.gz /tmp/rp__doc__.tar.gz
22-
23-
# See: https://github.com/RustPython/RustPython/pull/4499
24-
ADD https://github.com/RustPython/RustPython/commit/9cac89347e2276fcb309f108561e99f4be5baff2.patch /tmp/9cac89347e2276fcb309f108561e99f4be5baff2.patch
25-
26-
RUN mkdir /workdir/rp__doc__/ && tar --strip-components=1 -C /workdir/rp__doc__/ -xzf /tmp/rp__doc__.tar.gz
15+
ADD https://github.com/RustPython/RustPython/archive/refs/tags/$RUST_PYTHON_VERSION.tar.gz /tmp/v$RUST_PYTHON_VERSION.tar.gz
2716

2817
RUN tar --strip-components=1 -C /workdir -xzf /tmp/v$RUST_PYTHON_VERSION.tar.gz
29-
RUN git apply /tmp/9cac89347e2276fcb309f108561e99f4be5baff2.patch
3018

3119
# Remove the git mode that triggers an error on armv6 and armv7
3220
# Ref: https://github.com/rust-lang/cargo/issues/2808 (failed to mmap. Could not write data: Out of memory; class=Os (2))
3321
RUN sed -i 's#{ git = .*#{ path = "/workdir/rp__doc__/" }#' /workdir/derive-impl/Cargo.toml
3422

23+
RUN apk add --no-cache rust cargo musl-dev git
24+
3525
RUN cargo fetch
3626

3727
RUN cargo build --features freeze-stdlib --release --locked --offline --bin rustpython
3828

39-
FROM alpine:3.17
29+
FROM alpine:3.18
4030

4131
RUN apk --no-cache add musl libgcc
4232

4333
COPY --from=builder /workdir/target/release/rustpython /usr/local/bin/rustpython
44-
COPY <<-EOT /usr/local/share/sbom/rustpython.spdx.json
34+
COPY <<-"EOT" /usr/local/share/sbom/rustpython.spdx.json
4535
{
4636
"spdxVersion": "SPDX-2.3",
4737
"dataLicense": "CC0-1.0",

0 commit comments

Comments
 (0)