aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scripts/Dockerfile.326
-rw-r--r--scripts/Dockerfile.646
-rwxr-xr-xscripts/build-docker-otp5
3 files changed, 5 insertions, 12 deletions
diff --git a/scripts/Dockerfile.32 b/scripts/Dockerfile.32
index 01025340f7..23a360a58e 100644
--- a/scripts/Dockerfile.32
+++ b/scripts/Dockerfile.32
@@ -1,10 +1,6 @@
FROM erlang/ubuntu-build:32bit
-COPY ./otp.tar.gz /buildroot/
-
-WORKDIR /buildroot/
-
-RUN tar xzf otp.tar.gz
+ADD ./otp.tar.gz /buildroot/
WORKDIR /buildroot/otp/
diff --git a/scripts/Dockerfile.64 b/scripts/Dockerfile.64
index c08184d10a..199067e5fe 100644
--- a/scripts/Dockerfile.64
+++ b/scripts/Dockerfile.64
@@ -1,10 +1,6 @@
FROM erlang/ubuntu-build:64bit
-COPY ./otp.tar.gz /buildroot/
-
-WORKDIR /buildroot/
-
-RUN tar xzf otp.tar.gz
+ADD ./otp.tar.gz /buildroot/
WORKDIR /buildroot/otp/
diff --git a/scripts/build-docker-otp b/scripts/build-docker-otp
index 928b84a32d..01bb0b628e 100755
--- a/scripts/build-docker-otp
+++ b/scripts/build-docker-otp
@@ -8,7 +8,8 @@ fi
ARCH="$1"
shift
-git archive --format=tar.gz --prefix=otp/ HEAD >otp.tar.gz
+git archive --format=tar.gz --prefix=otp/ HEAD >scripts/otp.tar.gz
-docker build -t otp --file scripts/Dockerfile.$ARCH .
+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+"$@"}