From 81e6c23c457ad6a33d17be80ed3ff115be6cb281 Mon Sep 17 00:00:00 2001 From: Evan Ye Date: Tue, 13 Apr 2021 11:16:25 -0800 Subject: [PATCH 1/4] Move ubuntu 16 to experimental, ubuntu 18 / dbr 7 to standard --- .../ubuntu/ubuntu16.04-minimal}/Dockerfile | 0 .../{ubuntu18.04-minimal => ubuntu16.04-minimal}/README.md | 2 +- ubuntu/minimal/README.md | 2 +- .../ubuntu18.04-minimal => ubuntu/minimal}/ubuntu18.04-minimal | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename {ubuntu/minimal => experimental/ubuntu/ubuntu16.04-minimal}/Dockerfile (100%) rename experimental/ubuntu/{ubuntu18.04-minimal => ubuntu16.04-minimal}/README.md (68%) rename {experimental/ubuntu/ubuntu18.04-minimal => ubuntu/minimal}/ubuntu18.04-minimal (100%) diff --git a/ubuntu/minimal/Dockerfile b/experimental/ubuntu/ubuntu16.04-minimal/Dockerfile similarity index 100% rename from ubuntu/minimal/Dockerfile rename to experimental/ubuntu/ubuntu16.04-minimal/Dockerfile diff --git a/experimental/ubuntu/ubuntu18.04-minimal/README.md b/experimental/ubuntu/ubuntu16.04-minimal/README.md similarity index 68% rename from experimental/ubuntu/ubuntu18.04-minimal/README.md rename to experimental/ubuntu/ubuntu16.04-minimal/README.md index 78d1283..3e22f05 100644 --- a/experimental/ubuntu/ubuntu18.04-minimal/README.md +++ b/experimental/ubuntu/ubuntu16.04-minimal/README.md @@ -1,4 +1,4 @@ -# This image specifically for Databricks Runtime 7.x; please check there for reference https://docs.databricks.com/release-notes/runtime/releases.html#databricks-runtime-releases +# This image specifically for Databricks Runtime 6.x; please check here for reference https://docs.databricks.com/release-notes/runtime/releases.html#databricks-runtime-releases # Minimal Container diff --git a/ubuntu/minimal/README.md b/ubuntu/minimal/README.md index 3e22f05..78d1283 100644 --- a/ubuntu/minimal/README.md +++ b/ubuntu/minimal/README.md @@ -1,4 +1,4 @@ -# This image specifically for Databricks Runtime 6.x; please check here for reference https://docs.databricks.com/release-notes/runtime/releases.html#databricks-runtime-releases +# This image specifically for Databricks Runtime 7.x; please check there for reference https://docs.databricks.com/release-notes/runtime/releases.html#databricks-runtime-releases # Minimal Container diff --git a/experimental/ubuntu/ubuntu18.04-minimal/ubuntu18.04-minimal b/ubuntu/minimal/ubuntu18.04-minimal similarity index 100% rename from experimental/ubuntu/ubuntu18.04-minimal/ubuntu18.04-minimal rename to ubuntu/minimal/ubuntu18.04-minimal From 189dfc1b008025f12d8611ded1d9c05b1adbc2e3 Mon Sep 17 00:00:00 2001 From: Evan Ye Date: Tue, 13 Apr 2021 11:36:24 -0800 Subject: [PATCH 2/4] rename --- ubuntu/minimal/{ubuntu18.04-minimal => Dockerfile} | 1 - 1 file changed, 1 deletion(-) rename ubuntu/minimal/{ubuntu18.04-minimal => Dockerfile} (74%) diff --git a/ubuntu/minimal/ubuntu18.04-minimal b/ubuntu/minimal/Dockerfile similarity index 74% rename from ubuntu/minimal/ubuntu18.04-minimal rename to ubuntu/minimal/Dockerfile index 23d1cf8..1af094a 100644 --- a/ubuntu/minimal/ubuntu18.04-minimal +++ b/ubuntu/minimal/Dockerfile @@ -8,7 +8,6 @@ RUN apt-get update \ sudo \ coreutils \ procps \ - strace \ #strace should be installed for users who are trying to set withStrace on their clusters && /var/lib/dpkg/info/ca-certificates-java.postinst configure \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* From 14ee068b270f4057254d5153fe1714c72c3ff298 Mon Sep 17 00:00:00 2001 From: Evan Ye Date: Tue, 13 Apr 2021 11:44:23 -0800 Subject: [PATCH 3/4] move python virtualenv to experiemental --- {ubuntu => experimental/ubuntu}/python-virtualenv/Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {ubuntu => experimental/ubuntu}/python-virtualenv/Dockerfile (100%) diff --git a/ubuntu/python-virtualenv/Dockerfile b/experimental/ubuntu/python-virtualenv/Dockerfile similarity index 100% rename from ubuntu/python-virtualenv/Dockerfile rename to experimental/ubuntu/python-virtualenv/Dockerfile From 4973146370848b23c00209c276c13e8a07e7d462 Mon Sep 17 00:00:00 2001 From: Evan Ye Date: Tue, 13 Apr 2021 11:44:59 -0800 Subject: [PATCH 4/4] upgrade python --- ubuntu/python/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/python/Dockerfile b/ubuntu/python/Dockerfile index 58624eb..233a7ba 100644 --- a/ubuntu/python/Dockerfile +++ b/ubuntu/python/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 as builder +FROM ubuntu:18.04 as builder RUN apt-get update && apt-get install --yes \ wget \