Verison 1.1.0

Author: ecow

.gitignore

@@ -1,4 +1,5 @@
 .cache/
 distrib/
 .project
-.settings/
+.settings/
+/.shared/

CHANGELOG.md

@@ -6,11 +6,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [unreleased]
 
+TODO: enable precompressed files
 
-## 1.0.0
+## [1.1.0]
+
+### Addedd
+
+- customization of workbench UI
+- static file serving in shared area
+
+## 1.1.0
 
 First release, aligned with Blazegraph 2.1.5
 
 
-[Unreleased]: https://bitbucket.org/linkeddatacenter/sdaas/compare/master%0D1.0.0
-[1.0.0]: https://bitbucket.org/linkeddatacenter/sdaas/compare/1.0.0%0D0.0.0
+[Unreleased]: https://bitbucket.org/linkeddatacenter/sdaas/compare/master%0D1.1.0
+[1.1.0]: https://bitbucket.org/linkeddatacenter/sdaas/compare/1.1.0%0D1.0.0

Dockerfile

@@ -1,20 +1,39 @@
 # Copyright (C) 2019 LinkedData.Center - All Rights Reserved
 # Permission to copy and modify is granted under the MIT license
-FROM  lyrasis/blazegraph:2.1.5
+FROM bash as build-stage
+
+ENV BLAZEGRAPH_VERSION=CANDIDATE_2_1_5 
+ENV BLAZEGRAPH_VERSION_URL https://github.com/blazegraph/database/releases/download/BLAZEGRAPH_RELEASE_${BLAZEGRAPH_VERSION}/blazegraph.war
+
+RUN apk --no-cache add unzip
+
+RUN apk add --no-cache openssl && \
+    apk add --no-cache su-exec && \
+    wget -O /blazegraph.war $BLAZEGRAPH_VERSION_URL
+
+# unpack and rename the blazegraph webapp
+RUN unzip /blazegraph.war -d /sdaas
+COPY webapps/sdaas/html /sdaas/html
+
+### production stage ###
+FROM jetty:9-jre8-alpine
 
 LABEL authors="enrico@linkeddata.center"
 
+ENV JAVA_OPTS="-Xmx1g" \
+    JETTY_WEBAPPS=/var/lib/jetty/webapps \
+    BLAZEGRAPH_UID=888 \
+    BLAZEGRAPH_GID=888
+
 USER root
 
 COPY helpers/* /
 
-RUN apk --no-cache add \
-	unzip \
-	sudo
+RUN apk add --no-cache openssl bash su-exec sudo && \
+    chmod +rx /sdaas-st* 
+ 
+COPY --from=build-stage /sdaas ${JETTY_WEBAPPS}/sdaas
+COPY webapps/shared ${JETTY_WEBAPPS}/shared
 
-# unpack and rename the blazegraph webapp
-RUN unzip ${JETTY_WEBAPPS}/bigdata.war -d ${JETTY_WEBAPPS}/sdaas; \
-	rm -f ${JETTY_WEBAPPS}/bigdata.war
 
-COPY html /var/lib/jetty/webapps/sdaas/
-CMD /sdaas-start --foreground
+CMD /sdaas-start --foreground