Skip to content

Commit 750a7a6

Browse files
committed
Auto merge of #1297 - mati865:docker-images-working, r=gnzlbg
Upgrade bunch of EOL docker images to Ubuntu 18.04 When upgrading other Dockerfiles (not modified in this PR) they fail with different errors: https://travis-ci.com/mati865/libc/jobs/181623075 https://travis-ci.com/mati865/libc/jobs/181623059 https://travis-ci.com/mati865/libc/jobs/181623067 I think it's because of these 2 commits in glibc: https://sourceware.org/git/?p=glibc.git;a=commit;h=b05cb613e7ae507680c8d914b3e788eea782c0d6 https://sourceware.org/git/?p=glibc.git;a=commit;h=2dba5ce7b8115d6a2789bf279892263621088e74 I have no idea how to fix them so leaving it for somebody who knows what to do.
2 parents 83d97c2 + 96eb1b2 commit 750a7a6

File tree

10 files changed

+11
-11
lines changed

10 files changed

+11
-11
lines changed

ci/docker/aarch64-unknown-linux-musl/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:17.10
1+
FROM ubuntu:18.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc make libc6-dev git curl ca-certificates \

ci/docker/arm-unknown-linux-musleabihf/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:17.10
1+
FROM ubuntu:18.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc make libc6-dev git curl ca-certificates \

ci/docker/i686-unknown-linux-musl/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:17.10
1+
FROM ubuntu:18.04
22

33
RUN dpkg --add-architecture i386
44
RUN apt-get update

ci/docker/mips-unknown-linux-musl/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:17.10
1+
FROM ubuntu:18.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates qemu-system-mips curl \

ci/docker/mipsel-unknown-linux-musl/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:17.10
1+
FROM ubuntu:18.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates qemu-system-mips curl \
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:17.10
1+
FROM ubuntu:18.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \
@@ -7,4 +7,5 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
77

88
ENV CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_LINKER=powerpc-linux-gnu-gcc \
99
CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_RUNNER="qemu-ppc -L /usr/powerpc-linux-gnu" \
10+
CC=powerpc-linux-gnu-gcc \
1011
PATH=$PATH:/rust/bin

ci/docker/powerpc64-unknown-linux-gnu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:17.10
1+
FROM ubuntu:18.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:17.10
1+
FROM ubuntu:18.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

ci/docker/x86_64-unknown-linux-musl/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:17.10
1+
FROM ubuntu:18.04
22

33
RUN apt-get update
44
RUN apt-get install -y --no-install-recommends \

src/unix/notbsd/linux/other/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -670,8 +670,7 @@ pub const NFPROTO_NETDEV: ::c_int = 5;
670670

671671
// linux/netfilter/nf_tables.h
672672
cfg_if!{
673-
if #[cfg(any(target_arch = "arm", target_arch = "powerpc",
674-
target_arch = "powerpc64", target_arch = "aarch64"))] {
673+
if #[cfg(any(target_arch = "arm", target_arch = "aarch64"))] {
675674
pub const NFT_TABLE_MAXNAMELEN: ::c_int = 32;
676675
pub const NFT_CHAIN_MAXNAMELEN: ::c_int = 32;
677676
pub const NFT_SET_MAXNAMELEN: ::c_int = 32;

0 commit comments

Comments
 (0)