You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2018/03/15 11:05:12 UTC
[isis] 01/02: ISIS-1916: updates from testing that example
simpleapp works with gitlab-ci
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 32f82285221c91fc659a0fb3e90b1d24f6828093
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Mar 15 09:43:24 2018 +0000
ISIS-1916: updates from testing that example simpleapp works with gitlab-ci
---
example/application/simpleapp/.gitlab-ci.yml | 15 +++++++++------
example/application/simpleapp/.m2/settings.xml | 6 +++---
example/application/simpleapp/pom.xml | 2 +-
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/example/application/simpleapp/.gitlab-ci.yml b/example/application/simpleapp/.gitlab-ci.yml
index f7519b1..8b1e37a 100644
--- a/example/application/simpleapp/.gitlab-ci.yml
+++ b/example/application/simpleapp/.gitlab-ci.yml
@@ -1,8 +1,11 @@
#
# requires the following gitlab secret variables
-# - DOCKER_HUB_USERNAME
-# - DOCKER_HUB_PASSWORD
-# - DOCKER_HUB_EMAIL
+# - DOCKER_REGISTRY_USERNAME
+# - DOCKER_REGISTRY_PASSWORD
+# - DOCKER_REGISTRY_EMAIL
+#
+# Adjust "DOCKER_REGISTRY_REPOSITORY" variable (below) to be the name of the repository in the specified registry.
+#
#
image: maven:3.5.3-jdk-8
@@ -18,9 +21,9 @@ variables:
DOCKER_DRIVER: overlay2
MAVEN_CLI_OPTS: "-s .m2/settings.xml --batch-mode"
MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dskip.cloudbees-estatio-repositories -Dskip.sonatype-snapshots -Dskip.apache-snapshots"
- APP_NAME: "isis-demoapp-simpleapp"
DOCKER_REGISTRY_ID: "docker-hub"
DOCKER_REGISTRY_URL: "https://index.docker.io/v1/"
+ DOCKER_REGISTRY_REPOSITORY: "simpleapp"
stages:
- build-package-push
@@ -34,7 +37,7 @@ build-package-push:
clean install \
-Drevision=$REVISION \
-Dmavenmixin-docker \
- -Ddocker-plugin.imageName=$DOCKER_HUB_USERNAME/$APP_NAME
+ -Ddocker-plugin.imageName=$DOCKER_REGISTRY_USERNAME/$DOCKER_REGISTRY_REPOSITORY
- >
mvn $MAVEN_CLI_OPTS \
docker:push@push-image-tagged \
@@ -43,7 +46,7 @@ build-package-push:
-DskipTests \
-Dskip.isis-swagger \
-Dmavenmixin-docker \
- -Ddocker-plugin.imageName=$DOCKER_HUB_USERNAME/$APP_NAME \
+ -Ddocker-plugin.imageName=$DOCKER_REGISTRY_USERNAME/$DOCKER_REGISTRY_REPOSITORY \
-Ddocker-plugin.serverId=$DOCKER_REGISTRY_ID \
-Ddocker.registryUrl=$DOCKER_REGISTRY_URL
diff --git a/example/application/simpleapp/.m2/settings.xml b/example/application/simpleapp/.m2/settings.xml
index aa4567d..d481ccb 100644
--- a/example/application/simpleapp/.m2/settings.xml
+++ b/example/application/simpleapp/.m2/settings.xml
@@ -5,10 +5,10 @@
<servers>
<server>
<id>${env.DOCKER_REGISTRY_ID}</id>
- <username>${env.DOCKER_HUB_USERNAME}</username>
- <password>${env.DOCKER_HUB_PASSWORD}</password>
+ <username>${env.DOCKER_REGISTRY_USERNAME}</username>
+ <password>${env.DOCKER_REGISTRY_PASSWORD}</password>
<configuration>
- <email>${env.DOCKER_HUB_EMAIL}</email>
+ <email>${env.DOCKER_REGISTRY_EMAIL}</email>
</configuration>
</server>
</servers>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 38669c2..fc54732 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.incode</groupId>
<artifactId>incode-build</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</parent>
<groupId>org.apache.isis.example.application</groupId>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.