From 4f837d60a0ead2a0fd400948ae30c991fd779167 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fet.at>
Date: Sun, 23 May 2021 11:18:17 +0000
Subject: [PATCH] small fixes to build

---
 build_push                                       | 9 +++++----
 requirements.txt => config/requirements.txt      | 0
 Dockerfile.nginx => dockerfiles/Dockerfile.nginx | 0
 Dockerfile.theia => dockerfiles/Dockerfile.theia | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename requirements.txt => config/requirements.txt (100%)
 rename Dockerfile.nginx => dockerfiles/Dockerfile.nginx (100%)
 rename Dockerfile.theia => dockerfiles/Dockerfile.theia (95%)

diff --git a/build_push b/build_push
index ca25891..8489560 100755
--- a/build_push
+++ b/build_push
@@ -1,9 +1,10 @@
 #/bin/bash
 export REGISTRY="docker.triton2.fet.at"
 
-# Build a development Image with Theia and all content
-#docker build --no-cache -f Dockerfile.nginx -t $REGISTRY/dev_nginx:latest .
-#docker push $REGISTRY/dev_nginx:latest
+# build a small nginx image to handle routing of /dev and other services
+docker build --no-cache -f dockerfiles/Dockerfile.nginx -t $REGISTRY/dev_nginx:latest .
+docker push $REGISTRY/dev_nginx:latest
 
-docker build --no-cache -f Dockerfile.theia -t $REGISTRY/dev_theia:latest .
+# Build a development Image with Theia and all content
+docker build --no-cache -f dockerfiles/Dockerfile.theia -t $REGISTRY/dev_theia:latest .
 docker push $REGISTRY/dev_theia:latest
\ No newline at end of file
diff --git a/requirements.txt b/config/requirements.txt
similarity index 100%
rename from requirements.txt
rename to config/requirements.txt
diff --git a/Dockerfile.nginx b/dockerfiles/Dockerfile.nginx
similarity index 100%
rename from Dockerfile.nginx
rename to dockerfiles/Dockerfile.nginx
diff --git a/Dockerfile.theia b/dockerfiles/Dockerfile.theia
similarity index 95%
rename from Dockerfile.theia
rename to dockerfiles/Dockerfile.theia
index 3f7989e..0d51304 100644
--- a/Dockerfile.theia
+++ b/dockerfiles/Dockerfile.theia
@@ -10,7 +10,7 @@ RUN wget https://download.docker.com/linux/static/stable/x86_64/docker-20.10.2.t
 
 
 # Install Python requirements to support development
-COPY ./requirements.txt .
+COPY ./config/requirements.txt .
 run pip3 install --upgrade pip \ 
     && pip3 install -r requirements.txt \
     && pip3 install pytest pylint bandit flake8 black pytest-django six pytest-mock