Docker script update for Ubuntu 20.04

2020-04-26 15:04:07 -04:00 · 2020-04-26 15:04:07 -04:00 · 4ceae8857d
parent f0a405f17c
commit 4ceae8857d
26 changed files with 12 additions and 44 deletions
--- a/docker/debian/buster/latest
+++ b/docker/debian/buster/latest
--- a/docker/centos/latest
+++ b/docker/centos/latest
@ -1 +0,0 @@
-8
--- a/docker/centos/latest/base/Dockerfile
+++ b/docker/centos/latest/base/Dockerfile
--- a/docker/centos/latest/dev/Dockerfile
+++ b/docker/centos/latest/dev/Dockerfile
--- a/docker/centos/latest/dev/setup.sh
+++ b/docker/centos/latest/dev/setup.sh
--- a/docker/debian/buster
+++ b/docker/debian/buster
@ -0,0 +1 @@
+../ubuntu/latest
--- a/docker/debian/buster/base/Dockerfile
+++ b/docker/debian/buster/base/Dockerfile
@ -1,32 +0,0 @@
-ARG dist=ubuntu
-ARG tag=latest
-FROM ${dist}:${tag}
-
-MAINTAINER Sukchan Lee <acetcom@gmail.com>
-
-RUN apt-get update && \
-    apt-get upgrade -y && \
-    apt-get install -y --no-install-recommends \
-        python3-pip \
-        python3-setuptools \
-        python3-wheel \
-        ninja-build \
-        build-essential \
-        flex \
-        bison \
-        git \
-        libsctp-dev \
-        libgnutls28-dev \
-        libgcrypt-dev \
-        libssl-dev \
-        libidn11-dev \
-        libmongoc-dev \
-        libbson-dev \
-        libyaml-dev \
-        iproute2 \
-        ca-certificates \
-        netbase \
-        pkg-config && \
-    apt-get clean
-RUN python3 -m pip install --upgrade pip
-RUN python3 -m pip install meson
--- a/docker/debian/buster/dev
+++ b/docker/debian/buster/dev
@ -1 +0,0 @@
-../../ubuntu/bionic/dev
--- a/docker/debian/buster/stable
+++ b/docker/debian/buster/stable
@ -1 +0,0 @@
-stable
--- a/docker/debian/latest
+++ b/docker/debian/latest
@ -1 +1 @@
-buster
+../ubuntu/latest
--- a/docker/debian/stable
+++ b/docker/debian/stable
@ -1 +1 @@
-buster
+../ubuntu/latest
--- a/docker/debian/stretch
+++ b/docker/debian/stretch
@ -1 +1 @@
-buster
+../ubuntu/latest
--- a/docker/fedora/29
+++ b/docker/fedora/29
@ -1 +1 @@
-30
+latest
--- a/docker/fedora/30
+++ b/docker/fedora/30
@ -0,0 +1 @@
+latest
--- a/docker/fedora/latest
+++ b/docker/fedora/latest
@ -1 +0,0 @@
-30
--- a/docker/fedora/latest/base/Dockerfile
+++ b/docker/fedora/latest/base/Dockerfile
--- a/docker/fedora/latest/dev/Dockerfile
+++ b/docker/fedora/latest/dev/Dockerfile
--- a/docker/fedora/latest/dev/setup.sh
+++ b/docker/fedora/latest/dev/setup.sh
--- a/docker/ubuntu/bionic
+++ b/docker/ubuntu/bionic
@ -0,0 +1 @@
+latest
--- a/docker/ubuntu/eoan
+++ b/docker/ubuntu/eoan
@ -1 +1 @@
-bionic
+latest
--- a/docker/ubuntu/focal
+++ b/docker/ubuntu/focal
@ -0,0 +1 @@
+latest
--- a/docker/ubuntu/latest
+++ b/docker/ubuntu/latest
@ -1 +0,0 @@
-bionic
--- a/docker/ubuntu/latest/base/Dockerfile
+++ b/docker/ubuntu/latest/base/Dockerfile
@ -6,6 +6,7 @@ MAINTAINER Sukchan Lee <acetcom@gmail.com>

 RUN apt-get update && \
    apt-get upgrade -y && \
+    DEBIAN_FRONTEND=noninteractive \
    apt-get install -y --no-install-recommends \
        python3-pip \
        python3-setuptools \
@ -15,6 +16,7 @@ RUN apt-get update && \
        flex \
        bison \
        git \
+        meson \
        libsctp-dev \
        libgnutls28-dev \
        libgcrypt-dev \
@ -28,4 +30,3 @@ RUN apt-get update && \
        netbase \
        pkg-config && \
    apt-get clean
-RUN python3 -m pip install meson
--- a/docker/ubuntu/latest/dev/Dockerfile
+++ b/docker/ubuntu/latest/dev/Dockerfile
--- a/docker/ubuntu/latest/dev/setup.sh
+++ b/docker/ubuntu/latest/dev/setup.sh
--- a/docker/ubuntu/xenial
+++ b/docker/ubuntu/xenial
@ -1 +1 @@
-bionic
+latest
 @ -1 +1 @@
 
 latest