From 1585a20558dd038f7b09e2d4e1197d281a204387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Behmo?= <regis@behmo.com>
Date: Tue, 20 Nov 2018 11:45:49 +0100
Subject: [PATCH] Fix private requirements version control

private.txt was under version control.
---
 .gitignore                       | 2 +-
 openedx/Dockerfile               | 4 ++--
 openedx/requirements/.gitignore  | 1 +
 openedx/requirements/README      | 3 +++
 openedx/requirements/private.txt | 3 ---
 5 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 openedx/requirements/.gitignore
 create mode 100644 openedx/requirements/README
 delete mode 100644 openedx/requirements/private.txt

diff --git a/.gitignore b/.gitignore
index aabff06..9925492 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@
 config/
 data-*/
 TODO
-openedx/requirements/private.*
+openedx/requirements/private.txt
 .env
diff --git a/openedx/Dockerfile b/openedx/Dockerfile
index 15c6c86..f806bf7 100644
--- a/openedx/Dockerfile
+++ b/openedx/Dockerfile
@@ -54,8 +54,8 @@ RUN curl -L -o dockerize.tar.gz https://github.com/jwilder/dockerize/releases/do
     && rm dockerize.tar.gz
 
 # Install private requirements as late as possible, so they can be modified frequently
-COPY ./requirements/private.txt /tmp/
-RUN pip install --src ../venv/src -r /tmp/private.txt
+COPY ./requirements/ /tmp/requirements
+RUN touch /tmp/requirements/private.txt && pip install --src ../venv/src -r /tmp/requirements/private.txt
 
 # Copy convenient scripts
 COPY ./bin/docker-entrypoint.sh /usr/local/bin/
diff --git a/openedx/requirements/.gitignore b/openedx/requirements/.gitignore
new file mode 100644
index 0000000..65bce68
--- /dev/null
+++ b/openedx/requirements/.gitignore
@@ -0,0 +1 @@
+private.txt
diff --git a/openedx/requirements/README b/openedx/requirements/README
new file mode 100644
index 0000000..7f2e34b
--- /dev/null
+++ b/openedx/requirements/README
@@ -0,0 +1,3 @@
+Add your additional requirements, such as xblocks, to private.txt. This file
+is not under version control, which means that your changes will not be
+committed to the upstream repository.
diff --git a/openedx/requirements/private.txt b/openedx/requirements/private.txt
deleted file mode 100644
index d36f2ba..0000000
--- a/openedx/requirements/private.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Add your additional requirements here, such as xblocks. This file is not
-# under version control, which means that your changes will not be committed to
-# the upstream repository.