From 553055f073dbe140b98373bee473714d7b30851d Mon Sep 17 00:00:00 2001
From: konrad <konrad@kola-entertainments.de>
Date: Thu, 13 Dec 2018 16:09:00 +0100
Subject: [PATCH] Fixed build

---
 Dockerfile      | 1 -
 Featurecreep.md | 1 +
 Makefile        | 6 +-----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1bb5bf2e..09f8b1e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,7 +36,6 @@ RUN apk --no-cache add \
     tzdata
 
 COPY docker /
-COPY --from=build-env /go/src/code.vikunja.io/api/public /app/vikunja/public
 COPY --from=build-env /go/src/code.vikunja.io/api/templates /app/vikunja/templates
 COPY --from=build-env /go/src/code.vikunja.io/api/vikunja /app/vikunja/vikunja
 
diff --git a/Featurecreep.md b/Featurecreep.md
index c604fc5b..53477f94 100644
--- a/Featurecreep.md
+++ b/Featurecreep.md
@@ -238,6 +238,7 @@ Teams sind global, d.h. Ein Team kann mehrere Namespaces verwalten.
 ### Docs
 
 * [ ] Bauanleitung in die Readme/docs
+  * [ ] Auch noch nen "link" zum Featurecreep
 * [ ] Anleitung zum Makefile
 * [ ] Struktur erklären
 * [ ] Deploy in die docs
diff --git a/Makefile b/Makefile
index 4df2ca02..560542ee 100644
--- a/Makefile
+++ b/Makefile
@@ -133,8 +133,6 @@ endif
 .PHONY: release-copy
 release-copy:
 	$(foreach file,$(wildcard $(DIST)/binaries/$(EXECUTABLE)-*),cp $(file) $(DIST)/release/$(notdir $(file));)
-	mkdir $(DIST)/release/public
-	cp public/ $(DIST)/release/ -R
 	mkdir $(DIST)/release/templates
 	cp templates/ $(DIST)/templates/ -R
 
@@ -142,11 +140,9 @@ release-copy:
 release-check:
 	cd $(DIST)/release; $(foreach file,$(wildcard $(DIST)/release/$(EXECUTABLE)-*),sha256sum $(notdir $(file)) > $(notdir $(file)).sha256;)
 
-
 .PHONY: release-os-package
 release-os-package:
-	$(foreach file,$(filter-out %.sha256,$(wildcard $(DIST)/release/$(EXECUTABLE)-*)),mkdir $(file)-full;mv $(file) $(file)-full/;	mv $(file).sha256 $(file)-full/; cp config.yml.sample $(file)-full/config.yml; cp $(DIST)/release/public $(file)-full/ -R; cp $(DIST)/release/templates $(file)-full/ -R; cp LICENSE $(file)-full/; )
-	rm $(DIST)/release/public -rf
+	$(foreach file,$(filter-out %.sha256,$(wildcard $(DIST)/release/$(EXECUTABLE)-*)),mkdir $(file)-full;mv $(file) $(file)-full/;	mv $(file).sha256 $(file)-full/; cp config.yml.sample $(file)-full/config.yml; cp $(DIST)/release/templates $(file)-full/ -R; cp LICENSE $(file)-full/; )
 
 .PHONY: release-zip
 release-zip: