From 4f85ebfe88069c9cfbdf3b98ccf54c99c0a5833e Mon Sep 17 00:00:00 2001 From: Paul Nathan Date: Fri, 31 Jul 2015 22:31:24 -0700 Subject: [PATCH] Migrated. We're live! --- Dockerfile | 2 +- HACKING.md | 10 ++++++++++ _config.yml | 2 +- build.sh | 5 +++++ LICENSE => legal/LICENSE | 0 links.html | 9 --------- test.sh | 2 ++ 7 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 HACKING.md create mode 100755 build.sh rename LICENSE => legal/LICENSE (100%) delete mode 100644 links.html create mode 100755 test.sh diff --git a/Dockerfile b/Dockerfile index 6d6abae..f3f3bc1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,2 @@ from nginx -copy site/ /usr/share/nginx/html \ No newline at end of file +copy _site/ /usr/share/nginx/html \ No newline at end of file diff --git a/HACKING.md b/HACKING.md new file mode 100644 index 0000000..c48a306 --- /dev/null +++ b/HACKING.md @@ -0,0 +1,10 @@ +hacking on articulate-common-lisp +--- + +contributions welcome. + +* ./livetest.sh will spawn a localhost:4000 webserver which watches the filesystem +* ./build.sh will generate a Docker image ready for pushing +* ./test.sh will run the build.sh generated Docker image. Note that + this boots a nginx server. +* ACL is delivered as a Docker image diff --git a/_config.yml b/_config.yml index 9076463..cf68e4b 100644 --- a/_config.yml +++ b/_config.yml @@ -10,7 +10,7 @@ url: http://articulate-lisp.com # be the project name. # *** IMPORTANT: If your local "jekyll serve" throws errors change this to '' or # run it like so: jekyll serve --baseurl='' -baseurl: / +baseurl: '' # This can be '' to hide the Github nav button github: 'pnathan/articulate-common-lisp' diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..5e6e1a8 --- /dev/null +++ b/build.sh @@ -0,0 +1,5 @@ +#!/bin/bash +# host:guest port map. +docker run --label=jekyll --label=stable --volume=$(pwd):/srv/jekyll -t -p 127.0.0.1:4000:4000 jekyll/stable jekyll build + +docker build -t pnathan/articulate-common-lisp:latest . diff --git a/LICENSE b/legal/LICENSE similarity index 100% rename from LICENSE rename to legal/LICENSE diff --git a/links.html b/links.html deleted file mode 100644 index e58fd3b..0000000 --- a/links.html +++ /dev/null @@ -1,9 +0,0 @@ ---- -layout: default ---- - - - -
- {% include links-list.html %} -
diff --git a/test.sh b/test.sh new file mode 100755 index 0000000..d292f63 --- /dev/null +++ b/test.sh @@ -0,0 +1,2 @@ +#!/bin/bash +docker run -p 8080:80 pnathan/articulate-common-lisp:latest