#87 - working on the gitlab CI stuff

Author: danhaywood

.gitlab-ci.yml

@@ -4,19 +4,12 @@
 # - NEXUS_USERNAME
 # - NEXUS_PASSWORD
 # - NEXUS_REPO_URL
-# - DOCKER_REGISTRY_USERNAME
-# - DOCKER_REGISTRY_PASSWORD
-# - DOCKER_REGISTRY_EMAIL
-# - DOCKER_REGISTRY_NAME        # eg "registry-1.docker.io" (for docker hub)
-                                # or "docker-dev.incode.cloud" (eg a cloud-based nexus)
-# - DOCKER_REGISTRY_URL         # eg "https://index.docker.io/v1/" (for docker hub)
-                                # or "https://repo.incode.cloud/repository/docker-dev/" (eg a cloud-based nexus)
 #
 
 image: maven:3.5.3-jdk-8
 
 before_script:
-  - export BASELINE=2.0.0-M1
+  - export BASELINE=1.16.2
   - export REVISION=$BASELINE.$(date +%Y%m%d)-$(date +%H%M)-$(echo $CI_COMMIT_SHA | cut -c1-8)
 
 services:
@@ -25,7 +18,7 @@ services:
 variables:
   DOCKER_HOST: tcp://docker:2375
   DOCKER_DRIVER: overlay2
-  APP_NAME: "simpleapp"
+#  APP_NAME: "incode-extended-app"
 
 stages:
   - build-package-push
@@ -34,37 +27,57 @@ build-package-push:
   stage: build-package-push
   script:
     - echo "REVISION=$REVISION"
-    - cd core
-    - >
-      mvn -s .m2/settings.xml \
-          --batch-mode \
-          clean deploy \
-          -Drevision=$REVISION \
-          -Dnexus-deploy \
-          -Dnexus-deploy.repositoryUrl=$NEXUS_REPO_URL \
-          $CORE_ADDITIONAL_OPTS
-    - cd ..
-    - cd example/application/$APP_NAME
     - >
       mvn --batch-mode \
-          install \
+          clean install
           -Drevision=$REVISION \
-          -Disis.version=$REVISION \
-          -Dmavenmixin-docker \
-          -Ddocker-plugin.imageName=$DOCKER_REGISTRY_NAME/$DOCKER_REGISTRY_USERNAME/$APP_NAME
+    - cd modules
     - >
       mvn -s .m2/settings.xml \
           --batch-mode \
-          docker:push@push-image-tagged \
-          -pl webapp \
-          -Drevision=$REVISION \
-          -Disis.version=$REVISION \
+          deploy \
           -DskipTests \
-          -Dskip.isis-swagger \
-          -Dmavenmixin-docker \
-          -Ddocker-plugin.imageName=$DOCKER_REGISTRY_NAME/$DOCKER_REGISTRY_USERNAME/$APP_NAME \
-          -Ddocker-plugin.serverId=docker-registry \
-          -Ddocker.registryUrl=$DOCKER_REGISTRY_URL
-    - cd ../../..
+          -Drevision=$REVISION \
+          -Dnexus-deploy \
+          -Dnexus-deploy.repositoryUrl=$NEXUS_REPO_URL
+    - cd ..
 
 
+#
+# TODO: to enable (if we decide to configure the incode-extended app as a Docker image)
+#
+#
+# requires the additional following gitlab secret variables
+#
+# - DOCKER_REGISTRY_USERNAME
+# - DOCKER_REGISTRY_PASSWORD
+# - DOCKER_REGISTRY_EMAIL
+# - DOCKER_REGISTRY_NAME        # eg "registry-1.docker.io" (for docker hub)
+                                # or "docker-dev.incode.cloud" (eg a cloud-based nexus)
+# - DOCKER_REGISTRY_URL         # eg "https://index.docker.io/v1/" (for docker hub)
+                                # or "https://repo.incode.cloud/repository/docker-dev/" (eg a cloud-based nexus)
+#
+#
+#
+#    - cd example/app/extended
+#    - >
+#      mvn --batch-mode \
+#          install \
+#          -Drevision=$REVISION \
+#          -Disis.version=$REVISION \
+#          -Dmavenmixin-docker \
+#          -Ddocker-plugin.imageName=$DOCKER_REGISTRY_NAME/$DOCKER_REGISTRY_USERNAME/$APP_NAME
+#    - >
+#      mvn -s .m2/settings.xml \
+#          --batch-mode \
+#          docker:push@push-image-tagged \
+#          -pl webapp \
+#          -Drevision=$REVISION \
+#          -Disis.version=$REVISION \
+#          -DskipTests \
+#          -Dskip.isis-swagger \
+#          -Dmavenmixin-docker \
+#          -Ddocker-plugin.imageName=$DOCKER_REGISTRY_NAME/$DOCKER_REGISTRY_USERNAME/$APP_NAME \
+#          -Ddocker-plugin.serverId=docker-registry \
+#          -Ddocker.registryUrl=$DOCKER_REGISTRY_URL
+#    - cd ../../..

modules/.m2/settings.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <servers>
+    <server>
+      <id>nexus-deploy.serverId</id>
+      <username>${env.NEXUS_USERNAME}</username>
+      <password>${env.NEXUS_PASSWORD}</password>
+    </server>
+  </servers>
+</settings>