From 57272aa6db67981f6b72b31fe37699597c349135 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Fri, 18 Oct 2019 11:33:44 +0200
Subject: [PATCH] Dockerfile (demo): re-enable plugin

---
 Dockerfile |  4 +---
 Makefile   | 28 +++++++++++++++++++---------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 537786b..80d6df9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,9 +28,7 @@ RUN bin/installDeps.sh && rm settings.json && \
     chmod +x /entrypoint.sh && \
     sed -i 's/^node/exec\ node/' bin/run.sh && \
     ln -s var/settings.json settings.json && \
-    npm install ep_author_neat ep_headings2 ep_set_title_on_pad ep_adminpads ep_mypads ep_padwiki
-
-#     npm install ep_author_neat ep_headings2 ep_set_title_on_pad ep_adminpads ep_mypads ep_padwiki ep_comments_page
+    npm install ep_author_neat ep_headings2 ep_set_title_on_pad ep_adminpads ep_mypads ep_padwiki ep_comments_page
 
 VOLUME /opt/etherpad-lite/var
 EXPOSE 9001
diff --git a/Makefile b/Makefile
index c996fe3..23a20aa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,27 @@
 
-NAME=$(shell basename "$$(pwd)")
+USERNAME:=glenux
+IMAGE:=$(shell basename "$$(pwd)")
+TAG:=$(shell TZ=UTC date +"%Y%m%d")
 
-all: build run
-
-# --build-arg "BUNDLE_BITBUCKET__ORG=$(BUNDLE_BITBUCKET__ORG)" \
+all: 
 
 build:
-	docker build -t "$(NAME)" .
+	docker build -t $(USERNAME)/$(IMAGE):$(TAG) .
 
 run:
-	docker run --rm -p 9001:9001 \
-		-e DATABASE_URL="mysql://user:foo@databasehost/database?options" \
-		-t "$(NAME)" \
-		#
+	# remplir ici
 
+test: build
+	# remplir ici
+
+# on produit des binaires, on les stocke qqpart
+#
+deliver:
+	# remplir ici
+
+# on utilise les binaires pour faire fonctionner le service
+# en ligne
+#
+# deploy:
+# 	# ...