From 8fa255631d4e35b30cbd0746554c5656999e5b5d Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Tue, 23 Nov 2021 23:46:50 +0100
Subject: [PATCH] Update docker scripts

---
 docker-compose.yml   |  5 ++++-
 docker/Dockerfile    | 13 ++++++++-----
 docker/entrypoint.sh |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ec79ae8..c43cd44 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,10 @@ version: "3.4"
 
 services:
   app:
-    build: .
+    build:
+      context: .
+      dockerfile: docker/Dockerfile
+    image: glenux/teaching-boilerplate
     environment: {}
     ports:
       - 5100:5100
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9bc2a5e..09e499b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,13 +1,16 @@
 FROM node:bullseye-slim
 MAINTAINER Glenn ROLLAND <glenux@glenux.net>
 
-RUN apt-get update && \
-	apt-get install -y make build-essential
+RUN apt-get update \
+ && apt-get install -y python3 python3-pip pipenv \
+ && apt-get clean
 
-RUN apt-get update && \
-	apt-get install -y python3 python3-pip
+RUN apt-get update \
+ && apt-get install -y make build-essential inotify-tools \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
+ && truncate -s 0 /var/log/*log
 
-RUN pip3 install pipenv
 
 COPY . /app
 WORKDIR /app
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index d07ddf9..e58bfd2 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -3,4 +3,4 @@
 ARGS="$*"
 echo "Arguments: $ARGS"
 
-make "$0"
+exec make "$@"