From cf4be86f2d35a832ebc779b02c4ff215e372ca74 Mon Sep 17 00:00:00 2001
From: Giannis Kopanas <jkopanas@gmail.com>
Date: Thu, 26 Apr 2018 16:35:41 +0300
Subject: [PATCH] add env-sample add Dockerfile production
---
.config/configstore/update-notifier-npm.json | 4 ++++
Dockerfile-development | 4 ++++
2 files changed, 8 insertions(+)
create mode 100644 .config/configstore/update-notifier-npm.json
diff --git a/.config/configstore/update-notifier-npm.json b/.config/configstore/update-notifier-npm.json
new file mode 100644
index 0000000000..6275119094
--- /dev/null
+++ b/.config/configstore/update-notifier-npm.json
@@ -0,0 +1,4 @@
+{
+ "optOut": false,
+ "lastUpdateCheck": 1525596746559
+}
\ No newline at end of file
diff --git a/Dockerfile-development b/Dockerfile-development
index 93c2ee2891..f3fa516adb 100644
--- a/Dockerfile-development
+++ b/Dockerfile-development
@@ -9,6 +9,10 @@ COPY webpack webpack
COPY config config
COPY app app
+<<<<<<< HEAD
EXPOSE ${PORT:-3000}
+=======
+EXPOSE ${PORT:3000}
+>>>>>>> add env-sample add Dockerfile production
CMD []
--
GitLab