Make base images use ubuntu 18 and support dbr 7.x (#49)

evanye · web-flow · commit 5d73a68faa8f · 2021-04-14T14:38:45.000-07:00
* Move ubuntu 16 to experimental, ubuntu 18 / dbr 7 to standard

* move python virtualenv to experiemental

* upgrade python

* upgrade dbfsfuse, ssh, standard containers
diff --git a/experimental/ubuntu/python-virtualenv/Dockerfile b/experimental/ubuntu/python-virtualenv/Dockerfile
diff --git a/experimental/ubuntu/ubuntu16.04-minimal/Dockerfile b/experimental/ubuntu/ubuntu16.04-minimal/Dockerfile
@@ -1,4 +1,8 @@
-FROM ubuntu:18.04
+# The minimal image defines the minimum requirements to run a Docker image in Databricks.
+# If you are building your own image from scratch, make sure you have the libraries
+# included below.
+
+FROM ubuntu:16.04
 
 RUN apt-get update \
   && apt-get install --yes \
@@ -8,7 +12,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/*
diff --git a/experimental/ubuntu/ubuntu16.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/Dockerfile b/ubuntu/minimal/Dockerfile
@@ -1,8 +1,4 @@
-# The minimal image defines the minimum requirements to run a Docker image in Databricks.
-# If you are building your own image from scratch, make sure you have the libraries
-# included below.
-
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 RUN apt-get update \
   && apt-get install --yes \
diff --git 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/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 \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# 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`
	`1`	`+# 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`
`2`	`2`
`3`	`3`	`# Minimal Container`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ubuntu:16.04 as builder`
	`1`	`+FROM ubuntu:18.04 as builder`
`2`	`2`
`3`	`3`	`RUN apt-get update && apt-get install --yes \`
`4`	`4`	`wget \`