Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade bunch of EOL docker images to Ubuntu 18.04 #1297

Merged
merged 2 commits into from Mar 3, 2019
Merged

Upgrade bunch of EOL docker images to Ubuntu 18.04 #1297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
481a521
Upgrade bunch of EOL docker images to Ubuntu 18.04
mati865 Mar 1, 2019
96eb1b2
Bump NFT_*_MAXNAMELEN to 256 for PPC
mati865 Mar 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/docker/aarch64-unknown-linux-musl/Dockerfile
View file
Open in desktop
@@ -1,4 +1,4 @@
FROM ubuntu:17.10
FROM ubuntu:18.04

RUN apt-get update && apt-get install -y --no-install-recommends \
gcc make libc6-dev git curl ca-certificates \
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/arm-unknown-linux-musleabihf/Dockerfile
View file
Open in desktop
@@ -1,4 +1,4 @@
FROM ubuntu:17.10
FROM ubuntu:18.04

RUN apt-get update && apt-get install -y --no-install-recommends \
gcc make libc6-dev git curl ca-certificates \
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/i686-unknown-linux-musl/Dockerfile
View file
Open in desktop
@@ -1,4 +1,4 @@
FROM ubuntu:17.10
FROM ubuntu:18.04

RUN dpkg --add-architecture i386
RUN apt-get update
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/mips-unknown-linux-musl/Dockerfile
View file
Open in desktop
@@ -1,4 +1,4 @@
FROM ubuntu:17.10
FROM ubuntu:18.04

RUN apt-get update && apt-get install -y --no-install-recommends \
gcc libc6-dev qemu-user ca-certificates qemu-system-mips curl \
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/mipsel-unknown-linux-musl/Dockerfile
View file
Open in desktop
@@ -1,4 +1,4 @@
FROM ubuntu:17.10
FROM ubuntu:18.04

RUN apt-get update && apt-get install -y --no-install-recommends \
gcc libc6-dev qemu-user ca-certificates qemu-system-mips curl \
Expand Down
3 changes: 2 additions & 1 deletion ci/docker/powerpc-unknown-linux-gnu/Dockerfile
View file
Open in desktop
@@ -1,4 +1,4 @@
FROM ubuntu:17.10
FROM ubuntu:18.04

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

ENV CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_LINKER=powerpc-linux-gnu-gcc \
CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_RUNNER="qemu-ppc -L /usr/powerpc-linux-gnu" \
CC=powerpc-linux-gnu-gcc \
PATH=$PATH:/rust/bin
2 changes: 1 addition & 1 deletion ci/docker/powerpc64-unknown-linux-gnu/Dockerfile
View file
Open in desktop
@@ -1,4 +1,4 @@
FROM ubuntu:17.10
FROM ubuntu:18.04

RUN apt-get update && apt-get install -y --no-install-recommends \
gcc libc6-dev qemu-user ca-certificates \
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile
View file
Open in desktop
@@ -1,4 +1,4 @@
FROM ubuntu:17.10
FROM ubuntu:18.04

RUN apt-get update && apt-get install -y --no-install-recommends \
gcc libc6-dev qemu-user ca-certificates \
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/x86_64-unknown-linux-musl/Dockerfile
View file
Open in desktop
@@ -1,4 +1,4 @@
FROM ubuntu:17.10
FROM ubuntu:18.04

RUN apt-get update
RUN apt-get install -y --no-install-recommends \
Expand Down
3 changes: 1 addition & 2 deletions src/unix/notbsd/linux/other/mod.rs
View file
Open in desktop
Expand Up @@ -670,8 +670,7 @@ pub const NFPROTO_NETDEV: ::c_int = 5;

// linux/netfilter/nf_tables.h
cfg_if!{
if #[cfg(any(target_arch = "arm", target_arch = "powerpc",
target_arch = "powerpc64", target_arch = "aarch64"))] {
gnzlbg marked this conversation as resolved.
Show resolved Hide resolved
if #[cfg(any(target_arch = "arm", target_arch = "aarch64"))] {
pub const NFT_TABLE_MAXNAMELEN: ::c_int = 32;
pub const NFT_CHAIN_MAXNAMELEN: ::c_int = 32;
pub const NFT_SET_MAXNAMELEN: ::c_int = 32;
Expand Down