From 2c1a4645d93551f70e3cfb28fd76924df75ed68e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 24 Mar 2020 23:20:14 +0200 Subject: [PATCH] Update the base distro used for dockerfiles and linux releases to Ubuntu 18.04 There's probably not much need for binaries based on 16.04 any longer. --- Dockerfile | 2 +- Dockerfile.dev | 2 +- release.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a10d8a3..318649b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +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 \ diff --git a/Dockerfile.dev b/Dockerfile.dev index baccb75..b553fc5 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +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 \ diff --git a/release.sh b/release.sh index 6872a2c..ba6a8d4 100755 --- a/release.sh +++ b/release.sh @@ -26,7 +26,7 @@ TAG=$1 time docker build -f Dockerfile . -t mstorsjo/llvm-mingw:latest -t mstorsjo/llvm-mingw:$TAG time docker build -f Dockerfile.dev . -t mstorsjo/llvm-mingw:dev -t mstorsjo/llvm-mingw:dev-$TAG -DISTRO=ubuntu-16.04 +DISTRO=ubuntu-18.04 docker run --rm mstorsjo/llvm-mingw:latest sh -c "cd /opt && mv llvm-mingw llvm-mingw-$TAG-$DISTRO && tar -Jcvf - llvm-mingw-$TAG-$DISTRO" > llvm-mingw-$TAG-$DISTRO.tar.xz cleanup() {