From ef34fdc7598d3af6791f266b00bfbc9671e7b108 Mon Sep 17 00:00:00 2001 From: Eric Dobbs Date: Sun, 1 Oct 2017 11:28:14 -0600 Subject: [PATCH] enable github-based npm packages for WIKI_PACKAGE npm needs git installed in order to install packages from github --- Dockerfile | 3 ++- README.md | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0222f18..a51c6a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,8 @@ FROM node:4-slim RUN useradd --create-home app \ && apt-get update \ && apt-get install -y --no-install-recommends \ - jq + jq \ + git WORKDIR /home/app ARG WIKI_PACKAGE=wiki@0.12.1 RUN su app -c "npm install -g --prefix . $WIKI_PACKAGE" diff --git a/README.md b/README.md index 8cef2a8..7111958 100644 --- a/README.md +++ b/README.md @@ -52,8 +52,11 @@ Open http://that.localtest.me:3000 in another. # Development +This image's tag matches the version of the included wiki software. + ``` bash -VERSION=0.12.0 -docker build --build-arg VERSION=$VERSION -t dobbs/farm:$VERSION . -git tag -am "" $VERSION +git tag -am "" '0.12.1+github' +git push --tags +docker build -t dobbs/farm:0.12.1+github . +docker push dobbs/farm:0.12.1+github ```