This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git
The following commit(s) were added to refs/heads/develop by this push:
new 7ff8924 Add custos docker repository
new 2649efe Merge pull request #50 from isururanawaka/cleanup
7ff8924 is described below
commit 7ff89244ea80f6d082fd2a602421a8a909fd8688
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Fri May 1 15:24:44 2020 -0400
Add custos docker repository
---
.../src/main/helm/values.yaml | 2 +-
.../src/main/helm/values.yaml | 2 +-
.../src/main/helm/values.yaml | 2 +-
.../src/main/helm/values.yaml | 2 +-
.../src/main/helm/values.yaml | 2 +-
.../src/main/helm/values.yaml | 2 +-
.../src/main/helm/values.yaml | 2 +-
.../src/main/helm/values.yaml | 2 +-
.../src/main/helm/values.yaml | 2 +-
.../src/main/helm/values.yaml | 2 +-
.../src/main/helm/values.yaml | 4 +-
.../src/main/helm/values.yaml | 4 +-
.../src/main/helm/values.yaml | 4 +-
.../src/main/helm/values.yaml | 4 +-
.../scim-service/src/main/helm/values.yaml | 2 +-
.../src/main/helm/values.yaml | 4 +-
.../src/main/helm/values.yaml | 4 +-
pom.xml | 251 +++++++++++++--------
18 files changed, 184 insertions(+), 113 deletions(-)
diff --git
a/custos-core-services/agent-profile-core-service/src/main/helm/values.yaml
b/custos-core-services/agent-profile-core-service/src/main/helm/values.yaml
index 4730bc0..93eb74d 100644
--- a/custos-core-services/agent-profile-core-service/src/main/helm/values.yaml
+++ b/custos-core-services/agent-profile-core-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 2
image:
- repository: isurur/${artifactId}
+ repository: apachecustos/${artifactId}
tag: ${project.version}
pullPolicy: Always
diff --git
a/custos-core-services/cluster-management-core-service/src/main/helm/values.yaml
b/custos-core-services/cluster-management-core-service/src/main/helm/values.yaml
index 02c01b1..a615342 100644
---
a/custos-core-services/cluster-management-core-service/src/main/helm/values.yaml
+++
b/custos-core-services/cluster-management-core-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 2
image:
- repository: isurur/${artifactId}
+ repository: apachecustos/${artifactId}
tag: ${project.version}
pullPolicy: Always
diff --git
a/custos-core-services/credential-store-core-service/src/main/helm/values.yaml
b/custos-core-services/credential-store-core-service/src/main/helm/values.yaml
index 4730bc0..93eb74d 100644
---
a/custos-core-services/credential-store-core-service/src/main/helm/values.yaml
+++
b/custos-core-services/credential-store-core-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 2
image:
- repository: isurur/${artifactId}
+ repository: apachecustos/${artifactId}
tag: ${project.version}
pullPolicy: Always
diff --git
a/custos-core-services/federated-authentication-core-service/src/main/helm/values.yaml
b/custos-core-services/federated-authentication-core-service/src/main/helm/values.yaml
index 4730bc0..93eb74d 100644
---
a/custos-core-services/federated-authentication-core-service/src/main/helm/values.yaml
+++
b/custos-core-services/federated-authentication-core-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 2
image:
- repository: isurur/${artifactId}
+ repository: apachecustos/${artifactId}
tag: ${project.version}
pullPolicy: Always
diff --git
a/custos-core-services/iam-admin-core-service/src/main/helm/values.yaml
b/custos-core-services/iam-admin-core-service/src/main/helm/values.yaml
index 4730bc0..93eb74d 100644
--- a/custos-core-services/iam-admin-core-service/src/main/helm/values.yaml
+++ b/custos-core-services/iam-admin-core-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 2
image:
- repository: isurur/${artifactId}
+ repository: apachecustos/${artifactId}
tag: ${project.version}
pullPolicy: Always
diff --git
a/custos-core-services/identity-core-service/src/main/helm/values.yaml
b/custos-core-services/identity-core-service/src/main/helm/values.yaml
index 4730bc0..93eb74d 100644
--- a/custos-core-services/identity-core-service/src/main/helm/values.yaml
+++ b/custos-core-services/identity-core-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 2
image:
- repository: isurur/${artifactId}
+ repository: apachecustos/${artifactId}
tag: ${project.version}
pullPolicy: Always
diff --git
a/custos-core-services/resource-secret-core-service/src/main/helm/values.yaml
b/custos-core-services/resource-secret-core-service/src/main/helm/values.yaml
index 9c8a201..fa8b2ef 100644
---
a/custos-core-services/resource-secret-core-service/src/main/helm/values.yaml
+++
b/custos-core-services/resource-secret-core-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 2
image:
- repository: isurur/${artifactId}
+ repository: apachecustos/${artifactId}
tag: ${project.version}
pullPolicy: Always
diff --git
a/custos-core-services/tenant-profile-core-service/src/main/helm/values.yaml
b/custos-core-services/tenant-profile-core-service/src/main/helm/values.yaml
index 9c8a201..fa8b2ef 100644
--- a/custos-core-services/tenant-profile-core-service/src/main/helm/values.yaml
+++ b/custos-core-services/tenant-profile-core-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 2
image:
- repository: isurur/${artifactId}
+ repository: apachecustos/${artifactId}
tag: ${project.version}
pullPolicy: Always
diff --git
a/custos-core-services/user-profile-core-service/src/main/helm/values.yaml
b/custos-core-services/user-profile-core-service/src/main/helm/values.yaml
index 9c8a201..fa8b2ef 100644
--- a/custos-core-services/user-profile-core-service/src/main/helm/values.yaml
+++ b/custos-core-services/user-profile-core-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 2
image:
- repository: isurur/${artifactId}
+ repository: apachecustos/${artifactId}
tag: ${project.version}
pullPolicy: Always
diff --git
a/custos-core-services/utility-services/custos-configuration-service/src/main/helm/values.yaml
b/custos-core-services/utility-services/custos-configuration-service/src/main/helm/values.yaml
index 8af280b..13314d7 100644
---
a/custos-core-services/utility-services/custos-configuration-service/src/main/helm/values.yaml
+++
b/custos-core-services/utility-services/custos-configuration-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 2
image:
- repository: isurur/${artifactId}
+ repository: apachecustos/${artifactId}
tag: ${project.version}
pullPolicy: Always
diff --git
a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/values.yaml
b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/values.yaml
index b7f8240..d83557d 100644
---
a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/values.yaml
+++
b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 2
image:
- repository: isurur/${artifactId}
+ repository: apachecustos/${artifactId}
tag: ${project.version}
pullPolicy: Always
@@ -69,7 +69,7 @@ tolerations: []
affinity: {}
proxy:
- repository: isurur/agent-management-service-sidecar
+ repository: apachecustos/agent-management-service-sidecar
tag: 1.0-SNAPSHOT
port: 50000
adminport: 9901
diff --git
a/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/values.yaml
b/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/values.yaml
index f6958fa..fc25587 100644
---
a/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/values.yaml
+++
b/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 2
image:
- repository: isurur/${artifactId}
+ repository: apachecustos/${artifactId}
tag: ${project.version}
pullPolicy: Always
@@ -69,7 +69,7 @@ tolerations: []
affinity: {}
proxy:
- repository: isurur/group-management-service-sidecar
+ repository: apachecustos/group-management-service-sidecar
tag: 1.0-SNAPSHOT
port: 50000
adminport: 9901
diff --git
a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/values.yaml
b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/values.yaml
index 6cffc0c..b79f6ef 100644
---
a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/values.yaml
+++
b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 2
image:
- repository: isurur/${artifactId}
+ repository: apachecustos/${artifactId}
tag: ${project.version}
pullPolicy: Always
@@ -69,7 +69,7 @@ tolerations: []
affinity: {}
proxy:
- repository: isurur/identity-management-service-sidecar
+ repository: apachecustos/identity-management-service-sidecar
tag: 1.0-SNAPSHOT
port: 50000
adminport: 9901
diff --git
a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/values.yaml
b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/values.yaml
index 380e83c..8a669e1 100644
---
a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/values.yaml
+++
b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 2
image:
- repository: isurur/${artifactId}
+ repository: apachecustos/${artifactId}
tag: ${project.version}
pullPolicy: Always
@@ -74,7 +74,7 @@ role:
proxy:
- repository: isurur/resource-secret-management-service-sidecar
+ repository: apachecustos/resource-secret-management-service-sidecar
tag: 1.0-SNAPSHOT
port: 50000
adminport: 9901
diff --git a/custos-integration-services/scim-service/src/main/helm/values.yaml
b/custos-integration-services/scim-service/src/main/helm/values.yaml
index d1e1524..24389a2 100644
--- a/custos-integration-services/scim-service/src/main/helm/values.yaml
+++ b/custos-integration-services/scim-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 2
image:
- repository: isurur/${artifactId}
+ repository: apachecustos/${artifactId}
tag: ${project.version}
pullPolicy: Always
diff --git
a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/values.yaml
b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/values.yaml
index 3a2623c..059067a 100644
---
a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/values.yaml
+++
b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 2
image:
- repository: isurur/${artifactId}
+ repository: apachecustos/${artifactId}
tag: ${project.version}
pullPolicy: Always
@@ -69,7 +69,7 @@ tolerations: []
affinity: {}
proxy:
- repository: isurur/tenant-management-service-sidecar
+ repository: apachecustos/tenant-management-service-sidecar
tag: 1.0-SNAPSHOT
port: 50000
adminport: 9901
diff --git
a/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/values.yaml
b/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/values.yaml
index 6ddfe1f..a516b9c 100644
---
a/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/values.yaml
+++
b/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 2
image:
- repository: isurur/${artifactId}
+ repository: apachecustos/${artifactId}
tag: ${project.version}
pullPolicy: Always
@@ -69,7 +69,7 @@ tolerations: []
affinity: {}
proxy:
- repository: isurur/user-management-service-sidecar
+ repository: apachecustos/user-management-service-sidecar
tag: 1.0-SNAPSHOT
port: 50000
adminport: 9901
diff --git a/pom.xml b/pom.xml
index 6faa12f..9a839e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -220,6 +220,166 @@
</dependencies>
</dependencyManagement>
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven.compiler.plugin}</version>
+ <executions>
+ <execution>
+ <id>default</id>
+ </execution>
+ </executions>
+ <configuration>
+ <release>${java.version}</release>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring.boot.version}</version>
+ <executions>
+ <execution>
+ <id>default</id>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.xolstice.maven.plugins</groupId>
+ <artifactId>protobuf-maven-plugin</artifactId>
+ <version>${protobuf.maven.plugin}</version>
+ <configuration>
+
<protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact>
+ <pluginId>grpc-java</pluginId>
+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ <goal>compile-custom</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>container</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven.compiler.plugin}</version>
+ <executions>
+ <execution>
+ <id>container</id>
+ </execution>
+ </executions>
+ <configuration>
+ <release>${java.version}</release>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring.boot.version}</version>
+ <executions>
+ <execution>
+ <id>container</id>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.xolstice.maven.plugins</groupId>
+ <artifactId>protobuf-maven-plugin</artifactId>
+ <version>${protobuf.maven.plugin}</version>
+ <configuration>
+
<protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact>
+ <pluginId>grpc-java</pluginId>
+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact>
+ </configuration>
+ <executions>
+ <execution>
+ <id>container</id>
+ <goals>
+ <goal>compile</goal>
+ <goal>compile-custom</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <version>${docker.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>container</id>
+ <goals>
+ <goal>build</goal>
+ <goal>push</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <noCache>true</noCache>
+ <serverId>docker.io</serverId>
+
<repository>${docker.image.prefix}/${project.artifactId}</repository>
+ <tag>${project.version}</tag>
+
<useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+ <buildArgs>
+
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+ </buildArgs>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.deviceinsight.helm</groupId>
+ <artifactId>helm-maven-plugin</artifactId>
+ <version>${helm.maven.plugin.version}</version>
+ <configuration>
+ <chartName>${project.artifactId}</chartName>
+ <chartFolder>src/main/helm</chartFolder>
+
<chartRepoUrl>https://kubernetes-charts.storage.googleapis.com/</chartRepoUrl>
+ <helmVersion>2.16.0</helmVersion>
+ <strictLint>true</strictLint>
+ <valuesFile>src/main/helm/values.yaml</valuesFile>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>container</id>
+ <goals>
+ <goal>package</goal>
+ <goal>lint</goal>
+ <goal>template</goal>
+ <goal>deploy</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<build>
<extensions>
<extension>
@@ -228,95 +388,6 @@
<version>${os.maven.plugin}</version>
</extension>
</extensions>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.compiler.plugin}</version>
- <configuration>
- <release>${java.version}</release>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>repackage</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.xolstice.maven.plugins</groupId>
- <artifactId>protobuf-maven-plugin</artifactId>
- <version>${protobuf.maven.plugin}</version>
- <configuration>
-
<protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact>
- <pluginId>grpc-java</pluginId>
-
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- <goal>compile-custom</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>${docker.plugin.version}</version>
- <executions>
- <execution>
- <id>default</id>
- <goals>
- <goal>build</goal>
- <goal>push</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <noCache>true</noCache>
- <serverId>docker.io</serverId>
-
<repository>${docker.image.prefix}/${project.artifactId}</repository>
- <tag>${project.version}</tag>
- <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
- <buildArgs>
-
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
- </buildArgs>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>com.deviceinsight.helm</groupId>
- <artifactId>helm-maven-plugin</artifactId>
- <version>${helm.maven.plugin.version}</version>
- <configuration>
- <chartName>${project.artifactId}</chartName>
- <chartFolder>src/main/helm</chartFolder>
-
<chartRepoUrl>https://kubernetes-charts.storage.googleapis.com/</chartRepoUrl>
- <helmVersion>2.16.0</helmVersion>
- <strictLint>true</strictLint>
- <valuesFile>src/main/helm/values.yaml</valuesFile>
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>package</goal>
- <goal>lint</goal>
- <goal>template</goal>
- <goal>deploy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
<properties>
@@ -350,7 +421,7 @@
<io.micrometer.version>1.3.1</io.micrometer.version>
<brave.version>5.9.1</brave.version>
- <docker.image.prefix>isurur</docker.image.prefix>
+ <docker.image.prefix>apachecustos</docker.image.prefix>
<docker.image.repo>custos</docker.image.repo>
<docker.plugin.version>1.4.13</docker.plugin.version>
