diff options
Diffstat (limited to 'docker')
-rw-r--r-- | docker/.dockerignore | 13 | ||||
-rw-r--r-- | docker/Dockerfile | 7 | ||||
-rw-r--r-- | docker/README.md | 5 | ||||
-rwxr-xr-x | docker/root/etc/cont-init.d/50-config | 10 |
4 files changed, 5 insertions, 30 deletions
diff --git a/docker/.dockerignore b/docker/.dockerignore deleted file mode 100644 index 92207ac..0000000 --- a/docker/.dockerignore +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | .DS_Store | ||
2 | |||
3 | # ignore .git and .cache folders | ||
4 | .git | ||
5 | .gitignore | ||
6 | .github | ||
7 | .gitattributes | ||
8 | .cache | ||
9 | |||
10 | # ignore all markdown files (md) beside all README*.md other than README-secret.md | ||
11 | *.md | ||
12 | !README*.md | ||
13 | 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 \ | |||
59 | cd / && \ | 59 | cd / && \ |
60 | rm -Rf "node-v$NODE_VERSION" && \ | 60 | rm -Rf "node-v$NODE_VERSION" && \ |
61 | rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt | 61 | rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt |
62 | |||
63 | COPY . /app | ||
62 | 64 | ||
63 | RUN \ | 65 | RUN \ |
64 | apk add --no-cache --virtual .build-deps-ferdi \ | 66 | apk add --no-cache --virtual .build-deps-ferdi \ |
@@ -69,9 +71,6 @@ RUN \ | |||
69 | npm config set unsafe-perm true && \ | 71 | npm config set unsafe-perm true && \ |
70 | npm install -g npm@latest && \ | 72 | npm install -g npm@latest && \ |
71 | find /usr/lib/node_modules/npm -name test -o -name .bin -type d | xargs rm -rf && \ | 73 | find /usr/lib/node_modules/npm -name test -o -name .bin -type d | xargs rm -rf && \ |
72 | echo "**** install ferdi server ****" && \ | ||
73 | mkdir -p /ferdi && \ | ||
74 | curl -o /ferdi/ferdi.tar.gz -L "https://github.com/getferdi/server/archive/master.tar.gz" && \ | ||
75 | echo "**** cleanup ****" && \ | 74 | echo "**** cleanup ****" && \ |
76 | apk del .build-deps-ferdi && \ | 75 | apk del .build-deps-ferdi && \ |
77 | rm -rf \ | 76 | rm -rf \ |
@@ -88,7 +87,7 @@ RUN \ | |||
88 | /usr/lib/node_modules/npm/html \ | 87 | /usr/lib/node_modules/npm/html \ |
89 | /usr/lib/node_modules/npm/scripts | 88 | /usr/lib/node_modules/npm/scripts |
90 | 89 | ||
91 | COPY root/ / | 90 | COPY docker/root/ / |
92 | 91 | ||
93 | USER root | 92 | USER root |
94 | 93 | ||
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 | |||
202 | 202 | ||
203 | ## Building locally | 203 | ## Building locally |
204 | 204 | ||
205 | If you want to make local modifications to this image for development purposes or just to customize the logic: | 205 | 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/): |
206 | ``` | 206 | ``` |
207 | git clone https://github.com/getferdi/server-docker.git | ||
208 | cd server-docker | ||
209 | docker build \ | 207 | docker build \ |
208 | -f docker/Dockerfile \ | ||
210 | --no-cache \ | 209 | --no-cache \ |
211 | --pull \ | 210 | --pull \ |
212 | -t getferdi/ferdi-server:latest . | 211 | -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 | |||
32 | echo '**** [services.d] done ****' | 32 | echo '**** [services.d] done ****' |
33 | fi | 33 | fi |
34 | 34 | ||
35 | # install ferdi-server if necessary | ||
36 | [[ -f /ferdi/ferdi.tar.gz ]] && \ | ||
37 | echo "**** Installing Ferdi-server ****" && \ | ||
38 | tar xf \ | ||
39 | /ferdi/ferdi.tar.gz -C \ | ||
40 | /app --strip-components=1 && \ | ||
41 | rm -rf \ | ||
42 | /ferdi && \ | ||
43 | chown -R abc:abc /app | ||
44 | |||
45 | # set ferdi-server status | 35 | # set ferdi-server status |
46 | echo " " | 36 | echo " " |
47 | echo "**** Checking Ferdi-server settings ****" | 37 | echo "**** Checking Ferdi-server settings ****" |