aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-02-17 12:02:36 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-02-17 12:02:36 +0100
commitee22fe4ee5fc422d9e245e322801c1842803dfd6 (patch)
tree6bbd6982981d6eae8a14ce3e246e1f91fc89942a
parent81877acc9a055cdfba3de92dc66e6af579730ed6 (diff)
parent5154c471370ecb75df280eb4bef2e5c44fd20243 (diff)
Merge branch 'master' of dim13.org:gowiki
-rw-r--r--Makefile5
-rw-r--r--assets/css/style.css2
-rw-r--r--wiki.go2
3 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 22a55e6..260a0df 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,13 @@ TAG = monique.moccu:5000/gowiki
all: publish
build:
- docker build -t ${TAG} .
+ docker build -t ${TAG} --rm --no-cache .
publish: build
docker push ${TAG}
clean:
go clean
+
+rmi:
+ docker rmi $(docker images -f 'dangling=true' -q)
diff --git a/assets/css/style.css b/assets/css/style.css
index 7b83916..5f46714 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -5,7 +5,7 @@ body {
h1 {
color: #F50;
}
-pre {
+pre, textarea {
font-family: 'Monofur', monospace;
}
a {
diff --git a/wiki.go b/wiki.go
index 5bc3a5d..cdb49c2 100644
--- a/wiki.go
+++ b/wiki.go
@@ -39,5 +39,5 @@ func (p *Page) render(w http.ResponseWriter, tmpl *template.Template) {
}
func main() {
- http.ListenAndServe("localhost:8080", nil)
+ http.ListenAndServe(":8080", nil)
}