Handle identical image tags 06/5806/2
authorAndrew Gauld <agauld@att.com>
Mon, 4 Nov 2019 16:30:28 +0000 (16:30 +0000)
committerAndrew Gauld <agauld@att.com>
Mon, 4 Nov 2019 16:37:02 +0000 (16:37 +0000)
Also update dependency versions for license manager and security verification
scan clients

Change-Id: Ia681e36d1659bf4f5af6eab59c81a2cd05508d30
Issue-ID: ACUMOS-3669, ACUMOS-3670
Signed-off-by: Andrew Gauld <agauld@att.com>
acumos-fgw-client/pom.xml
docs/release-notes.rst
gateway/pom.xml
gateway/src/main/java/org/acumos/federation/gateway/ContentServiceImpl.java

index ba7d053..3ecfe7e 100644 (file)
@@ -27,7 +27,7 @@ limitations under the License.
        </parent>
        <groupId>org.acumos.federation</groupId>
        <artifactId>acumos-fgw-client</artifactId>
-       <version>3.0.1-SNAPSHOT</version>
+       <version>3.0.2-SNAPSHOT</version>
        <name>Federation Gateway Client</name>
        <properties>
                <!-- dependency versions -->
index 87937e7..fa02470 100644 (file)
@@ -23,6 +23,11 @@ Federation Gateway Release Notes
 This server is available as a Docker image in a Docker registry at the Linux Foundation.
 The image name is "federation-gateway" and the tag is a version string as shown below.
 
+Version 3.0.2, 2019-11-04
+-------------------------
+* Don't re-tag imported docker images unless the tag is different (`ACUMOS-3670 <https://jira.acumos.org/browse/ACUMOS-3670>`_)
+* Update dependency versions for the security and license profile validation clients (`ACUMOS-3669 <https://jira.acumos.org/browse/ACUMOS-3669>`_)
+
 Version 3.0.1, 2019-09-26
 -------------------------
 * When a model has been federated, register it with the license manager (`ACUMOS-3484 <https://jira.acumos.org/browse/ACUMOS-3484>`_)
index 10fe5e9..e4c71c3 100644 (file)
@@ -27,7 +27,7 @@
        </parent>
        <groupId>org.acumos.federation</groupId>
        <artifactId>gateway</artifactId>
-       <version>3.0.1-SNAPSHOT</version>
+       <version>3.0.2-SNAPSHOT</version>
        <name>Federation Gateway</name>
        <description>Federated Acumos Interface for inter-acumos communication</description>
        <properties>
                <dependency>
                        <groupId>org.acumos.security-verification</groupId>
                        <artifactId>security-verification-client</artifactId>
-                       <version>0.0.24</version>
+                       <version>1.2.0</version>
                </dependency>
                <dependency>
                        <groupId>org.acumos.license-manager</groupId>
                        <artifactId>license-manager-client-library</artifactId>
-                       <version>1.0.0</version>
+                       <version>1.4.1</version>
                </dependency>
                <!-- Compile time only dependencies -->
                <dependency>
index 249ee45..087e165 100644 (file)
@@ -99,8 +99,10 @@ public class ContentServiceImpl implements ContentService {
                                throw new BadRequestException(400, "Could not find loaded docker image for " + artifact);
                        }
                        String name = artifact.getDescription().substring(0, artifact.getDescription().lastIndexOf(':'));
-                       docker.tagImageCmd(image.getId(), name, artifact.getVersion()).exec();
-                       docker.removeImageCmd(tag).withForce(true).exec();
+                       if (!artifact.getDescription().equals(tag)) {
+                               docker.tagImageCmd(image.getId(), name, artifact.getVersion()).exec();
+                               docker.removeImageCmd(tag).withForce(true).exec();
+                       }
                        try (PushImageResultCallback result = new PushImageResultCallback()) {
                                AuthConfig auth = (new AuthConfig())
                                    .withUsername(dockerConfig.getRegistryUsername())