From e84bfca5a5d8936b13a7acf457dbe8102b8c6b90 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 16 Jun 2020 13:45:35 -0700 Subject: [PATCH 1/4] xenial needs newer cmake, too --- dockerbuild/Dockerfile.ubuntu-xenial | 8 ++++---- dockerbuild/Dockerfile.ubuntu-xenial-x64 | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 dockerbuild/Dockerfile.ubuntu-xenial-x64 diff --git a/dockerbuild/Dockerfile.ubuntu-xenial b/dockerbuild/Dockerfile.ubuntu-xenial index 4d371ca37..0798a44d3 100644 --- a/dockerbuild/Dockerfile.ubuntu-xenial +++ b/dockerbuild/Dockerfile.ubuntu-xenial @@ -7,10 +7,10 @@ RUN apt-get update && apt-get -y install build-essential curl ca-certificates de RUN curl -s -k $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \ rm go.tar.gz -RUN curl -s -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh -o cmake.sh && \ - chmod +x cmake.sh && \ - ./cmake.sh --skip-license --exclude-subdir && \ - rm cmake.sh +RUN curl -s -k -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3.tar.gz -o cmake-3.17.3.tar.gz && tar -xzf cmake-3.17.3.tar.gz +WORKDIR /cmake-3.17.3 +RUN ./bootstrap && make -j8 && make install +WORKDIR / RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build diff --git a/dockerbuild/Dockerfile.ubuntu-xenial-x64 b/dockerbuild/Dockerfile.ubuntu-xenial-x64 new file mode 100644 index 000000000..4d371ca37 --- /dev/null +++ b/dockerbuild/Dockerfile.ubuntu-xenial-x64 @@ -0,0 +1,19 @@ +FROM ubuntu:xenial-20200114 + +ARG go_pkg_url + +RUN apt-get update && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd + +RUN curl -s -k $go_pkg_url -o go.tar.gz && \ + tar -C /usr/local -xzf go.tar.gz && \ + rm go.tar.gz +RUN curl -s -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh -o cmake.sh && \ + chmod +x cmake.sh && \ + ./cmake.sh --skip-license --exclude-subdir && \ + rm cmake.sh + + +RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build +RUN chmod 777 /home && mkdir -p /home/jenkins-build && chown jenkins-build:jenkins-build /home/jenkins-build && chmod 777 /home/jenkins-build +CMD ["/usr/bin/sshd", "-D"] + From 1f3f9bc341d9c013f6d816c34adbd93bef98c712 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 16 Jun 2020 13:52:26 -0700 Subject: [PATCH 2/4] for ptrdiff_t --- core/Utils.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/Utils.hpp b/core/Utils.hpp index 9da4e4729..237985d83 100644 --- a/core/Utils.hpp +++ b/core/Utils.hpp @@ -19,6 +19,8 @@ #include #include #include +#include +#include namespace ZeroTier { From 3db0e9d0687d1e085878428076744d56bf40c240 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 16 Jun 2020 14:07:40 -0700 Subject: [PATCH 3/4] use correct dockerfile for Xenial x64 --- dockerbuild/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerbuild/Makefile b/dockerbuild/Makefile index e566c74dc..cb54f9bc6 100644 --- a/dockerbuild/Makefile +++ b/dockerbuild/Makefile @@ -82,7 +82,7 @@ ubuntu-trusty: @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-ppc64le.tar.gz" --platform linux/ppc64le -f Dockerfile.ubuntu-trusty . -t ztbuild/ubuntu-trusty-ppc64le --load ubuntu-xenial: - @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" --platform linux/amd64 -f Dockerfile.ubuntu-xenial . -t ztbuild/ubuntu-xenial-amd64 --load + @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" --platform linux/amd64 -f Dockerfile.ubuntu-xenial-x64 . -t ztbuild/ubuntu-xenial-amd64 --load @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-arm64.tar.gz" --platform linux/arm64 -f Dockerfile.ubuntu-xenial . -t ztbuild/ubuntu-xenial-arm64 --load @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-armv6l.tar.gz" --platform linux/arm/v7 -f Dockerfile.ubuntu-xenial . -t ztbuild/ubuntu-xenial-armhf --load @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-386.tar.gz" --platform linux/386 -f Dockerfile.ubuntu-xenial . -t ztbuild/ubuntu-xenial-i386 --load From 423b0d891cf4ced04622d7619aa3e9581057e0a9 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 16 Jun 2020 14:48:27 -0700 Subject: [PATCH 4/4] need stdint.h on Windows, too --- core/zerotier.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/zerotier.h b/core/zerotier.h index 66275b093..e2a966cab 100644 --- a/core/zerotier.h +++ b/core/zerotier.h @@ -27,9 +27,10 @@ #include #include #include +#endif + #include #include -#endif #ifdef __cplusplus extern "C" {