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/.dockerignore                  | 13 -------------
 docker/Dockerfile                     |  7 +++----
 docker/README.md                      |  5 ++---
 docker/root/etc/cont-init.d/50-config | 10 ----------
 4 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 docker/.dockerignore

(limited to 'docker')

diff --git a/docker/.dockerignore b/docker/.dockerignore
deleted file mode 100644
index 92207ac..0000000
--- a/docker/.dockerignore
+++ /dev/null
@@ -1,13 +0,0 @@
-.DS_Store
-
-# ignore .git and .cache folders
-.git
-.gitignore
-.github
-.gitattributes
-.cache
-
-# ignore all markdown files (md) beside all README*.md other than README-secret.md
-*.md
-!README*.md
-README-secret.md
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
 
diff --git a/docker/README.md b/docker/README.md
index 8e0da08..5daa9fc 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -202,11 +202,10 @@ Below are the instructions for updating the container to get the most recent ver
 
 ## Building locally
 
-If you want to make local modifications to this image for development purposes or just to customize the logic:
+If you want to build this image locally, please run this command from root of [ferdi server repository](https://github.com/getferdi/server/tree/master/):
 ```
-git clone https://github.com/getferdi/server-docker.git
-cd server-docker
 docker build \
+  -f docker/Dockerfile \
   --no-cache \
   --pull \
   -t getferdi/ferdi-server:latest .
diff --git a/docker/root/etc/cont-init.d/50-config b/docker/root/etc/cont-init.d/50-config
index 1c0caed..72b2d00 100755
--- a/docker/root/etc/cont-init.d/50-config
+++ b/docker/root/etc/cont-init.d/50-config
@@ -32,16 +32,6 @@ if [ -n "${TEST_RUN}" ]; then
 	echo '**** [services.d] done ****'
 fi
 
-# install ferdi-server if necessary
-[[ -f /ferdi/ferdi.tar.gz ]] && \
- echo "**** Installing Ferdi-server ****" && \
- tar xf \
- 	/ferdi/ferdi.tar.gz -C \
-	/app --strip-components=1 && \
- rm -rf \
-    /ferdi && \
- chown -R abc:abc /app	
-
 # set ferdi-server status
 echo " "
 echo "**** Checking Ferdi-server settings ****"
-- 
cgit v1.2.3-54-g00ecf