From cc6477537ca71fe07d78e9b7d4b66744be2bc47f Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Sat, 22 Aug 2020 15:20:05 +0200
Subject: [PATCH] Attempt to make build nicer
---
Dockerfile | 6 +++---
src/docker-entrypoint.sh | 3 ---
2 files changed, 3 insertions(+), 6 deletions(-)
delete mode 100755 src/docker-entrypoint.sh
diff --git a/Dockerfile b/Dockerfile
index e206adb..c11959e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ WORKDIR /umami
ADD src/fix.diff /umami/fix.diff
RUN git apply fix.diff && \
npm install && \
- npm run build-tracker
-ADD src/docker-entrypoint.sh /
+ npm run build-tracker && \
+ DATABASE_URL=postgresql://localhost/db npm run build
WORKDIR /umami
-ENTRYPOINT ["/docker-entrypoint.sh"]
+ENTRYPOINT ["npm", "start"]
diff --git a/src/docker-entrypoint.sh b/src/docker-entrypoint.sh
deleted file mode 100755
index 75eadb7..0000000
--- a/src/docker-entrypoint.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-npm run build
-exec npm start
--
GitLab