From 7e55e4bf83321c770645e9657589a620335fa029 Mon Sep 17 00:00:00 2001
From: Michal Kostewicz <m.kostewicz84@gmail.com>
Date: Fri, 5 Feb 2021 20:43:13 +0100
Subject: Modifying Dockerfile so that it can use the current application code
 to build the image. Update instructions for building image in README.md

---
 docker/Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'docker/Dockerfile')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2b165f5..a561509 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -59,6 +59,8 @@ RUN \
   cd / && \
   rm -Rf "node-v$NODE_VERSION" && \
   rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt
+
+COPY . /app
   
 RUN \
   apk add --no-cache --virtual .build-deps-ferdi \
@@ -69,9 +71,6 @@ RUN \
   npm config set unsafe-perm true && \
   npm install -g npm@latest && \
   find /usr/lib/node_modules/npm -name test -o -name .bin -type d | xargs rm -rf && \
-  echo "**** install ferdi server ****" && \
-  mkdir -p /ferdi && \
-  curl -o /ferdi/ferdi.tar.gz -L "https://github.com/getferdi/server/archive/master.tar.gz" && \
   echo "**** cleanup ****" && \
   apk del .build-deps-ferdi && \
   rm -rf \
@@ -88,7 +87,7 @@ RUN \
    /usr/lib/node_modules/npm/html \
    /usr/lib/node_modules/npm/scripts
   
-COPY root/ /
+COPY docker/root/ /
 
 USER root
 
-- 
cgit v1.2.3-70-g09d2