From cc22bb6756ff2b5c616dfe64334fded411594d49 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Mon, 2 Dec 2019 19:25:07 +0100 Subject: [PATCH] remove build dependencies during build (ubuntu) --- build/amd64-ubuntu-builder.dockerfile | 9 +++------ build/arm32v7-ubuntu-builder.dockerfile | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/build/amd64-ubuntu-builder.dockerfile b/build/amd64-ubuntu-builder.dockerfile index acd51ac..b089e86 100644 --- a/build/amd64-ubuntu-builder.dockerfile +++ b/build/amd64-ubuntu-builder.dockerfile @@ -49,22 +49,19 @@ RUN set -x \ && make "$PARALLELMFLAGS" install \ && rm -rf "$builddir" -RUN set -x \ - && builddeps="udev python3 python3-pip python3-setuptools python3-wheel ninja-build" \ - && apt install --yes --no-install-recommends $builddeps \ - && pip3 install --system meson - ARG FUSE_VERSION=3.8.0 RUN set -x \ - && builddeps="libtool automake gettext" \ + && builddeps="udev gettext python3 python3-pip python3-setuptools python3-wheel" \ && apt install --yes --no-install-recommends $builddeps \ + && pip3 install --system meson \ && builddir="/tmp/out" \ && mkdir -p "$builddir" \ && cd "$builddir" \ && meson "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \ && ninja \ && ninja install \ + && pip3 uninstall -y meson \ && rm -rf "$builddir" \ && apt purge -y $builddeps diff --git a/build/arm32v7-ubuntu-builder.dockerfile b/build/arm32v7-ubuntu-builder.dockerfile index 1b4f735..96f154a 100644 --- a/build/arm32v7-ubuntu-builder.dockerfile +++ b/build/arm32v7-ubuntu-builder.dockerfile @@ -52,22 +52,19 @@ RUN set -x \ && make "$PARALLELMFLAGS" install \ && rm -rf "$builddir" -RUN set -x \ - && builddeps="udev python3 python3-pip python3-setuptools python3-wheel ninja-build" \ - && apt install --yes --no-install-recommends $builddeps \ - && pip3 install --system meson - ARG FUSE_VERSION=3.8.0 RUN set -x \ - && builddeps="libtool automake gettext" \ + && builddeps="udev gettext python3 python3-pip python3-setuptools python3-wheel" \ && apt install --yes --no-install-recommends $builddeps \ + && pip3 install --system meson \ && builddir="/tmp/out" \ && mkdir -p "$builddir" \ && cd "$builddir" \ && meson "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \ && ninja \ && ninja install \ + && pip3 uninstall -y meson \ && rm -rf "$builddir" \ && apt purge -y $builddeps