From 4ceae8857d4cc66903a6ecd85e37a24344e28eac Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Sun, 26 Apr 2020 15:04:07 -0400 Subject: [PATCH] Docker script update for Ubuntu 20.04 --- docker/{debian/buster/latest => centos/8} | 0 docker/centos/latest | 1 - docker/centos/{8 => latest}/base/Dockerfile | 0 docker/centos/{8 => latest}/dev/Dockerfile | 0 docker/centos/{8 => latest}/dev/setup.sh | 0 docker/debian/buster | 1 + docker/debian/buster/base/Dockerfile | 32 ------------------- docker/debian/buster/dev | 1 - docker/debian/buster/stable | 1 - docker/debian/latest | 2 +- docker/debian/stable | 2 +- docker/debian/stretch | 2 +- docker/fedora/29 | 2 +- docker/fedora/30 | 1 + docker/fedora/latest | 1 - docker/fedora/{30 => latest}/base/Dockerfile | 0 docker/fedora/{30 => latest}/dev/Dockerfile | 0 docker/fedora/{30 => latest}/dev/setup.sh | 0 docker/ubuntu/bionic | 1 + docker/ubuntu/eoan | 2 +- docker/ubuntu/focal | 1 + docker/ubuntu/latest | 1 - .../ubuntu/{bionic => latest}/base/Dockerfile | 3 +- .../ubuntu/{bionic => latest}/dev/Dockerfile | 0 docker/ubuntu/{bionic => latest}/dev/setup.sh | 0 docker/ubuntu/xenial | 2 +- 26 files changed, 12 insertions(+), 44 deletions(-) rename docker/{debian/buster/latest => centos/8} (100%) delete mode 120000 docker/centos/latest rename docker/centos/{8 => latest}/base/Dockerfile (100%) rename docker/centos/{8 => latest}/dev/Dockerfile (100%) rename docker/centos/{8 => latest}/dev/setup.sh (100%) create mode 120000 docker/debian/buster delete mode 100644 docker/debian/buster/base/Dockerfile delete mode 120000 docker/debian/buster/dev delete mode 120000 docker/debian/buster/stable create mode 120000 docker/fedora/30 delete mode 120000 docker/fedora/latest rename docker/fedora/{30 => latest}/base/Dockerfile (100%) rename docker/fedora/{30 => latest}/dev/Dockerfile (100%) rename docker/fedora/{30 => latest}/dev/setup.sh (100%) create mode 120000 docker/ubuntu/bionic create mode 120000 docker/ubuntu/focal delete mode 120000 docker/ubuntu/latest rename docker/ubuntu/{bionic => latest}/base/Dockerfile (92%) rename docker/ubuntu/{bionic => latest}/dev/Dockerfile (100%) rename docker/ubuntu/{bionic => latest}/dev/setup.sh (100%) diff --git a/docker/debian/buster/latest b/docker/centos/8 similarity index 100% rename from docker/debian/buster/latest rename to docker/centos/8 diff --git a/docker/centos/latest b/docker/centos/latest deleted file mode 120000 index 301160a930..0000000000 --- a/docker/centos/latest +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/centos/8/base/Dockerfile b/docker/centos/latest/base/Dockerfile similarity index 100% rename from docker/centos/8/base/Dockerfile rename to docker/centos/latest/base/Dockerfile diff --git a/docker/centos/8/dev/Dockerfile b/docker/centos/latest/dev/Dockerfile similarity index 100% rename from docker/centos/8/dev/Dockerfile rename to docker/centos/latest/dev/Dockerfile diff --git a/docker/centos/8/dev/setup.sh b/docker/centos/latest/dev/setup.sh similarity index 100% rename from docker/centos/8/dev/setup.sh rename to docker/centos/latest/dev/setup.sh diff --git a/docker/debian/buster b/docker/debian/buster new file mode 120000 index 0000000000..df37e9d5b4 --- /dev/null +++ b/docker/debian/buster @@ -0,0 +1 @@ +../ubuntu/latest \ No newline at end of file diff --git a/docker/debian/buster/base/Dockerfile b/docker/debian/buster/base/Dockerfile deleted file mode 100644 index 6333bcb877..0000000000 --- a/docker/debian/buster/base/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -ARG dist=ubuntu -ARG tag=latest -FROM ${dist}:${tag} - -MAINTAINER Sukchan Lee - -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 diff --git a/docker/debian/buster/dev b/docker/debian/buster/dev deleted file mode 120000 index 08e6badb1e..0000000000 --- a/docker/debian/buster/dev +++ /dev/null @@ -1 +0,0 @@ -../../ubuntu/bionic/dev \ No newline at end of file diff --git a/docker/debian/buster/stable b/docker/debian/buster/stable deleted file mode 120000 index 870bbe4e50..0000000000 --- a/docker/debian/buster/stable +++ /dev/null @@ -1 +0,0 @@ -stable \ No newline at end of file diff --git a/docker/debian/latest b/docker/debian/latest index 766a99ab63..df37e9d5b4 120000 --- a/docker/debian/latest +++ b/docker/debian/latest @@ -1 +1 @@ -buster \ No newline at end of file +../ubuntu/latest \ No newline at end of file diff --git a/docker/debian/stable b/docker/debian/stable index 766a99ab63..df37e9d5b4 120000 --- a/docker/debian/stable +++ b/docker/debian/stable @@ -1 +1 @@ -buster \ No newline at end of file +../ubuntu/latest \ No newline at end of file diff --git a/docker/debian/stretch b/docker/debian/stretch index 766a99ab63..df37e9d5b4 120000 --- a/docker/debian/stretch +++ b/docker/debian/stretch @@ -1 +1 @@ -buster \ No newline at end of file +../ubuntu/latest \ No newline at end of file diff --git a/docker/fedora/29 b/docker/fedora/29 index 8580e7b684..b9bc2fdcb1 120000 --- a/docker/fedora/29 +++ b/docker/fedora/29 @@ -1 +1 @@ -30 \ No newline at end of file +latest \ No newline at end of file diff --git a/docker/fedora/30 b/docker/fedora/30 new file mode 120000 index 0000000000..b9bc2fdcb1 --- /dev/null +++ b/docker/fedora/30 @@ -0,0 +1 @@ +latest \ No newline at end of file diff --git a/docker/fedora/latest b/docker/fedora/latest deleted file mode 120000 index 8580e7b684..0000000000 --- a/docker/fedora/latest +++ /dev/null @@ -1 +0,0 @@ -30 \ No newline at end of file diff --git a/docker/fedora/30/base/Dockerfile b/docker/fedora/latest/base/Dockerfile similarity index 100% rename from docker/fedora/30/base/Dockerfile rename to docker/fedora/latest/base/Dockerfile diff --git a/docker/fedora/30/dev/Dockerfile b/docker/fedora/latest/dev/Dockerfile similarity index 100% rename from docker/fedora/30/dev/Dockerfile rename to docker/fedora/latest/dev/Dockerfile diff --git a/docker/fedora/30/dev/setup.sh b/docker/fedora/latest/dev/setup.sh similarity index 100% rename from docker/fedora/30/dev/setup.sh rename to docker/fedora/latest/dev/setup.sh diff --git a/docker/ubuntu/bionic b/docker/ubuntu/bionic new file mode 120000 index 0000000000..b9bc2fdcb1 --- /dev/null +++ b/docker/ubuntu/bionic @@ -0,0 +1 @@ +latest \ No newline at end of file diff --git a/docker/ubuntu/eoan b/docker/ubuntu/eoan index 01285abbd6..b9bc2fdcb1 120000 --- a/docker/ubuntu/eoan +++ b/docker/ubuntu/eoan @@ -1 +1 @@ -bionic \ No newline at end of file +latest \ No newline at end of file diff --git a/docker/ubuntu/focal b/docker/ubuntu/focal new file mode 120000 index 0000000000..b9bc2fdcb1 --- /dev/null +++ b/docker/ubuntu/focal @@ -0,0 +1 @@ +latest \ No newline at end of file diff --git a/docker/ubuntu/latest b/docker/ubuntu/latest deleted file mode 120000 index 01285abbd6..0000000000 --- a/docker/ubuntu/latest +++ /dev/null @@ -1 +0,0 @@ -bionic \ No newline at end of file diff --git a/docker/ubuntu/bionic/base/Dockerfile b/docker/ubuntu/latest/base/Dockerfile similarity index 92% rename from docker/ubuntu/bionic/base/Dockerfile rename to docker/ubuntu/latest/base/Dockerfile index 665af5ea02..de6ddff667 100644 --- a/docker/ubuntu/bionic/base/Dockerfile +++ b/docker/ubuntu/latest/base/Dockerfile @@ -6,6 +6,7 @@ MAINTAINER Sukchan Lee 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 diff --git a/docker/ubuntu/bionic/dev/Dockerfile b/docker/ubuntu/latest/dev/Dockerfile similarity index 100% rename from docker/ubuntu/bionic/dev/Dockerfile rename to docker/ubuntu/latest/dev/Dockerfile diff --git a/docker/ubuntu/bionic/dev/setup.sh b/docker/ubuntu/latest/dev/setup.sh similarity index 100% rename from docker/ubuntu/bionic/dev/setup.sh rename to docker/ubuntu/latest/dev/setup.sh diff --git a/docker/ubuntu/xenial b/docker/ubuntu/xenial index 01285abbd6..b9bc2fdcb1 120000 --- a/docker/ubuntu/xenial +++ b/docker/ubuntu/xenial @@ -1 +1 @@ -bionic \ No newline at end of file +latest \ No newline at end of file