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 18:18:43 UTC
[isis] branch master updated: ISIS-1904: reinstates some of the
vars and the docker push
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 28f7a6e ISIS-1904: reinstates some of the vars and the docker push
28f7a6e is described below
commit 28f7a6ebd8416d32f46a3dacda27fcbeae8db202
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Mar 15 18:18:36 2018 +0000
ISIS-1904: reinstates some of the vars and the docker push
the docker push probably fails due to -pl webapp ; instead use -D docker-deploy technique, as per Estatio ECP.
---
.gitlab-ci.yml | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25875a7..690b02d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,12 @@
+#
+# requires the following gitlab secret variables
+#
+# - DOCKER_REGISTRY_USERNAME
+# - DOCKER_REGISTRY_PASSWORD
+# - DOCKER_REGISTRY_EMAIL
+#
+#
+
image: maven:3.5.3-jdk-8
before_script:
@@ -11,6 +20,9 @@ variables:
DOCKER_HOST: tcp://docker:2375
DOCKER_DRIVER: overlay2
MAVEN_CLI_OPTS: "--batch-mode"
+ DOCKER_REGISTRY_ID: "docker-hub"
+ DOCKER_REGISTRY_URL: "https://index.docker.io/v1/"
+ DOCKER_REGISTRY_REPOSITORY: "simpleapp"
stages:
- build-package
@@ -33,7 +45,20 @@ build-package:
-Drevision=$REVISION \
-Disis.version=$REVISION \
-Dmavenmixin-docker \
- -Ddocker-plugin.imageName=isis/simpleapp
+ -Ddocker-plugin.imageName=$DOCKER_REGISTRY_USERNAME/$DOCKER_REGISTRY_REPOSITORY
+ - >
+ mvn $MAVEN_CLI_OPTS \
+ -s .m2/settings.xml \
+ docker:push@push-image-tagged \
+ -pl webapp \
+ -Drevision=$REVISION \
+ -Disis.version=$REVISION \
+ -DskipTests \
+ -Dskip.isis-swagger \
+ -Dmavenmixin-docker \
+ -Ddocker-plugin.imageName=$DOCKER_REGISTRY_USERNAME/$DOCKER_REGISTRY_REPOSITORY \
+ -Ddocker-plugin.serverId=$DOCKER_REGISTRY_ID \
+ -Ddocker.registryUrl=$DOCKER_REGISTRY_URL
- cd ../../..
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.