diff options
author | Lukas Larsson <lukas@erlang.org> | 2020-10-06 10:07:17 +0200 |
---|---|---|
committer | Lukas Larsson <lukas@erlang.org> | 2020-10-06 11:28:41 +0200 |
commit | 6f52de1ae1caecae5a96cad928b0228f17226cb8 (patch) | |
tree | 6b35acbb0d435f0f1bc0b7584eb918d657391996 /scripts | |
parent | 3198c6bb43c322e55e7573043cad50171e3dae31 (diff) | |
download | erlang-6f52de1ae1caecae5a96cad928b0228f17226cb8.tar.gz |
Remove old docker files used by travis ci
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/Dockerfile.32 | 9 | ||||
-rw-r--r-- | scripts/Dockerfile.32.ubuntu | 5 | ||||
-rw-r--r-- | scripts/Dockerfile.64 | 9 | ||||
-rw-r--r-- | scripts/Dockerfile.64.ubuntu | 5 | ||||
-rw-r--r-- | scripts/Dockerfile.beamasm | 28 | ||||
-rw-r--r-- | scripts/Dockerfile.x64cross | 73 | ||||
-rwxr-xr-x | scripts/build-docker-otp | 15 |
7 files changed, 0 insertions, 144 deletions
diff --git a/scripts/Dockerfile.32 b/scripts/Dockerfile.32 deleted file mode 100644 index 23a360a58e..0000000000 --- a/scripts/Dockerfile.32 +++ /dev/null @@ -1,9 +0,0 @@ -FROM erlang/ubuntu-build:32bit - -ADD ./otp.tar.gz /buildroot/ - -WORKDIR /buildroot/otp/ - -ENV MAKEFLAGS -j4 - -CMD ./scripts/build-otp diff --git a/scripts/Dockerfile.32.ubuntu b/scripts/Dockerfile.32.ubuntu deleted file mode 100644 index c334f74379..0000000000 --- a/scripts/Dockerfile.32.ubuntu +++ /dev/null @@ -1,5 +0,0 @@ -FROM 32bit/ubuntu:16.04 - -RUN apt-get update - -RUN apt-get --fix-missing -y install build-essential m4 libncurses5-dev libssh-dev unixodbc-dev libgmp3-dev fop xsltproc default-jdk git autoconf libwxbase3.0-dev libwxgtk3.0-dev diff --git a/scripts/Dockerfile.64 b/scripts/Dockerfile.64 deleted file mode 100644 index 199067e5fe..0000000000 --- a/scripts/Dockerfile.64 +++ /dev/null @@ -1,9 +0,0 @@ -FROM erlang/ubuntu-build:64bit - -ADD ./otp.tar.gz /buildroot/ - -WORKDIR /buildroot/otp/ - -ENV MAKEFLAGS -j4 - -CMD ./scripts/build-otp diff --git a/scripts/Dockerfile.64.ubuntu b/scripts/Dockerfile.64.ubuntu deleted file mode 100644 index 514fea70b5..0000000000 --- a/scripts/Dockerfile.64.ubuntu +++ /dev/null @@ -1,5 +0,0 @@ -FROM ubuntu:16.04 - -RUN apt-get update - -RUN apt-get --fix-missing -y install build-essential m4 libncurses5-dev libssh-dev unixodbc-dev libgmp3-dev fop xsltproc default-jdk git autoconf libwxbase3.0-dev libwxgtk3.0-dev diff --git a/scripts/Dockerfile.beamasm b/scripts/Dockerfile.beamasm deleted file mode 100644 index 7613b5f6c4..0000000000 --- a/scripts/Dockerfile.beamasm +++ /dev/null @@ -1,28 +0,0 @@ -FROM ubuntu:18.04 - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update && apt-get --fix-missing -y install build-essential m4 libncurses5-dev \ - autoconf libssh-dev unixodbc-dev libgmp3-dev xsltproc \ - default-jdk libxml2-utils tzdata ssh openssh-server groff-base \ - sudo gdb apache2 bind9 libsctp-dev lksctp-tools curl - -ENV MAKEFLAGS=-j4 \ - ERL_TOP=/buildroot/otp - -ARG DEBUG=true -ENV DEBUG=$DEBUG - -ADD ./otp.tar.gz /buildroot/ - -WORKDIR /buildroot/otp/ - -RUN ./otp_build autoconf && ./configure --prefix=/otp/ && \ - make && make install && make install FLAVOR=emu - -RUN $DEBUG && make emulator TYPE=debug FLAVOR=emu && make TYPE=debug && \ - make install TYPE=debug - -ENV PATH=/otp/bin/:$PATH - -RUN ./otp_build tests diff --git a/scripts/Dockerfile.x64cross b/scripts/Dockerfile.x64cross deleted file mode 100644 index aec6ab8e34..0000000000 --- a/scripts/Dockerfile.x64cross +++ /dev/null @@ -1,73 +0,0 @@ -## -## This docker file will build Erlang with BEAMASM on 32-bit to 64-bit x86 -## -FROM i386/debian as build - -ARG HOST_ARCH=amd64 -ARG HOST_TRIP=x86_64-linux-gnu - -## See https://wiki.debian.org/Multiarch/HOWTO for details on how to install things -RUN BUILD_ARCH=`dpkg --print-architecture` && \ - dpkg --add-architecture $HOST_ARCH && \ - sed -i "s:deb http:deb [arch=$BUILD_ARCH,$HOST_ARCH] http:g" /etc/apt/sources.list && \ - apt-get update && \ - apt-get -y upgrade && \ - apt-get install -y build-essential m4 autoconf - -RUN apt-get install -y \ - crossbuild-essential-$HOST_ARCH \ - libncurses5-dev:$HOST_ARCH \ - zlib1g-dev:$HOST_ARCH \ - libssl-dev:$HOST_ARCH && \ - mkdir -p /daily_build - -ARG MAKEFLAGS=-j6 -ENV MAKEFLAGS=$MAKEFLAGS \ - ERLC_USE_SERVER=yes \ - ERL_TOP=/buildroot/otp - -ADD otp.tar.gz /buildroot - -WORKDIR /buildroot/otp - -## Build the bootstrap system -RUN ./otp_build autoconf -RUN ./configure --enable-bootstrap-only && make - -## Setup a sysroot as our cross compile system does not -## work perfectly with multiarch yet... crypto for instance -RUN for dir in `find / -type d -name $HOST_TRIP`; do \ - echo -n "$dir: /buildroot/sysroot"; \ - echo `dirname $dir`; \ - mkdir -p /buildroot/sysroot$dir; \ - cp -r `dirname $dir`/* `dirname /buildroot/sysroot$dir`; \ - cp -r $dir/* `dirname /buildroot/sysroot$dir`; \ - done - -ENV HOST=$HOST_TRIP \ - CC=$HOST_TRIP-gcc \ - CPP=$HOST_TRIP-cpp \ - CXX=$HOST_TRIP-g++ \ - LD=$CC \ - DED_LDFLAGS="-shared -Wl,-Bsymbolic" \ - RANLIB=$HOST_TRIP-ranlib \ - AR=$HOST_TRIP-ar \ - erl_xcomp_sysroot=/buildroot/sysroot - -## Build the cross system -RUN ./configure --prefix=/otp/ --host=$HOST --build=`erts/autoconf/config.guess` && \ - make && make install - -FROM debian as install - -RUN apt-get update && \ - apt-get -y upgrade && \ - apt-get install -y \ - libncurses5 \ - zlib1g \ - libssl1.0 - -# Install the released application -COPY --from=build /otp /otp - -RUN /otp/bin/erl -noshell -s init stop diff --git a/scripts/build-docker-otp b/scripts/build-docker-otp deleted file mode 100755 index 01bb0b628e..0000000000 --- a/scripts/build-docker-otp +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -if [ $# -lt 1 ]; then - echo "Usage $0 32|64 [command] [arg]..." - exit 1 -fi - -ARCH="$1" -shift - -git archive --format=tar.gz --prefix=otp/ HEAD >scripts/otp.tar.gz - -docker build -t otp --file scripts/Dockerfile.$ARCH scripts -rm scripts/otp.tar.gz -docker run --volume="$PWD/logs:/buildroot/otp/logs" -i --rm otp ${1+"$@"} |