Dviz 12 upgrade admin dependencies

Jenkinsfile

@@ -0,0 +1,68 @@
+#!/usr/bin/env groovy
+pipeline {
+  agent { label 'docker' }
+
+  environment {
+    MAVEN_IMAGE = 'maven:3.8-openjdk-17-slim'
+    DOCKER_BUILDKIT = '1'
+    PROJECT_TITLE = 'TCDI Admin'
+    REPO = 'registry.developmentgateway.org/'
+  }
+
+  stages {
+
+    stage('Compile') {
+      steps {
+        script {
+          def args = "-e JAVA_TOOL_OPTIONS=-Duser.home=$WORKSPACE_TMP"
+          withDockerContainer(image: env.MAVEN_IMAGE, args: args) {
+            // TODO: checkstyle
+            sh 'mvn -B clean package -DskipTests -Dcheckstyle.skip && mkdir forms/target/deps'
+            dir('forms/target/deps') {
+              sh 'jar -xf ../*.jar'
+            }
+          }
+        }
+      }
+    } // Compile
+
+    stage('Package & Publish') {
+      steps {
+        script {
+          def tag = ['main', 'master'].contains(env.BRANCH_NAME) ?
+            'latest' :
+            env.BRANCH_NAME.replaceAll('[^\\p{Alnum}-_]', '_').toLowerCase()
+          withEnv(["TAG=$tag"]) {
+            def dc = 'docker-compose'
+            sh "$dc build admin && $dc push admin"
+          }
+        }
+      }
+    } // Package & Publish
+
+    stage('Deploy') {
+      when { branch 'develop' }
+      agent { label 'ansible' }
+      steps {
+        script {
+          def tag = ['main', 'master'].contains(env.BRANCH_NAME) ?
+            'latest' :
+            env.BRANCH_NAME.replaceAll('[^\\p{Alnum}-_]', '_').toLowerCase()
+          ansiblePlaybook(
+            credentialsId: 'Deploy',
+            become: true,
+            playbook: 'deploy.yml',
+            skippedTags: 'provision',
+            extraVars: [
+              project_title: env.PROJECT_TITLE,
+              repo: env.REPO,
+              tag: tag,
+              pull: "true"
+            ]
+          )
+        } // script
+      } // steps
+    }
+
+  } // stages
+}

README.md

@@ -1,4 +1,4 @@
-# dg-toolkit
+# tcdi-admin based on dg-toolkit
 
 [![Build Status](https://travis-ci.org/devgateway/dg-toolkit.svg?branch=master)](https://travis-ci.org/devgateway/dg-toolkit)
 
@@ -113,7 +113,7 @@ frolvlad/alpine-oraclejdk8   slim                00d8610f052e        2 weeks ago
 The image can be started with
 
 ```
-$docker run -p 8090:8090 -t devgateway/toolkit/forms
+$docker run -p 8080:8080 -t devgateway/toolkit/forms
 ```
 
 That's it, congrats!

checkstyle-suppressions.xml

@@ -7,6 +7,8 @@
 
     <suppress checks="HideUtilityClassConstructor|FinalClass"
               files="PersistenceApplication\.java|MongoPersistenceApplication\.java|UIWebApplication\.java|WebApplication\.java|ReportingApplication\.java" />
+    <suppress checks="LineLength" files=".properties" />
 
     <suppress checks="[a-zA-Z0-9]*" files="[\\/]ui[\\/]" />
+    <suppress checks="[a-zA-Z0-9]*" files="[\\/]metamodel[\\/]" />
 </suppressions>

checkstyle.xml

@@ -10,12 +10,13 @@
 -->
 <module name="Checker">
   <property name="severity" value="warning"/>
+  <module name="LineLength">
+    <property name="max" value="120"/>
+  </module>
   <module name="TreeWalker">
     <property name="tabWidth" value="4"/>
-    <module name="org.devgateway.toolkit.checks.CachableQueryAnnotationCheck" />
     <module name="JavadocMethod">
       <property name="severity" value="ignore"/>
-      <property name="suppressLoadErrors" value="true"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
     <module name="JavadocType">
@@ -43,10 +44,7 @@
     <module name="TypeName"/>
     <module name="AvoidStarImport"/>
     <module name="IllegalImport"/>
-    <module name="RedundantImport"/>
-    <module name="LineLength">
-      <property name="max" value="120"/>
-    </module>
+    <module name="RedundantImport"/>    
     <module name="MethodLength"/>
     <module name="ParameterNumber"/>
     <module name="EmptyForIteratorPad"/>
@@ -58,6 +56,7 @@
     <module name="NoWhitespaceBefore"/>
     <module name="OperatorWrap"/>
     <module name="ParenPad"/>
+    <module name="SingleSpaceSeparator"/>
     <module name="TypecastParenPad"/>
     <module name="WhitespaceAfter"/>
     <module name="WhitespaceAround">
@@ -97,12 +96,12 @@
       <property name="protectedAllowed" value="true"/>
     </module>
     <module name="ArrayTypeStyle"/>
-    <!-- <module name="FinalParameters"/> -->
     <module name="TodoComment">
       <property name="severity" value="ignore"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
     <module name="UpperEll"/>
+	<module name="UnusedImports"/>
   </module>
   <module name="JavadocPackage">
     <property name="severity" value="ignore"/>
@@ -112,12 +111,11 @@
     <property name="severity" value="ignore"/>
     <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
   </module>
-  <module name="Translation"/>
+  <module name="Translation"/>  
   <module name="FileTabCharacter">
        <property name="fileExtensions" value="java,xml,html,md"/>
   </module>
   <module name="RegexpSingleline">
-    <property name="severity" value="ignore"/>
     <property name="format" value="\s+$"/>
     <property name="message" value="Line has trailing spaces."/>
     <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>

deploy.yml

@@ -0,0 +1,84 @@
+---
+- name: Deploy
+  hosts:
+    - "{{ project_title | regex_replace('[^\\w_]', '_') | lower }}_{{ tag }}"
+  vars:
+    product: "{{ project_title | regex_replace('[^\\w_]', '_') | lower }}"
+    systemd_service:
+      Unit.Description: "{{ project_title }}"
+      Unit.After: docker.socket docker.service
+      Unit.BindsTo: docker.socket docker.service
+      Install.WantedBy: multi-user.target
+      Service.Type: exec
+      Service.ExecStart: /usr/bin/docker-compose --no-ansi up
+      Service.WorkingDirectory: "/opt/devgateway/{{ product }}"
+      Service.Environment: "TAG={{ tag }} REPO={{ repo }}"
+
+  tasks:
+
+    - name: Install packages
+      ansible.builtin.package:
+        name:
+          - firewalld
+          - docker-compose
+      tags:
+        - provision
+
+    - name: Open firewall ports
+      ansible.posix.firewalld:
+        service: http
+        state: enabled
+        permanent: true
+        immediate: true
+        zone: public
+      tags:
+        - provision
+
+    - name: Configure Systemd unit
+      community.general.ini_file:
+        path: /etc/systemd/system/{{ product }}.service
+        create: true
+        no_extra_spaces: true
+        section: "{{ item.key.split('.')[0] }}"
+        option: "{{ item.key.split('.')[1] }}"
+        value: "{{ item.value }}"
+      loop: "{{ systemd_service | dict2items }}"
+      loop_control:
+        label: "{{ item.key }}"
+      notify:
+        - Reload Systemd
+
+    - name: Install Compose file
+      ansible.builtin.copy:
+        src: docker-compose.yml
+        dest: "{{ systemd_service['Service.WorkingDirectory'] }}/"
+      notify:
+        - Restart stack
+
+    - name: Update images
+      ansible.builtin.command:
+        chdir: "{{ systemd_service['Service.WorkingDirectory'] }}"
+        cmd: /usr/bin/docker-compose pull --quiet
+      environment:
+        TAG: "{{ tag }}"
+        REPO: "{{ repo }}"
+      notify:
+        - Restart stack
+      when: pull | default(false)
+
+    - name: Enable Compose service
+      ansible.builtin.service:
+        name: "{{ product }}"
+        enabled: true
+        state: started
+
+  handlers:
+
+    - name: Reload Systemd
+      ansible.builtin.systemd:
+        daemon_reload: true
+
+    - name: Restart stack
+      ansible.builtin.service:
+        name: "{{ product }}"
+        state: restarted

dev_services.bat

@@ -0,0 +1,3 @@
+set TAG=staging
+
+docker-compose up postgres admin

dev_services.sh

@@ -0,0 +1,2 @@
+set TAG=staging
+docker-compose up postgres admin

entrypoint.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+
+	PROP_FILE="tcdi-admin.properties"
+	echo "Writing to $PROP_FILE:"
+
+	PROPERTIES="$(cat <<-EOF
+		server.port
+		spring.application.name
+		spring.liquibase.enabled
+		spring.datasource.jdbc-url
+		spring.datasource.url
+		spring.mail.host
+		spring.jpa.hibernate.ddl-auto
+	EOF
+	)"
+
+  env
+
+	echo "$PROPERTIES" | while IFS=read PROPERTY; do
+		VAR_NAME="$(echo "$PROPERTY" | tr '[:lower:].-' '[:upper:]__')"
+		eval VALUE="\$$VAR_NAME"
+		if [ -n "$VALUE" ]; then
+			echo "$PROPERTY=$VALUE"
+		fi
+	done | tee -a "$PROP_FILE"
+
+	JAR="tcdi-admin-forms-0.0.1-SNAPSHOT.jar"
+	JAVA_OPTS="-Dspring.config.location=file://$PROP_FILE"
+	#exec /bin/sh -c "java -jar '$JAR' $JAVA_OPTS $@" nobody
+	exec /bin/bash
+	;;
+*)
+	exec $@
+	;;

forms/Dockerfile

@@ -0,0 +1,10 @@
+FROM openjdk:17-jdk-slim
+WORKDIR /opt/devgateway/tcdi/admin
+COPY target/deps/BOOT-INF/lib lib
+COPY target/deps/META-INF META-INF
+COPY entrypoint.sh ./
+COPY target/deps/BOOT-INF/classes .
+#USER nobody
+EXPOSE 8080
+ENTRYPOINT ["/opt/devgateway/tcdi/admin/entrypoint.sh"]
+CMD ["admin"]