Merge pull request #59 from devatherock/58-one-image

chore: Stopped publishing vela-yaml-validator image
devatherock · Oct 29, 2021 · 0a4d675 · 0a4d675
2 parents dacb246 + 79e46f2
commit 0a4d675
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 22 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,7 +7,7 @@ slack_image: &slack_image
 
 yaml_validator_image: &yaml_validator_image
   docker:
-    - image: devatherock/vela-yaml-validator:latest
+    - image: devatherock/drone-yaml-validator:latest
       auth:
         username: $DOCKER_USERNAME
         password: $DOCKER_PASSWORD
@@ -131,12 +131,8 @@ jobs:
           docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
           docker build -t devatherock/drone-yaml-validator:$TAG .
           docker tag devatherock/drone-yaml-validator:$TAG devatherock/drone-yaml-validator:latest
-          docker tag devatherock/drone-yaml-validator:$TAG devatherock/vela-yaml-validator:$TAG
-          docker tag devatherock/drone-yaml-validator:$TAG devatherock/vela-yaml-validator:latest
           docker push devatherock/drone-yaml-validator:$TAG
           docker push devatherock/drone-yaml-validator:latest
-          docker push devatherock/vela-yaml-validator:$TAG
-          docker push devatherock/vela-yaml-validator:latest
 
   test_docker:
     <<: *yaml_validator_image
@@ -209,9 +205,7 @@ jobs:
           docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
           docker pull devatherock/drone-yaml-validator:$DEV_TAG
           docker tag devatherock/drone-yaml-validator:$DEV_TAG devatherock/drone-yaml-validator:$TAG
-          docker tag devatherock/drone-yaml-validator:$TAG devatherock/vela-yaml-validator:$TAG
           docker push devatherock/drone-yaml-validator:$TAG
-          docker push devatherock/vela-yaml-validator:$TAG
 
   notify_success:
     <<: *slack_image

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,9 @@
 ### Changed
 - chore(deps): update dependency org.codehaus.groovy:groovy to v2.5.15
 
+### Removed
+- [#58](https://github.com/devatherock/drone-yaml-validator/issues/58): `vela-yaml-validator` publish, so that one image `drone-yaml-validator`, that supports both vela and drone, can be used
+
 ## [1.5.0] - 2021-01-25
 ### Added
 - [#28](https://github.com/devatherock/drone-yaml-validator/issues/28): Flag to treat YAML files with duplicate keys as valid.

diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 [![CircleCI](https://circleci.com/gh/devatherock/drone-yaml-validator.svg?style=svg)](https://circleci.com/gh/devatherock/drone-yaml-validator)
-[![Version](https://img.shields.io/docker/v/devatherock/vela-yaml-validator?sort=semver)](https://hub.docker.com/r/devatherock/vela-yaml-validator/)
+[![Version](https://img.shields.io/docker/v/devatherock/drone-yaml-validator?sort=semver)](https://hub.docker.com/r/devatherock/drone-yaml-validator/)
 [![Coverage Status](https://coveralls.io/repos/github/devatherock/drone-yaml-validator/badge.svg?branch=master)](https://coveralls.io/github/devatherock/drone-yaml-validator?branch=master)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/eee25e47d4104a20894d2a0f8f35d2fd)](https://www.codacy.com/gh/devatherock/drone-yaml-validator/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=devatherock/drone-yaml-validator&amp;utm_campaign=Badge_Grade)
 [![Docker Pulls - Drone](https://img.shields.io/docker/pulls/devatherock/drone-yaml-validator.svg)](https://hub.docker.com/r/devatherock/drone-yaml-validator/)
-[![Docker Image Size](https://img.shields.io/docker/image-size/devatherock/vela-yaml-validator.svg?sort=date)](https://hub.docker.com/r/devatherock/vela-yaml-validator/)
+[![Docker Image Size](https://img.shields.io/docker/image-size/devatherock/drone-yaml-validator.svg?sort=date)](https://hub.docker.com/r/devatherock/drone-yaml-validator/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 # yaml-validator
 CI plugin to validate yaml files
@@ -40,7 +40,7 @@ steps:
     ruleset:
       branch: master
       event: push
-    image: devatherock/vela-yaml-validator:1.5.0
+    image: devatherock/drone-yaml-validator:1.5.0
     parameters:
       debug: false
       continue_on_error: true
@@ -66,7 +66,7 @@ version: 2.1
 jobs:
   validate_yamls:
     docker:
-      - image: devatherock/vela-yaml-validator:1.5.0
+      - image: devatherock/drone-yaml-validator:1.5.0
     working_directory: ~/my-repo
     environment:
       PARAMETER_DEBUG: false

diff --git a/src/test/groovy/io/github/devatherock/yamlvalidator/docker/YamlValidatorDockerSpec.groovy b/src/test/groovy/io/github/devatherock/yamlvalidator/docker/YamlValidatorDockerSpec.groovy
@@ -14,19 +14,19 @@ class YamlValidatorDockerSpec extends Specification {
     @Shared
     def config = [
             'drone': [
-                    'image'    : 'devatherock/drone-yaml-validator:latest',
                     'envPrefix': 'PLUGIN_'
             ],
             'vela' : [
-                    'image'    : 'devatherock/vela-yaml-validator:latest',
                     'envPrefix': 'PARAMETER_'
             ]
     ]
 
+    @Shared
+    String dockerImage = 'devatherock/drone-yaml-validator:latest'
+
     def setupSpec() {
         System.setProperty('java.util.logging.SimpleFormatter.format', '%5$s%n')
-        executeCommand("docker pull ${config['drone'].image}")
-        executeCommand("docker pull ${config['vela'].image}")
+        executeCommand("docker pull ${dockerImage}")
     }
 
     @Unroll
@@ -37,7 +37,7 @@ class YamlValidatorDockerSpec extends Specification {
                                      '-w=/work',
                                      '-e', "${config[ci].envPrefix}DEBUG=${debugEnabled}",
                                      '-e', "${config[ci].envPrefix}SEARCH_PATH=/work/src/test/resources/data/${folderName}",
-                                     config[ci].image])
+                                     dockerImage])
 
         then:
         output[0] == expectedExitCode
@@ -89,7 +89,7 @@ class YamlValidatorDockerSpec extends Specification {
                                      '-v', "${System.properties['user.dir']}/src/test/resources/data:/work",
                                      '-w=/work',
                                      '-e', "${config[ci].envPrefix}CONTINUE_ON_ERROR=${continueOnError}",
-                                     config[ci].image])
+                                     dockerImage])
 
         then:
         output[0] == 1
@@ -117,7 +117,7 @@ class YamlValidatorDockerSpec extends Specification {
                                      '-v', "${System.properties['user.dir']}/src/test/resources/data/duplicate:/work",
                                      '-w=/work',
                                      '-e', "${config[ci].envPrefix}ALLOW_DUPLICATE_KEYS=${allowDuplicateKeys}",
-                                     config[ci].image])
+                                     dockerImage])
 
         then:
         output[0] == expectedExitCode

diff --git a/src/test/resources/data/invalid2/anchor.yml b/src/test/resources/data/invalid2/anchor.yml
@@ -32,7 +32,7 @@ jobs:
           at: ~/drone-yaml-validator
       - run: |
           TAG=1.0.1
-          docker build -t devatherock/drone-yaml-validator:$TAG -t devatherock/vela-yaml-validator:$TAG .
+          docker build -t devatherock/drone-yaml-validator:$TAG -t devatherock/drone-yaml-validator:latest .
           docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
           docker push devatherock/drone-yaml-validator:$TAG
-          docker push devatherock/vela-yaml-validator:$TAG
+          docker push devatherock/drone-yaml-validator:latest
diff --git a/src/test/resources/data/valid/config.yml b/src/test/resources/data/valid/config.yml
@@ -36,10 +36,10 @@ jobs:
           at: ~/drone-yaml-validator
       - run: |
           TAG=1.0.1
-          docker build -t devatherock/drone-yaml-validator:$TAG -t devatherock/vela-yaml-validator:$TAG .
+          docker build -t devatherock/drone-yaml-validator:$TAG -t devatherock/drone-yaml-validator:latest .
           docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
           docker push devatherock/drone-yaml-validator:$TAG
-          docker push devatherock/vela-yaml-validator:$TAG
+          docker push devatherock/drone-yaml-validator:latest
 
 workflows:
   version: 2