8000 Multi arch adjustments · sudo-bot/docker-rustpython@4a7fb14 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4a7fb14

Browse files
williamdeswilliamdes
committed
Multi arch adjustments
[ci skip]
1 parent 283fdda commit 4a7fb14

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fail-fast: false
1313
max-parallel: 4
1414
matrix:
15-
platform: ["linux/arm/v6", "linux/arm/v7", "linux/arm64/v8", "linux/386", "linux/ppc64le", "linux/amd64", "linux/s390x"]
15+
platform: ["linux/arm/v6", "linux/arm/v7", "linux/arm64/v8", "linux/386", "linux/ppc64le", "linux/amd64"]
1616
steps:
1717
- name: Checkout repository
1818
uses: actions/checkout@v3

‎.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ jobs:
3333
run: make docker-build
3434
env:
3535
DOCKER_BUILDKIT: 1
36-
PLATFORM: "linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x"
36+
PLATFORM: "linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le"
3737
IMAGE_TAG: "docker.io/botsudo/docker-rustpython:latest"
3838
ACTION: push

‎Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
IMAGE_TAG ?= docker-rustpython
22
# All: linux/386,linux/amd64,linux/arm/v5,linux/arm/v7,linux/arm64/v8,linux/mips64le,linux/ppc64le,linux/s390x
33
# Supported by rust (Debian variant, alpine has 2 less): linux/386,linux/amd64,linux/arm/v7,linux/arm64/v8
4-
# Supported by alpine: linux/386,linux/amd64,linux/s390x
5-
# Fails to build: linux/ppc64le,linux/arm64/v8
6-
# Fails to fetch doc git crate: linux/arm/v6,linux/arm/v7
4+
# Supported by alpine: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
5+
# Does not build: linux/s390x (https://github.com/nix-rust/nix/issues/1968, https://github.com/nix-rust/nix/pull/1835)
76
PLATFORM ?= linux/amd64
87

98
ACTION ?= load

‎README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ We support as much as possible, the list is:
66

77
- `linux/386`
88
- `linux/amd64`
9-
- `linux/arm/v5`
9+
- `linux/arm/v6`
1010
- `linux/arm/v7`
1111
- `linux/arm64/v8`
12-
- `linux/mips64le`
1312
- `linux/ppc64le`
14-
- `linux/s390x`
13+
14+
For `linux/s390x`, it needs fixing:
15+
- See: https://github.com/nix-rust/nix/issues/1968
16+
- See: https://github.com/nix-rust/nix/pull/1835

‎docker/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ARG RUST_PYTHON_VERSION="0.2.0"
77
ENV CARGO_HOME="/workdir"
88
ENV CARGO_INSTALL_ROOT="/workdir"
99
# armv6 and armv7 fix
10+
# See: https://github.com/rust-lang/cargo/issues/6513#issuecomment-1440029221
1011
ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
1112

1213
# Newer rust needed due to let...else feature

0 commit comments

Comments
 (0)
0