Fixed build

This commit is contained in:
konrad 2018-12-13 16:09:00 +01:00
parent 70f7f630a3
commit 553055f073
No known key found for this signature in database
GPG key ID: F40E70337AB24C9B
3 changed files with 2 additions and 6 deletions

View file

@ -36,7 +36,6 @@ RUN apk --no-cache add \
tzdata tzdata
COPY docker / 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/templates /app/vikunja/templates
COPY --from=build-env /go/src/code.vikunja.io/api/vikunja /app/vikunja/vikunja COPY --from=build-env /go/src/code.vikunja.io/api/vikunja /app/vikunja/vikunja

View file

@ -238,6 +238,7 @@ Teams sind global, d.h. Ein Team kann mehrere Namespaces verwalten.
### Docs ### Docs
* [ ] Bauanleitung in die Readme/docs * [ ] Bauanleitung in die Readme/docs
* [ ] Auch noch nen "link" zum Featurecreep
* [ ] Anleitung zum Makefile * [ ] Anleitung zum Makefile
* [ ] Struktur erklären * [ ] Struktur erklären
* [ ] Deploy in die docs * [ ] Deploy in die docs

View file

@ -133,8 +133,6 @@ endif
.PHONY: release-copy .PHONY: release-copy
release-copy: release-copy:
$(foreach file,$(wildcard $(DIST)/binaries/$(EXECUTABLE)-*),cp $(file) $(DIST)/release/$(notdir $(file));) $(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 mkdir $(DIST)/release/templates
cp templates/ $(DIST)/templates/ -R cp templates/ $(DIST)/templates/ -R
@ -142,11 +140,9 @@ release-copy:
release-check: release-check:
cd $(DIST)/release; $(foreach file,$(wildcard $(DIST)/release/$(EXECUTABLE)-*),sha256sum $(notdir $(file)) > $(notdir $(file)).sha256;) cd $(DIST)/release; $(foreach file,$(wildcard $(DIST)/release/$(EXECUTABLE)-*),sha256sum $(notdir $(file)) > $(notdir $(file)).sha256;)
.PHONY: release-os-package .PHONY: release-os-package
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/; ) $(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/; )
rm $(DIST)/release/public -rf
.PHONY: release-zip .PHONY: release-zip
release-zip: release-zip: