Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions ReadMe.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ Node Sitefile
:target: https://gemnasium.com/dotmpe/node-sitefile
:alt: Dependencies

.. image:: https://david-dm.org/dotmpe/node-sitefile.svg?style=flat-square
:target: https://david-dm.org/dotmpe/node-sitefile
:alt: Dependencies

.. image:: https://snyk.io/package/npm/name/badge.svg
:target: https://snyk.io/package/npm/name
:alt: Vulnerabilities
Expand All @@ -22,23 +26,26 @@ Node Sitefile
:target: https://coveralls.io/r/dotmpe/node-sitefile
:alt: Coverage

.. image:: https://secure.travis-ci.org/dotmpe/node-sitefile.png
:target: https://travis-ci.org/dotmpe/node-sitefile
:alt: Build
.. image:: http://img.shields.io/travis/bvberkum/node-sitefile.svg
:target: http://travis-ci.org/bvberkum/node-sitefile
:alt: Build Status

..
.. image:: https://img.shields.io/github/issues/dotmpe/node-sitefile.svg
:target: http://githubstats.com/dotmpe/node-sitefile/issues
:alt: GitHub issues

.. image:: http://img.shields.io/codeclimate/github/bvberkum/node-sitefile.svg
:target: https://codeclimate.com/github/bvberkum/node-sitefile
:alt: Code Climate

:repository:

.. image:: https://badge.fury.io/gh/dotmpe%2Fnode-sitefile.png
:target: http://badge.fury.io/gh/dotmpe%2Fnode-sitefile
:alt: GIT

:autobuild:

:autobuild: `ReadMe <ReadMe-docker.md>`_
.. image:: https://images.microbadger.com/badges/image/bvberkum/node-sitefile.svg
:target: https://microbadger.com/images/bvberkum/node-sitefile
:alt: Data by microbadger.com
Expand Down
38 changes: 26 additions & 12 deletions doc/.defaults.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
expressiveness: all relative path references need to be pre-processed per
including document.

.. Global
.. Doc parts
.. _changelog: /Changelog.rst
.. _examples: /example/main
.. _ToDo: /TODO.md
.. _Sitefile Planet: /doc/sitefile-planet.rst

.. Local
.. _manual: manual.rst
Expand All @@ -26,24 +27,37 @@
.. _Mocha Router docstrings: /doc/literate/mocha.html

.. Releases
.. _r0.0.1: /doc/dev/0.0.6.rst
.. _v0.0.1: Changelog.rst#0.0.1
.. _r0.0.1: /doc/dev/0.0.1.rst
.. _v0.0.1: /Changelog.rst#0.0.1

.. _r0.0.3: /doc/dev/0.0.3.rst
.. _v0.0.3: /Changelog.rst#0.0.3

.. _r0.0.4: /doc/dev/0.0.4.rst
.. _v0.0.4: Changelog.rst#0.0.4
.. _v0.0.4: /Changelog.rst#0.0.4

.. _v0.0.5: /Changelog.rst#0.0.5
.. _r0.0.5: /doc/dev/0.0.5.rst
.. _v0.0.6: /Changelog.rst#0.0.6
.. _r0.0.6: /doc/dev/0.0.6.rst
.. _v0.0.7: /Changelog.rst#0.0.7
.. _r0.0.7: /doc/dev/0.0.7.rst

.. _v0.1.0: /Changelog.rst#0.1.0
.. .. _r0.1.0: /doc/dev/0.1.0.rst

.. External
.. _jsonary: http://jsonary.com/
.. _elegant apis with json schema: https://brandur.org/elegant-apis
.. _understanding json schema: http://spacetelescope.github.io/understanding-json-schema/index.html
.. _semver: https://github.com/npm/node-semver
.. _JSON API: http://jsonapi.org/format/
.. _json-editor: https://github.com/jdorn/json-editor
.. _List of Mocha reporters: https://github.com/mochajs/mocha/tree/master/lib/reporters
.. _v1.0.0: /Changelog.rst#1.0.0

.. External
.. _jsonary: //jsonary.com/
.. _elegant apis with json schema: //brandur.org/elegant-apis
.. _understanding json schema: //spacetelescope.github.io/understanding-json-schema/index.html
.. _semver: //github.com/npm/node-semver
.. _JSON API: //jsonapi.org/format/
.. _json-editor: //github.com/jdorn/json-editor
.. _List of Mocha reporters: //github.com/mochajs/mocha/tree/master/lib/reporters
.. _neodoc: //github.com/felixSchl/neodoc
.. _ansigarden.com: //ansigarden.com
.. _Fermata: //github.com/natevw/fermata
.. _PouchDB: //github.com/pouchdb/pouchdb

4 changes: 3 additions & 1 deletion doc/dev.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Main Development Document
=========================

.. include:: .defaults.rst

Expand Down Expand Up @@ -120,6 +122,6 @@ There are many possibly useful directions:
Branch docs
------------
.. include:: scm-branches.rst

:start-line: 4


2 changes: 1 addition & 1 deletion doc/dev/0.0.5.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

- Rewrite of all contexts: handler/resolver are merged now. Root context has
new structures ``paths`` and ``site``. ``paths.routers`` makes it possible
to load extension routers from custom paths.
to load addon routers from custom paths.

Router initialization extends on regular objects until router is initialized,
then creates proper subContext. It uses new attributes ``methods`` and
Expand Down
5 changes: 5 additions & 0 deletions doc/index.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Documentation Overview
======================
.. include:: .defaults.rst


2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"stylus": "^0.54.5"
},
"devDependencies": {
"ajv": "^4.11.2",
"ajv": "^6.10.2",
"bootstrap": "^3.3.7",
"chai": "^3.5.0",
"chai-webdriver": "^1.2.0",
Expand Down
40 changes: 15 additions & 25 deletions tools/docker/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,41 +1,29 @@
ARG DCKR_TAG=latest
FROM bvberkum/ubuntu-treebox:$DCKR_TAG
ARG DCKR_TAG=dev
FROM bvberkum/treebox:$DCKR_TAG
MAINTAINER B. van Berkum <dev@dotmpe.com>


# Node version manager
#ENV NVM_DIR=/usr/local/nvm
#RUN curl -o- \
# https://raw.githubusercontent.com/creationix/nvm/v0.33.0/install.sh | \
# bash && \
# . $NVM_DIR/nvm.sh && \
# nvm install stable


#RUN sudo npm install npm -g


ARG sf_checkout=dev

# Prepare for Sitefile
RUN \
sudo mkdir -vp /src/github.com && \
sudo chmod g+rw /usr/local/* /usr/local/lib/node_modules /src/github.com && \
sudo chgrp staff /usr/local/* /usr/local/lib/node_modules /src/github.com
sudo mkdir -vp /opt /src && \
sudo chmod g+rw /usr/local/* /usr/local/lib/node_modules /opt /src && \
sudo chgrp staff /usr/local/* /usr/local/lib/node_modules /opt /src

# Checkout Sitefile
RUN USER=$(whoami) && \
ls -la /home/treebox /src/ /src/github.com && \
mkdir -vp /src/github.com/bvberkum && \
mkdir -vp /opt/bvberkum /src/github.com/bvberkum && \
git clone https://github.com/bvberkum/node-sitefile.git \
/src/github.com/bvberkum/node-sitefile && \
sudo chown -R $USER:$USER /home/$USER /src/github.com/bvberkum && \
cd /src/github.com/bvberkum/node-sitefile && \
git checkout $sf_checkout
/opt/bvberkum/node-sitefile && \
sudo chown -R $USER:$USER /home/$USER /opt/bvberkum && \
cd /opt/bvberkum/node-sitefile && \
git checkout $sf_checkout && \
ln -s /opt/bvberkum/node-sitefile /src/github.com/bvberkum/

# Install Sitefile
RUN USER=$(whoami) && \
cd /src/github.com/bvberkum/node-sitefile && \
cd /opt/bvberkum/node-sitefile && \
npm install --quiet grunt coffee-script && \
npm install --quiet -g .

Expand All @@ -46,4 +34,6 @@ ENV site_checkout=

RUN mkdir -vp /usr/local/share/sitefile
COPY ./entry.sh /usr/local/share/sitefile/entry.sh
ENTRYPOINT /usr/local/share/sitefile/entry.sh
ENTRYPOINT ["/usr/local/share/sitefile/entry.sh"]
EXPOSE 7100-7199
CMD ["$site_src","$site_checkout","$site_repo"]
1 change: 0 additions & 1 deletion tools/docker/ubuntu/entry.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash


test -n "$1" || set -- "github.com/bvberkum/node-sitefile" "$2" "$3"

test -d "/src/$1" || {
Expand Down