From cd600b05415057ff935d41a57ca771a58511328c Mon Sep 17 00:00:00 2001 From: NGPixel Date: Fri, 28 Apr 2017 20:17:10 -0400 Subject: [PATCH] fix: Removed duplicate pkg + Dockerfile (alpha) --- Dockerfile | 8 ++++++++ README.md | 1 + docker-compose.yml | 15 +++++++++++++++ package.json | 1 - 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..e3158a2a --- /dev/null +++ b/Dockerfile @@ -0,0 +1,8 @@ +FROM node:latest + +RUN mkdir -p /usr/src/app +WORKDIR /usr/src/app +RUN yarn add wiki.js@latest + +EXPOSE 3000 +CMD [ "node", "server" ] diff --git a/README.md b/README.md index fe0807da..8482d439 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ [![Chat on Gitter](https://img.shields.io/badge/chat-on_gitter-CC2B5E.svg?style=flat-square&logo=image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAOCAMAAADUg/YpAAAABlBMVEUAAAD///%2Bl2Z/dAAAAAXRSTlMAQObYZgAAABVJREFUeAFjwAUYYTQByAAh0WicAAAFnwAYeB5bLwAAAABJRU5ErkJggg==)](https://gitter.im/Requarks/wiki) [![Twitter Follow](https://img.shields.io/badge/follow-%40requarks-blue.svg?style=flat-square)](https://twitter.com/requarks) [![Build Status](https://img.shields.io/travis/Requarks/wiki/master.svg?style=flat-square)](https://travis-ci.org/Requarks/wiki) +[![Codefresh Build Status]( https://g.codefresh.io/api/badges/build?repoOwner=Requarks&repoName=wiki&branch=master&pipelineName=wiki&accountName=NGPixel&type=cf-1)](https://g.codefresh.io/repositories/Requarks/wiki/builds?filter=trigger:build;branch:master;service:5903d09d270a090001e864b6~wiki) [![Codacy Badge](https://img.shields.io/codacy/grade/1d0217a3153c4595bdedb322263e55c8/master.svg?style=flat-square)](https://www.codacy.com/app/Requarks/wiki) [![Dependency Status](https://img.shields.io/gemnasium/Requarks/wiki.svg?style=flat-square)](https://gemnasium.com/github.com/Requarks/wiki) [![Known Vulnerabilities](https://snyk.io/test/github/requarks/wiki/badge.svg?style=flat-square)](https://snyk.io/test/github/requarks/wiki) diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..3918567c --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,15 @@ +version: '3' +services: + wikidb: + image: mongo + ports: + - '27017' + command: '--smallfiles --logpath=/dev/null' + wikijs: + image: 'requarks/wiki:master' + links: + - wikidb + ports: + - '3000' + environment: + - PORT: 3000 diff --git a/package.json b/package.json index 40191439..a0fab254 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,6 @@ "serve-favicon": "^2.4.2", "simplemde": "^1.11.2", "socket.io": "^1.7.3", - "sticky-js": "^1.0.7", "stopword": "^0.1.1", "stream-to-promise": "^2.2.0", "tar": "^2.2.1",