Dev 2.1.3 (#5)

* small refactory

* ready to push to docker hub

Co-authored-by: Configuration Manager <admin@linkeddata.center>

Author: ecow

CHANGELOG.md

@@ -6,6 +6,21 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [unreleased]
 
 
+## [2.1.3]
+
+### Changed
+
+- using Jetty Override  for readonly setup
+- cleanedup dockerfile
+
+### Removed
+
+- readonly-web.xml and writable-web.xml
+
+### Added
+
+- readonly.xml
+
 ## [2.1.2]
 
 ### Fixed

Dockerfile

@@ -2,31 +2,53 @@
 # Permission to copy and modify is granted under the MIT license
 FROM bash as build-stage
 
-ENV BLAZEGRAPH_VERSION_URL https://github.com/blazegraph/database/releases/download/BLAZEGRAPH_2_1_6_RC/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
+RUN wget -O /blazegraph.war https://github.com/blazegraph/database/releases/download/BLAZEGRAPH_2_1_6_RC/blazegraph.war ;\
+	unzip /blazegraph.war -d /sdaas
 
 ### production stage ###
 FROM jetty:9.4-jdk13-slim
 
 LABEL authors="enrico@linkeddata.center"
 
-COPY helpers/sdaas-st* /
-COPY helpers/*.xml ${JETTY_BASE}/
-COPY --from=build-stage /sdaas ${JETTY_BASE}/webapps/sdaas
+USER root
+
+ENV SDAAS_STORE_NAME=rdfStore
+ENV SDAAS_STORE_LOG=/var/log/${SDAAS_STORE_NAME}
+ENV SDAAS_STORE_WAR=/opt/${SDAAS_STORE_NAME}
+ENV SDAAS_STORE_DATA=/var/lib/${SDAAS_STORE_NAME}
+
+####### Create dirs
+RUN mkdir -p "${SDAAS_STORE_WAR}" "${SDAAS_STORE_DATA}" "${SDAAS_STORE_LOG}" ; \
+	chown -R jetty.jetty "${SDAAS_STORE_WAR}" "${SDAAS_STORE_DATA}" "${SDAAS_STORE_LOG}" 
+
+####### Install war
+COPY --from=build-stage /sdaas ${SDAAS_STORE_WAR}
+COPY helpers/sdaas-template.xml ${JETTY_BASE}/webapps/sdaas.xml
+RUN sed -i \
+		-e "s|__SDAAS_STORE_WAR__|${SDAAS_STORE_WAR}|g" \
+	"${JETTY_BASE}/webapps/sdaas.xml" ; \
+	chown jetty.jetty "${JETTY_BASE}/webapps/sdaas.xml"
+
+####### Configure the override template for war.xml 
+COPY helpers/readonly-template.xml "${JETTY_BASE}/readonly-template.xml"
+RUN chown jetty.jetty "${JETTY_BASE}/readonly-template.xml" 
 
-USER root	
+####### Configure RWStore.properties file
+RUN sed "s|^com\.bigdata.journal\.AbstractJournal\.file=.*|com.bigdata.journal.AbstractJournal.file=${SDAAS_STORE_DATA}/${SDAAS_STORE_NAME}.jnl|" \
+		"${SDAAS_STORE_WAR}/WEB-INF/RWStore.properties" \
+		> "${JETTY_BASE}/RWStore.properties" ; \
+	chown jetty.jetty "${JETTY_BASE}/RWStore.properties" 
+
+
+####### Configure startups scrips
+COPY helpers/sdaas-st* /
 RUN chown jetty.jetty /sdaas-st* ; \
-	chmod +rx /sdaas-st* ; \
-	chown jetty.jetty ${JETTY_BASE}/webapps/sdaas/WEB-INF/web.xml ;
-USER jetty
+	chmod +rx /sdaas-st* 
+
 
+	
+USER jetty
 ENTRYPOINT ["/sdaas-start"]
 CMD ["--size", "micro"]	

README.md

@@ -1,42 +1,50 @@
 ![logo](http://linkeddata.center/resources/v4/logo/Logo-colori-trasp_oriz-640x220.png)
 
 # sdaas-rdfstore
-Run a dockerized blazegraph instance certified for sdaas
+A dockerized blazegraph instance certified for sdaas
 
-Derived from the [lyrasis/blazegraph project](https://github.com/lyrasis/docker-blazegraph) 
+The sdaas-rdfstore requires [docker](https://www.docker.com/) 
 
 
-## Quickstart
-
-Build local image:
+## Build local image
 
 	docker build -t sdaas-rdfstore .
 
-Launch as a daemon:
-
+## Smoke tests
+	
+	docker run --rm -ti --entrypoint bash sdaas-rdfstore
+	/sdaas-start -d --size small --readonly || echo KO
+	sleep 10 # some time to warmup
+	test -f /var/log/rdfStore/rdfStore.log || echo KO
+	test -f /var/lib/rdfStore/rdfStore.jnl || echo KO
+	/sdaas-stop || echo KO
+	exit
+	
 	docker run --name gdaas -d -p 8080:8080 sdaas-rdfstore
 	docker logs -f gdaas
+	# point browser to http://localhost:8080/sdaas to see workbench interface
+	#..press ctrl-c to exit logs
+	docker rm -f gdaas
 
+## sdaas-start options
 
-Interactive section:
+ To print sdaas-start usage:  `docker run --rm -t sdaas-rdfstore --help` 
 
-	docker run --rm -ti -p 8080:8080 --entrypoint bash sdaas-rdfstore
-	/sdaas-start
-	/sdaas-stop
-	exit
-
-sdaas-start options:
-
-		-d, --background
-			execute the platform as a daemon
-		
-		--readonly
-		   disallow mutations in graph database
-		   
-		--size micro|small|medium|large|xlarge|xxlarge|custom
+	Smart Data as a Service (SDaaS) knowledge graph engine
+	Copyright (C) 2018-2020 http://linkeddata.center/
+	
+	startup options:
+	
+	-d, --background
+	execute the platform as a daemon
+	
+	--readonly
+	   disallow mutations in graph database
+	
+	--size micro|small|medium|large|xlarge|xxlarge|custom
 
 
-memory footprints and performances related to size
+memory footprints and performances related to size:
 
 | size value       | required RAM | edges (triples) |
 |------------------|--------------|-----------------|
@@ -55,6 +63,8 @@ The *custom* size let to you setting up proper configurations, see https://githu
 
 To persist data and improve performances, you should mount as a fast volume the directory /var/lib/sdaas
 
+
+
 ## Push to docker hub
 
 To push a new docker image to docker hub:

helpers/readonly-template.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_1.xsd"
+  version="3.1">
+  <context-param>
+   <description>When true, the REST API will not permit mutation operations.</description>
+    <param-name>readOnly</param-name>
+    <param-value>__READONLY__</param-value>
+  </context-param>
+</web-app>