Merge pull request #9 from SmartColumbusOS/fix-image-tag

Fix string interpolation
UrbanOS-Examples · Oct 22, 2019 · 79bf7f5 · 79bf7f5
2 parents a1de4fc + e12e048
commit 79bf7f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -25,11 +25,7 @@ node ('infrastructure') {
 
 
         doStageIfDeployingToDev('Deploy to Dev') {
-            deployTo(environment: 'dev', extraArgs: '--set image.tag=${env.DEV_IMAGE_TAG} --set image.pullPolicy=Always --recreate-pods')
-        }
-
-        doStageIfMergedToMaster('Process Dev job') {
-            scos.devDeployTrigger("joomla-docker")
+            deployTo(environment: 'dev', extraArgs: "--set image.tag=${env.DEV_IMAGE_TAG} --set image.pullPolicy=Always --recreate-pods")
         }
 
         doStageIfMergedToMaster('Deploy to Staging')  {
@@ -75,4 +71,4 @@ def deployTo(params = [:]) {
                 ${extraArgs}
         """.trim())
     }
-}
+}
diff --git a/joomla.yaml b/joomla.yaml
@@ -1,2 +1,2 @@
 image:
-  tag: 1.1.1
+  tag: 1.1.2