aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-02-17 16:54:25 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-02-17 16:54:25 +0100
commitbfe3ddc72d6aa90e32bdcfd2ed5b611578072bd7 (patch)
tree0765c3aea09c9c4224e74b202658368433ad20a8
parent98ffc2688cb8cc31ffb1c24e0d07977e1b61bca7 (diff)
parentc440c5daaf55503844fd8d0a3ffd51280181bb25 (diff)
Merge branch 'master' of dim13.org:gowiki
Conflicts: tmpl/root
-rw-r--r--Makefile6
-rw-r--r--tmpl/root2
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 260a0df..2cd2ee2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
-TAG = monique.moccu:5000/gowiki
+TAG = registry.moccu/gowiki
-all: publish
+all: push
build:
docker build -t ${TAG} --rm --no-cache .
-publish: build
+push: build
docker push ${TAG}
clean:
diff --git a/tmpl/root b/tmpl/root
index 4d7aeb0..d9b533c 100644
--- a/tmpl/root
+++ b/tmpl/root
@@ -16,7 +16,7 @@
<a href="/index" title="index"><i class="fa fa-list"></i></a>
{{with .Title}}
<a href="/edit/{{.}}" title="edit {{.}}"><i class="fa fa-pencil"></i></a>
- <a href="/del/{{.}}" title="delete {{.}}"><i class="fa fa-trash"></i></a>
+ <!--a href="/del/{{.}}" title="delete {{.}}"><i class="fa fa-trash"></i></a-->
{{end}}
</nav>
</header>