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 17:36:14 UTC
[isis] branch master updated (7a64994 -> ce9f743)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 7a64994 ISIS-1904: fixes some bad versions in the simpleapp archetype
new 3fed44f Revert "ISIS-1904: attempts to fix docker push issues"
new d0e6c12 Revert "ISIS-1904: further tweaks for gitlab ci"
new ce9f743 Revert "ISIS-1904: extends gitlab ci to push image of simpleapp to dockerhub"
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitlab-ci.yml | 36 ++++------------------------
example/application/simpleapp/webapp/pom.xml | 3 +--
2 files changed, 5 insertions(+), 34 deletions(-)
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 03/03: Revert "ISIS-1904: extends gitlab ci to push image of
simpleapp to dockerhub"
Posted by da...@apache.org.
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
commit ce9f743ed396498b673bb6a270f96ee08cac3044
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Mar 15 17:35:49 2018 +0000
Revert "ISIS-1904: extends gitlab ci to push image of simpleapp to dockerhub"
This reverts commit 6f35ce1136bfba3441bee6acc33c0d76a48b9783.
---
.gitlab-ci.yml | 29 ++---------------------------
1 file changed, 2 insertions(+), 27 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4268c70..198896a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,3 @@
-#
-# requires the following gitlab secret variables
-#
-# - DOCKER_REGISTRY_USERNAME
-# - DOCKER_REGISTRY_PASSWORD
-# - DOCKER_REGISTRY_EMAIL
-#
-#
-
image: maven:3.5.3-jdk-8
before_script:
@@ -19,11 +10,7 @@ services:
variables:
DOCKER_HOST: tcp://docker:2375
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"
- DOCKER_REGISTRY_ID: "docker-hub"
- DOCKER_REGISTRY_URL: "https://index.docker.io/v1/"
- DOCKER_REGISTRY_REPOSITORY: "simpleapp"
+ MAVEN_CLI_OPTS: "--batch-mode"
stages:
- build-package
@@ -45,19 +32,7 @@ build-package:
-Drevision=$REVISION \
-Disis.version=$REVISION \
-Dmavenmixin-docker \
- -Ddocker-plugin.imageName=$DOCKER_REGISTRY_USERNAME/$DOCKER_REGISTRY_REPOSITORY
- - >
- mvn $MAVEN_CLI_OPTS \
- 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
+ -Ddocker-plugin.imageName=isis/simpleapp
- cd ../../..
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 01/03: Revert "ISIS-1904: attempts to fix docker push issues"
Posted by da...@apache.org.
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
commit 3fed44fedf28b7b171952da5df9bbff3b97df266
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Mar 15 17:35:31 2018 +0000
Revert "ISIS-1904: attempts to fix docker push issues"
This reverts commit a97d6b9a8ab362a7bf41d15d800f1795bae15ce4.
---
.gitlab-ci.yml | 4 +---
example/application/simpleapp/webapp/pom.xml | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 170920e..4b2d569 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,9 +58,7 @@ build-package:
-Dmavenmixin-docker \
-Ddocker-plugin.imageName=$DOCKER_REGISTRY_USERNAME/$DOCKER_REGISTRY_REPOSITORY \
-Ddocker-plugin.serverId=$DOCKER_REGISTRY_ID \
- -Ddocker.registryUrl=$DOCKER_REGISTRY_URL \
- -Dskip.sonatype-snapshots \
- -Dskip.apache-snapshots
+ -Ddocker.registryUrl=$DOCKER_REGISTRY_URL
- cd ../../..
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index 744056d..634e501 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -198,7 +198,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>${hsqldb.version}</version>
+ <version>2.3.1</version>
</dependency>
<!-- workaround to avoid conflict with plexus-default -->
</dependencies>
@@ -217,7 +217,6 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>${hsqldb.version}</version>
</dependency>
</dependencies>
</profile>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 02/03: Revert "ISIS-1904: further tweaks for gitlab ci"
Posted by da...@apache.org.
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
commit d0e6c12c47041382f242b21e6424ba637ce853ac
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Mar 15 17:35:41 2018 +0000
Revert "ISIS-1904: further tweaks for gitlab ci"
This reverts commit 92725aeafafe6c9acb539d137dcd8313f0946b26.
---
.gitlab-ci.yml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b2d569..4268c70 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,6 +19,7 @@ services:
variables:
DOCKER_HOST: tcp://docker:2375
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"
DOCKER_REGISTRY_ID: "docker-hub"
DOCKER_REGISTRY_URL: "https://index.docker.io/v1/"
@@ -33,22 +34,20 @@ build-package:
- echo "REVISION=$REVISION"
- cd core
- >
- mvn --batch-mode \
+ mvn $MAVEN_CLI_OPTS \
clean install \
-Drevision=$REVISION
- cd ..
- cd example/application/simpleapp
- >
- mvn -s .m2/settings.xml \
- --batch-mode \
+ mvn $MAVEN_CLI_OPTS \
install \
-Drevision=$REVISION \
-Disis.version=$REVISION \
-Dmavenmixin-docker \
-Ddocker-plugin.imageName=$DOCKER_REGISTRY_USERNAME/$DOCKER_REGISTRY_REPOSITORY
- >
- mvn -s .m2/settings.xml \
- --batch-mode \
+ mvn $MAVEN_CLI_OPTS \
docker:push@push-image-tagged \
-pl webapp \
-Drevision=$REVISION \
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.