From 547927e1d3cd275c4f22ea7e3bdeeb39500037e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Mon, 25 Jan 2021 13:05:42 +0200 Subject: [PATCH] dockerfile: Install the zip tool in the base image This is needed when packaging the cross built toolchains anyway. --- Dockerfile | 2 +- Dockerfile.cross | 5 ----- Dockerfile.dev | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index fc7c202..df0228a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:18.04 RUN apt-get update -qq && apt-get install -qqy --no-install-recommends \ git wget bzip2 file unzip libtool pkg-config cmake build-essential \ automake yasm gettext autopoint vim-tiny python3 python3-distutils \ - ninja-build ca-certificates curl less && \ + ninja-build ca-certificates curl less zip && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* diff --git a/Dockerfile.cross b/Dockerfile.cross index 3d79cea..2ce8fc0 100644 --- a/Dockerfile.cross +++ b/Dockerfile.cross @@ -11,11 +11,6 @@ ARG BASE=mstorsjo/llvm-mingw:dev FROM $BASE -RUN apt-get update -qq && \ - apt-get install -qqy zip && \ - apt-get clean -y && \ - rm -rf /var/lib/apt/lists/* - ARG CROSS_ARCH=x86_64 ENV CROSS_TOOLCHAIN_PREFIX=/opt/llvm-mingw-$CROSS_ARCH diff --git a/Dockerfile.dev b/Dockerfile.dev index 1e5160c..3c4279c 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -3,7 +3,7 @@ FROM ubuntu:18.04 RUN apt-get update -qq && apt-get install -qqy --no-install-recommends \ git wget bzip2 file unzip libtool pkg-config cmake build-essential \ automake yasm gettext autopoint vim-tiny python3 python3-distutils \ - ninja-build ca-certificates curl less && \ + ninja-build ca-certificates curl less zip && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/*