From 1d763bbac53adabe3ca8d0c090f729f88714bf5a Mon Sep 17 00:00:00 2001 From: graemes Date: Fri, 19 Oct 2018 18:52:27 +0100 Subject: [PATCH] Convert FROM specification to ARG (#727) --- all-spark-notebook/Dockerfile | 3 ++- base-notebook/Dockerfile | 3 ++- datascience-notebook/Dockerfile | 3 ++- minimal-notebook/Dockerfile | 4 ++-- pyspark-notebook/Dockerfile | 3 ++- r-notebook/Dockerfile | 3 ++- scipy-notebook/Dockerfile | 3 ++- tensorflow-notebook/Dockerfile | 3 ++- 8 files changed, 16 insertions(+), 9 deletions(-) diff --git a/all-spark-notebook/Dockerfile b/all-spark-notebook/Dockerfile index fcca9a67..43bd20ab 100644 --- a/all-spark-notebook/Dockerfile +++ b/all-spark-notebook/Dockerfile @@ -1,6 +1,7 @@ # Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. -FROM jupyter/pyspark-notebook +ARG BASE_CONTAINER=jupyter/pyspark-notebook +FROM $BASE_CONTAINER LABEL maintainer="Jupyter Project " diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile index 65127ca1..23c76f83 100644 --- a/base-notebook/Dockerfile +++ b/base-notebook/Dockerfile @@ -3,7 +3,8 @@ # Ubuntu 18.04 (bionic) from 2018-05-26 # https://github.com/docker-library/official-images/commit/aac6a45b9eb2bffb8102353c350d341a410fb169 -FROM ubuntu:bionic-20180526@sha256:c8c275751219dadad8fa56b3ac41ca6cb22219ff117ca98fe82b42f24e1ba64e +ARG BASE_CONTAINER=ubuntu:bionic-20180526@sha256:c8c275751219dadad8fa56b3ac41ca6cb22219ff117ca98fe82b42f24e1ba64e +FROM $BASE_CONTAINER LABEL maintainer="Jupyter Project " diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile index d14407d3..e956a45f 100644 --- a/datascience-notebook/Dockerfile +++ b/datascience-notebook/Dockerfile @@ -1,6 +1,7 @@ # Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. -FROM jupyter/scipy-notebook +ARG BASE_CONTAINER=jupyter/scipy-notebook +FROM $BASE_CONTAINER LABEL maintainer="Jupyter Project " diff --git a/minimal-notebook/Dockerfile b/minimal-notebook/Dockerfile index 5df7d180..78a36368 100644 --- a/minimal-notebook/Dockerfile +++ b/minimal-notebook/Dockerfile @@ -1,7 +1,7 @@ # Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. - -FROM jupyter/base-notebook +ARG BASE_CONTAINER=jupyter/base-notebook +FROM $BASE_CONTAINER LABEL maintainer="Jupyter Project " diff --git a/pyspark-notebook/Dockerfile b/pyspark-notebook/Dockerfile index bc7a91b8..8ef0ed23 100644 --- a/pyspark-notebook/Dockerfile +++ b/pyspark-notebook/Dockerfile @@ -1,6 +1,7 @@ # Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. -FROM jupyter/scipy-notebook +ARG BASE_CONTAINER=jupyter/scipy-notebook +FROM $BASE_CONTAINER LABEL maintainer="Jupyter Project " diff --git a/r-notebook/Dockerfile b/r-notebook/Dockerfile index 746e0161..f3134ce2 100644 --- a/r-notebook/Dockerfile +++ b/r-notebook/Dockerfile @@ -1,6 +1,7 @@ # Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. -FROM jupyter/minimal-notebook +ARG BASE_CONTAINER=jupyter/minimal-notebook +FROM $BASE_CONTAINER LABEL maintainer="Jupyter Project " diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index eb8806e5..59bd26bb 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -1,6 +1,7 @@ # Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. -FROM jupyter/minimal-notebook +ARG BASE_CONTAINER=jupyter/minimal-notebook +FROM $BASE_CONTAINER LABEL maintainer="Jupyter Project " diff --git a/tensorflow-notebook/Dockerfile b/tensorflow-notebook/Dockerfile index b77f5f88..c2649657 100644 --- a/tensorflow-notebook/Dockerfile +++ b/tensorflow-notebook/Dockerfile @@ -1,6 +1,7 @@ # Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. -FROM jupyter/scipy-notebook +ARG BASE_CONTAINER=jupyter/scipy-notebook +FROM $BASE_CONTAINER LABEL maintainer="Jupyter Project "