Merge pull request #58 from querqy/refactoring_2020

Refactoring 2020

Author: pbartusch

.dockerignore

@@ -0,0 +1,8 @@
+docs
+frontend/node_modules
+public
+target
+test
+testData.sql
+*.md
+.git

.gitignore

@@ -5,7 +5,7 @@ target
 tmp
 .history
 dist
-/.idea
+.idea
 /*.iml
 /out
 /.idea_modules
@@ -24,3 +24,6 @@ smui2solr-dev.sh
 var/test.db
 node_modules/
 package-lock.json
+/public
+e2e/cypress/videos
+e2e/cypress/screenshots

Dockerfile

@@ -0,0 +1,60 @@
+# syntax = docker/dockerfile:1.0-experimental
+FROM openjdk:11-buster as builder
+
+ARG NODE_VERSION=10
+
+RUN echo "deb https://dl.bintray.com/sbt/debian /" > /etc/apt/sources.list.d/sbt.list \
+    && curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | apt-key add \
+    && apt-get update \
+    && apt-get install -y sbt
+
+RUN apt-get install -y lsb-release \
+    && export DISTRO="$(lsb_release -s -c)" \
+    && echo "deb https://deb.nodesource.com/node_$NODE_VERSION.x $DISTRO main" > /etc/apt/sources.list.d/nodesource.list \
+    && echo "deb-src https://deb.nodesource.com/node_$NODE_VERSION.x $DISTRO main" >> /etc/apt/sources.list.d/nodesource.list \
+    && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
+    && apt-get update \
+    && apt-get install -y nodejs
+
+COPY . /smui
+WORKDIR /smui
+
+RUN --mount=target=/root/.ivy2,type=cache sbt "set test in assembly := {}" clean assembly
+
+FROM openjdk:11-jre-slim-buster
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends openssh-client sshpass bash curl git \
+    && rm -rf /var/lib/apt/lists/*
+
+ARG VERSION
+ENV SMUI_VERSION=$VERSION
+
+# PID file should be /dev/null in docker containers, as SMUI is the only process in the container, anyway
+# and present PID files from previous runs prevent startup
+ENV SMUI_CONF_PID_PATH=/dev/null
+ENV SMUI_CONF_HTTP_PORT=9000
+ENV SMUI_CONF_LOGBACK_XML_PATH=/smui/logback.xml
+
+EXPOSE $SMUI_CONF_HTTP_PORT
+
+# create non-root smui user & group (security)
+RUN addgroup --gid 1024 smui \
+    && adduser --uid 1024 --ingroup smui smui --disabled-password --quiet
+
+WORKDIR /smui
+
+RUN mkdir /tmp/smui-git-repo /home/smui/.ssh \
+    && chown -R smui:smui /smui /tmp/smui-git-repo /home/smui/.ssh
+
+USER smui
+
+COPY --chown=smui:smui conf/logback.xml .
+COPY --chown=smui:smui conf/smui2solr.sh conf/smui2git.sh conf/
+COPY --from=builder --chown=smui:smui /smui/target/scala-*/search-management-ui-assembly-$VERSION.jar .
+
+CMD java \
+  -Dpidfile.path=$SMUI_CONF_PID_PATH \
+  -Dlogback.configurationFile=$SMUI_CONF_LOGBACK_XML_PATH \
+  -Dhttp.port=$SMUI_CONF_HTTP_PORT \
+  -jar /smui/search-management-ui-assembly-$SMUI_VERSION.jar

Makefile

@@ -1,25 +1,16 @@
+all:
 
-IMAGE = querqy/smui
-VERSION = $(shell grep -E '^version' build.sbt | cut -d'"' -f2)
-SCALA_VERSION = $(shell grep -E '^scalaVersion' build.sbt | cut -d'"' -f2 | cut -d. -f1-2)
-
-all: docker-build-only
+serve:
+	@sbt run
 
 docker-build-only:
-	env DOCKER_BUILDKIT=1 docker build --build-arg VERSION=$(VERSION) \
-		--build-arg SCALA_VERSION=$(SCALA_VERSION) -t $(IMAGE):$(VERSION) -f build/Dockerfile .
-
-docker-run:
-	mkdir -p var
-	docker run -v`pwd`/var:/var/smui -p9000:9000 --rm -it --name smui \
-		-eSMUI_DB_URL=jdbc:sqlite:/var/smui/test.db -eSMUI_DB_JDBC_DRIVER=org.sqlite.JDBC \
-		$(IMAGE):$(VERSION)
+	DOCKER_BUILDKIT=1 sbt docker
 
-docker-push: docker-push-version docker-push-latest
+docker-push:
+	DOCKER_BUILDKIT=1 sbt dockerPush
 
-docker-push-version:
-	docker push $(IMAGE):$(VERSION)
+docker-build-and-push:
+	DOCKER_BUILDKIT=1 sbt dockerBuildAndPush
 
-docker-push-latest:
-	docker tag $(IMAGE):$(VERSION) $(IMAGE):latest
-	docker push $(IMAGE):latest
+docker-run:
+	@docker-compose up