From fc705ade039da8ef1c3a5eddb237e850c9d75354 Mon Sep 17 00:00:00 2001
From: Peter Parente <pparent@us.ibm.com>
Date: Tue, 26 Jul 2016 23:03:19 -0400
Subject: [PATCH] [skip ci] Remove base image for jupyter/notebook

See https://github.com/jupyter/notebook/pull/1553

(c) Copyright IBM Corp. 2016
---
 internal/ubuntu_14_04_locale_fix/Dockerfile |  6 ------
 internal/ubuntu_14_04_locale_fix/Makefile   | 17 -----------------
 internal/ubuntu_14_04_locale_fix/README.md  |  1 -
 3 files changed, 24 deletions(-)
 delete mode 100644 internal/ubuntu_14_04_locale_fix/Dockerfile
 delete mode 100644 internal/ubuntu_14_04_locale_fix/Makefile
 delete mode 100644 internal/ubuntu_14_04_locale_fix/README.md

diff --git a/internal/ubuntu_14_04_locale_fix/Dockerfile b/internal/ubuntu_14_04_locale_fix/Dockerfile
deleted file mode 100644
index bda4d76c..00000000
--- a/internal/ubuntu_14_04_locale_fix/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM ubuntu:14.04
-
-# Setting the language and encoding won't work without this tweak.
-# See bug here ( https://bugs.launchpad.net/ubuntu/+bug/920601 ).
-RUN DEBIAN_FRONTEND=noninteractive locale-gen en_US.UTF-8 && \
-    DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales
diff --git a/internal/ubuntu_14_04_locale_fix/Makefile b/internal/ubuntu_14_04_locale_fix/Makefile
deleted file mode 100644
index 772477f0..00000000
--- a/internal/ubuntu_14_04_locale_fix/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) Jupyter Development Team.
-# Distributed under the terms of the Modified BSD License.
-
-.PHONY: build help release
-
-REPO:=jupyter/ubuntu_14_04_locale_fix
-
-help:
-	@echo 'make build release'
-	@echo 'See https://github.com/jupyter/docker-stacks/pull/108'
-
-build: DARGS?=
-build:
-	docker build $(DARGS) --rm --force-rm -t $(REPO):latest .
-
-release:
-	docker push $(REPO):latest
diff --git a/internal/ubuntu_14_04_locale_fix/README.md b/internal/ubuntu_14_04_locale_fix/README.md
deleted file mode 100644
index 5f0c72db..00000000
--- a/internal/ubuntu_14_04_locale_fix/README.md
+++ /dev/null
@@ -1 +0,0 @@
-The Dockerfile in this folder serves as a base image for the `jupyter/notebook` image which comes from the master branch of https://github.com/jupyter/notebook. It's not used in the stacks here. See https://github.com/jupyter/docker-stacks/pull/108 for why it exists.