Skip to content

Commit d37706e

Browse files
alexis-opolkaalexis-opolka
committed
Fixes docker builds
Signed-off-by: alexis-opolka <[email protected]>
1 parent 44fe9be commit d37706e

File tree

103 files changed

+633
-201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+633
-201
lines changed

‎.changes/1625.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"description": "bump ct-ng to 1.27.0",
3+
"type": "changed"
4+
}

‎.changes/1630.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "added",
3+
"description": "Add docker platform support for `linux/arm64/v8` target for many Ubuntu-based targets"
4+
}

‎.changes/1641.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"description": "Update binutils to 2.38 in illumos and solaris",
3+
"issues": [1639],
4+
"type": "changed"
5+
}

‎.changes/1647.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"description": "use `-q` when gathering the installed toolchains",
3+
"issues": [1645],
4+
"type": "fixed"
5+
}

‎.changes/1651.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"description": "Fix BINDGEN_EXTRA_CLANG_ARGS for x86_64-unknown-illumos",
3+
"issues": [1644],
4+
"type": "fixed",
5+
"breaking": false
6+
}

‎.changes/1664.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"type": "added",
3+
"description": "add riscv64gc-unknown-linux-musl support",
4+
"issues": [1197]
5+
}

‎.changes/1674.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "fixed",
3+
"description": "use zstd to extract the compressed file as FreeBSD do so. also, bump the gcc version"
4+
}

‎.github/ISSUE_TEMPLATE/b_issue_report.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ body:
6666
- powerpc64-unknown-linux-gnu
6767
- powerpc-unknown-linux-gnu
6868
- riscv64gc-unknown-linux-gnu
69+
- riscv64gc-unknown-linux-musl
6970
- s390x-unknown-linux-gnu
7071
- sparc64-unknown-linux-gnu
7172
- sparcv9-sun-solaris

‎.github/actions/setup-rust/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ inputs:
77
required: true
88
target:
99
description: 'Target'
10-
required: true
10+
required: false
1111
components:
1212
description: 'Components'
13-
required: true
13+
required: false
1414

1515
runs:
1616
using: composite

‎.github/workflows/changelog.yml renamed to ‎.github/workflows/changelog.yml.x

File renamed without changes.

‎.github/workflows/ci.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ name: CI
2121
env:
2222
CARGO_NET_RETRY: 3
2323
CARGO_HTTP_CHECK_REVOKE: false
24+
CROSS_IMAGE: ghcr.io/${{ github.repository_owner }}
2425

2526
jobs:
2627
shellcheck:
@@ -31,7 +32,9 @@ jobs:
3132
ref: ${{ inputs.checkout-ref }}
3233

3334
- name: Run ShellCheck
34-
uses: azohra/[email protected]
35+
uses: Azbagheri/shell-linter@latest
36+
with:
37+
exclude-paths: ".github/CODEOWNERS,LICENSE-APACHE,LICENSE-MIT"
3538

3639
cargo-deny:
3740
runs-on: ubuntu-latest
@@ -229,7 +232,7 @@ jobs:
229232
run: ./ci/test-cross-image.sh
230233
env:
231234
TARGET: 'aarch64-unknown-linux-gnu'
232-
IMAGE: 'ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main'
235+
IMAGE: 'ghcr.io/${{ github.repository_owner }}/aarch64-unknown-linux-gnu:main'
233236
shell: bash
234237

235238
- name: Login to GitHub Container Registry
@@ -342,7 +345,7 @@ jobs:
342345
- name: Run Docker-in-Docker Test
343346
env:
344347
TARGET: aarch64-unknown-linux-gnu
345-
IMAGE: 'ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main'
348+
IMAGE: 'ghcr.io/${{ github.repository_owner }}/aarch64-unknown-linux-gnu:main'
346349
run: ./ci/test-docker-in-docker.sh
347350
shell: bash
348351

‎Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ terminate.
220220
| `armv7-unknown-linux-musleabihf` | 1.2.3 | 9.2.0 | ✓ | 6.1.0 | ✓ |
221221
| `i586-unknown-linux-gnu` | 2.31 | 9.4.0 | ✓ | N/A | ✓ |
222222
| `i586-unknown-linux-musl` | 1.2.3 | 9.2.0 | ✓ | N/A | ✓ |
223-
| `i686-unknown-freebsd` | 1.5 | 6.4.0 | ✓ | N/A | |
223+
| `i686-unknown-freebsd` | 1.6 | 13.3.0 | ✓ | N/A | |
224224
| `i686-linux-android` [1] | 9.0.8 | 9.0.8 | ✓ | 6.1.0 | ✓ |
225225
| `i686-pc-windows-gnu` | N/A | 9.4 | ✓ | N/A | ✓ |
226226
| `i686-unknown-linux-gnu` | 2.31 | 9.4.0 | ✓ | 6.1.0 | ✓ |
@@ -238,6 +238,7 @@ terminate.
238238
| `powerpc64-unknown-linux-gnu` | 2.31 | 9.4.0 | ✓ | 6.1.0 | ✓ |
239239
| `powerpc64le-unknown-linux-gnu` | 2.31 | 9.4.0 | ✓ | 6.1.0 | ✓ |
240240
| `riscv64gc-unknown-linux-gnu` | 2.35 | 11.4.0 | ✓ | 8.2.2 | ✓ |
241+
| `riscv64gc-unknown-linux-musl` | 1.2.5 | 14.2.0 | ✓ | 8.2.2 | ✓ |
241242
| `s390x-unknown-linux-gnu` | 2.31 | 9.4.0 | ✓ | 6.1.0 | ✓ |
242243
| `sparc64-unknown-linux-gnu` | 2.31 | 9.4.0 | ✓ | 6.1.0 | ✓ |
243244
| `sparcv9-sun-solaris` | 1.22.7 | 8.4.0 | ✓ | N/A | |
@@ -254,7 +255,7 @@ terminate.
254255
| `x86_64-linux-android` [1] | 9.0.8 | 9.0.8 | ✓ | 6.1.0 | ✓ |
255256
| `x86_64-pc-windows-gnu` | N/A | 9.3 | ✓ | N/A | ✓ |
256257
| `x86_64-pc-solaris` | 1.22.7 | 8.4.0 | ✓ | N/A | |
257-
| `x86_64-unknown-freebsd` | 1.5 | 6.4.0 | ✓ | N/A | |
258+
| `x86_64-unknown-freebsd` | 1.6 | 13.3.0 | ✓ | N/A | |
258259
| `x86_64-unknown-dragonfly` [2] [3] | 6.0.1 | 10.3.0 | ✓ | N/A | |
259260
| `x86_64-unknown-illumos` | 1.20.4 | 8.4.0 | ✓ | N/A | |
260261
| `x86_64-unknown-linux-gnu` | 2.31 | 9.4.0 | ✓ | 6.1.0 | ✓ |

‎docker/Dockerfile.aarch64-linux-android

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04 as cross-base
1+
FROM ubuntu:20.04 AS cross-base
22
ENV DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /
@@ -10,7 +10,7 @@ RUN /cmake.sh
1010
COPY xargo.sh /
1111
RUN /xargo.sh
1212

13-
FROM cross-base as build
13+
FROM cross-base AS build
1414

1515
COPY qemu.sh /
1616
RUN /qemu.sh aarch64

‎docker/Dockerfile.aarch64-unknown-freebsd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04 as cross-base
1+
FROM ubuntu:20.04 AS cross-base
22
ENV DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /
@@ -10,7 +10,7 @@ RUN /cmake.sh
1010
COPY xargo.sh /
1111
RUN /xargo.sh
1212

13-
FROM cross-base as build
13+
FROM cross-base AS build
1414

1515
RUN echo "export ARCH=aarch64" > /freebsd-arch.sh
1616
COPY freebsd-common.sh /

‎docker/Dockerfile.aarch64-unknown-linux-gnu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04 as cross-base
1+
FROM ubuntu:20.04 AS cross-base
22
ENV DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /
@@ -10,7 +10,7 @@ RUN /cmake.sh
1010
COPY xargo.sh /
1111
RUN /xargo.sh
1212

13-
FROM cross-base as build
13+
FROM cross-base AS build
1414

1515
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
1616
g++-aarch64-linux-gnu \

‎docker/Dockerfile.aarch64-unknown-linux-gnu.centos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04 as base
1+
FROM ubuntu:20.04 AS base
22

33
COPY lib.sh /
44
COPY linux-image.sh /

‎docker/Dockerfile.aarch64-unknown-linux-musl

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04 as cross-base
1+
FROM ubuntu:20.04 AS cross-base
22
ENV DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /
@@ -10,14 +10,21 @@ RUN /cmake.sh
1010
COPY xargo.sh /
1111
RUN /xargo.sh
1212

13-
FROM cross-base as build
13+
FROM cross-base AS build
1414

1515
COPY qemu.sh /
1616
RUN /qemu.sh aarch64
1717

1818
COPY musl.sh /
1919
RUN /musl.sh TARGET=aarch64-linux-musl
2020

21+
COPY tidyup.sh /
22+
RUN /tidyup.sh
23+
24+
FROM scratch AS final
25+
COPY --from=build / /
26+
CMD ["/bin/bash"]
27+
2128
ENV CROSS_TOOLCHAIN_PREFIX=aarch64-linux-musl-
2229
ENV CROSS_SYSROOT=/usr/local/aarch64-linux-musl
2330
COPY musl-symlink.sh /

‎docker/Dockerfile.arm-linux-androideabi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04 as cross-base
1+
FROM ubuntu:20.04 AS cross-base
22
ENV DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /
@@ -10,7 +10,7 @@ RUN /cmake.sh
1010
COPY xargo.sh /
1111
RUN /xargo.sh
1212

13-
FROM cross-base as build
13+
FROM cross-base AS build
1414

1515
COPY qemu.sh /
1616
RUN /qemu.sh arm

‎docker/Dockerfile.arm-unknown-linux-gnueabi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04 as cross-base
1+
FROM ubuntu:20.04 AS cross-base
22
ENV DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /
@@ -10,7 +10,7 @@ RUN /cmake.sh
1010
COPY xargo.sh /
1111
RUN /xargo.sh
1212

13-
FROM cross-base as build
13+
FROM cross-base AS build
1414

1515
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
1616
g++-arm-linux-gnueabi \

‎docker/Dockerfile.arm-unknown-linux-gnueabihf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04 as cross-base
1+
FROM ubuntu:20.04 AS cross-base
22
ENV DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /
@@ -10,14 +10,14 @@ RUN /cmake.sh
1010
COPY xargo.sh /
1111
RUN /xargo.sh
1212

13-
FROM cross-base as build
13+
FROM cross-base AS build
1414

1515
ARG VERBOSE
1616
COPY crosstool-ng.sh /
1717
COPY crosstool-config/arm-unknown-linux-gnueabihf.config /
1818
RUN /crosstool-ng.sh arm-unknown-linux-gnueabihf.config 5
1919

20-
ENV PATH /x-tools/arm-unknown-linux-gnueabihf/bin/:$PATH
20+
ENV PATH=/x-tools/arm-unknown-linux-gnueabihf/bin/:$PATH
2121

2222
COPY deny-debian-packages.sh /
2323
RUN TARGET_ARCH=armhf /deny-debian-packages.sh

‎docker/Dockerfile.arm-unknown-linux-musleabi

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04 as cross-base
1+
FROM ubuntu:20.04 AS cross-base
22
ENV DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /
@@ -10,7 +10,7 @@ RUN /cmake.sh
1010
COPY xargo.sh /
1111
RUN /xargo.sh
1212

13-
FROM cross-base as build
13+
FROM cross-base AS build
1414

1515
COPY qemu.sh /
1616
RUN /qemu.sh arm
@@ -22,6 +22,13 @@ RUN /musl.sh \
2222
--with-float=soft \
2323
--with-mode=arm"
2424

25+
COPY tidyup.sh /
26+
RUN /tidyup.sh
27+
28+
FROM scratch AS final
29+
COPY --from=build / /
30+
CMD ["/bin/bash"]
31+
2532
ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-musleabi-
2633
ENV CROSS_SYSROOT=/usr/local/arm-linux-musleabi
2734
COPY musl-symlink.sh /

‎docker/Dockerfile.arm-unknown-linux-musleabihf

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04 as cross-base
1+
FROM ubuntu:20.04 AS cross-base
22
ENV DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /
@@ -10,7 +10,7 @@ RUN /cmake.sh
1010
COPY xargo.sh /
1111
RUN /xargo.sh
1212

13-
FROM cross-base as build
13+
FROM cross-base AS build
1414

1515
COPY qemu.sh /
1616
RUN /qemu.sh arm
@@ -23,6 +23,13 @@ RUN /musl.sh \
2323
--with-float=hard \
2424
--with-mode=arm"
2525

26+
COPY tidyup.sh /
27+
RUN /tidyup.sh
28+
29+
FROM scratch AS final
30+
COPY --from=build / /
31+
CMD ["/bin/bash"]
32+
2633
ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-musleabihf-
2734
ENV CROSS_SYSROOT=/usr/local/arm-linux-musleabihf
2835
COPY musl-symlink.sh /

‎docker/Dockerfile.armv5te-unknown-linux-gnueabi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04 as cross-base
1+
FROM ubuntu:20.04 AS cross-base
22
ENV DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /
@@ -10,7 +10,7 @@ RUN /cmake.sh
1010
COPY xargo.sh /
1111
RUN /xargo.sh
1212

13-
FROM cross-base as build
13+
FROM cross-base AS build
1414

1515
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
1616
g++-arm-linux-gnueabi \

‎docker/Dockerfile.armv5te-unknown-linux-musleabi

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04 as cross-base
1+
FROM ubuntu:20.04 AS cross-base
22
ENV DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /
@@ -10,7 +10,7 @@ RUN /cmake.sh
1010
COPY xargo.sh /
1111
RUN /xargo.sh
1212

13-
FROM cross-base as build
13+
FROM cross-base AS build
1414

1515
COPY qemu.sh /
1616
RUN /qemu.sh arm
@@ -22,6 +22,13 @@ RUN /musl.sh \
2222
--with-float=soft \
2323
--with-mode=arm"
2424

25+
COPY tidyup.sh /
26+
RUN /tidyup.sh
27+
28+
FROM scratch AS final
29+
COPY --from=build / /
30+
CMD ["/bin/bash"]
31+
2532
ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-musleabi-
2633
ENV CROSS_SYSROOT=/usr/local/arm-linux-musleabi
2734
COPY musl-symlink.sh /

‎docker/Dockerfile.armv7-linux-androideabi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04 as cross-base
1+
FROM ubuntu:20.04 AS cross-base
22
ENV DEBIAN_FRONTEND=noninteractive
33

44
COPY common.sh lib.sh /
@@ -10,7 +10,7 @@ RUN /cmake.sh
1010
COPY xargo.sh /
1111
RUN /xargo.sh
1212

13-
FROM cross-base as build
13+
FROM cross-base AS build
1414

1515
COPY qemu.sh /
1616
RUN /qemu.sh arm

0 commit comments

Comments
 (0)