From 3bac0d660112aade8a576d3e8d469c573b9dd181 Mon Sep 17 00:00:00 2001 From: Tatsuyuki Ishi Date: Tue, 1 May 2018 18:32:47 +0900 Subject: [PATCH 1/3] Upgrade to Ubuntu 18.04 bionic --- ubuntu-dev/ubuntu-dev.dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ubuntu-dev/ubuntu-dev.dockerfile b/ubuntu-dev/ubuntu-dev.dockerfile index 3329fd2..287c7b3 100644 --- a/ubuntu-dev/ubuntu-dev.dockerfile +++ b/ubuntu-dev/ubuntu-dev.dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM ubuntu:18.04 # Install HTTPS transport for Ubuntu package sources. RUN apt-get update \ @@ -7,16 +7,13 @@ RUN apt-get update \ # Add source for the latest Clang packages. COPY llvm-snapshot.gpg.key /tmp -RUN echo "deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main" > /etc/apt/sources.list.d/llvm.list \ +RUN echo "deb https://apt.llvm.org/bionic/ llvm-toolchain-bionic-6.0 main" > /etc/apt/sources.list.d/llvm.list \ && apt-key add /tmp/llvm-snapshot.gpg.key \ && rm -f /tmp/llvm-snapshot.gpg.key # Add source for the latest Git packages. RUN add-apt-repository ppa:git-core/ppa -# Add source for the latest Mercurial packages. -RUN add-apt-repository ppa:mercurial-ppa/releases - # Add source for the latest Neovim packages. RUN add-apt-repository ppa:neovim-ppa/stable From 98917f85bd5ba324520967f65dccff8c29aecaf8 Mon Sep 17 00:00:00 2001 From: Tatsuyuki Ishi Date: Tue, 1 May 2018 18:38:52 +0900 Subject: [PATCH 2/3] Add gpg-agent --- ubuntu-dev/ubuntu-dev.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu-dev/ubuntu-dev.dockerfile b/ubuntu-dev/ubuntu-dev.dockerfile index 287c7b3..d49bb6d 100644 --- a/ubuntu-dev/ubuntu-dev.dockerfile +++ b/ubuntu-dev/ubuntu-dev.dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:18.04 # Install HTTPS transport for Ubuntu package sources. RUN apt-get update \ - && apt-get install -y --no-install-recommends apt-transport-https ca-certificates software-properties-common \ + && apt-get install -y --no-install-recommends apt-transport-https ca-certificates software-properties-common gpg-agent \ && rm -rf /var/lib/apt/lists/* # Add source for the latest Clang packages. From 863f8453b89e87f8b8cee335170c81cb1b7b4d43 Mon Sep 17 00:00:00 2001 From: Tatsuyuki Ishi Date: Tue, 1 May 2018 19:24:33 +0900 Subject: [PATCH 3/3] Disable interactive configuration --- ubuntu-dev/ubuntu-dev.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu-dev/ubuntu-dev.dockerfile b/ubuntu-dev/ubuntu-dev.dockerfile index d49bb6d..d931b47 100644 --- a/ubuntu-dev/ubuntu-dev.dockerfile +++ b/ubuntu-dev/ubuntu-dev.dockerfile @@ -20,7 +20,7 @@ RUN add-apt-repository ppa:neovim-ppa/stable # Install basic development packages. RUN __LLVM_VERSION__="6.0" \ && apt-get update \ - && apt-get install -y --no-install-recommends \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ autoconf \ automake \ bash-completion \