Browse Source

Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev

pull/1/head
Adam Ierymenko 10 years ago
parent
commit
dbe57742e6
  1. 2
      linux-build-farm/build.sh
  2. 7
      linux-build-farm/fedora-22/x64/Dockerfile
  3. 11
      linux-build-farm/fedora-22/x86/Dockerfile

2
linux-build-farm/build.sh

@ -41,6 +41,8 @@ for distro in $subdirs; do
rm -f *.deb *.rpm
# exit 0
if [ ! -n "`echo $distro | grep -F debian`" -a ! -n "`echo $distro | grep -F ubuntu`" ]; then
docker run --rm -v `pwd`:/artifacts --privileged -it zt1-build-${distro}-x64 /bin/bash -c 'cd /ZeroTierOne ; make redhat ; cd .. ; cp `find /root/rpmbuild -type f -name *.rpm` /artifacts ; ls -l /artifacts'
docker run --rm -v `pwd`:/artifacts --privileged -it zt1-build-${distro}-x86 /bin/bash -c 'cd /ZeroTierOne ; make redhat ; cd .. ; cp `find /root/rpmbuild -type f -name *.rpm` /artifacts ; ls -l /artifacts'

7
linux-build-farm/fedora-22/x64/Dockerfile

@ -0,0 +1,7 @@
FROM fedora:22
MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com>
RUN yum update -y
RUN yum install -y make rpmdevtools gcc-c++ rubygem-ronn json-parser-devel lz4-devel http-parser-devel libnatpmp-devel
ADD zt1-src.tar.gz /

11
linux-build-farm/fedora-22/x86/Dockerfile

@ -0,0 +1,11 @@
FROM nickcis/fedora-32:22
MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com>
RUN mkdir -p /etc/dnf/vars
RUN echo 'i386' >/etc/dnf/vars/basearch
RUN echo 'i386' >/etc/dnf/vars/arch
RUN yum update -y
RUN yum install -y make rpmdevtools gcc-c++ rubygem-ronn json-parser-devel lz4-devel http-parser-devel libnatpmp-devel
ADD zt1-src.tar.gz /
Loading…
Cancel
Save