From c9a69b21477fa64ca927cb2ac522c319153b271c Mon Sep 17 00:00:00 2001 From: Candid Dauth Date: Thu, 8 Apr 2021 22:28:16 +0200 Subject: [PATCH] Add Dockerfile for docs --- Dockerfile | 5 ----- docs/.dockerignore | 3 +++ docs/Dockerfile | 8 ++++++++ docs/deploy.sh | 10 ---------- docs/package.json | 4 ++-- 5 files changed, 13 insertions(+), 17 deletions(-) create mode 100644 docs/.dockerignore create mode 100644 docs/Dockerfile delete mode 100755 docs/deploy.sh diff --git a/Dockerfile b/Dockerfile index 3154e9ed..9e75cb6b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,6 @@ CMD yarn run server EXPOSE 8080 RUN apk add --no-cache yarn -# g++ git make python2 RUN adduser -D -h /opt/facilmap -s /bin/sh facilmap @@ -17,10 +16,6 @@ RUN chown -R facilmap:facilmap /opt/facilmap USER facilmap -#RUN mkdir ~/.local && npm config set prefix ~/.local && \ -# npm install -S mysql pg sqlite3 tedious && \ -# cd .. && npm run deps && npm run build - RUN cd .. && yarn install RUN cd .. && yarn run build diff --git a/docs/.dockerignore b/docs/.dockerignore new file mode 100644 index 00000000..32df1e4d --- /dev/null +++ b/docs/.dockerignore @@ -0,0 +1,3 @@ +node_modules +src/.vuepress/dist +Dockerfile \ No newline at end of file diff --git a/docs/Dockerfile b/docs/Dockerfile new file mode 100644 index 00000000..258eb32e --- /dev/null +++ b/docs/Dockerfile @@ -0,0 +1,8 @@ +FROM httpd:2.4-alpine +MAINTAINER Candid Dauth + +RUN apk add --no-cache nodejs yarn + +COPY ./ /tmp/facilmap-docs + +RUN cd /tmp/facilmap-docs && yarn install && yarn build && mv src/.vuepress/dist/* /usr/local/apache2/htdocs/ && rm -rf /tmp/facilmap-docs diff --git a/docs/deploy.sh b/docs/deploy.sh deleted file mode 100755 index f9ec2612..00000000 --- a/docs/deploy.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env sh -set -e -yarn build -cd src/.vuepress/dist -echo 'docs.facilmap.org' > CNAME -git init -git add -A -git commit -m 'deploy' -git push -f git@github.com:facilmap/facilmap-docs.git master -cd - \ No newline at end of file diff --git a/docs/package.json b/docs/package.json index f2c6f1e1..fc8f322a 100755 --- a/docs/package.json +++ b/docs/package.json @@ -1,7 +1,7 @@ { "name": "facilmap-docs", - "version": "0.0.1", - "description": "A fully-featured OpenStreetMap-based map where markers and lines can be added with live collaboration.", + "version": "3.0.0-beta3", + "description": "Documentation for FacilMap.", "author": "Candid Dauth ", "repository": { "type": "git",