Skip to content

Commit

Permalink
Merge pull request fabric8io#691 from rawlingsj/master
Browse files Browse the repository at this point in the history
PR merged! Thanks!
  • Loading branch information
fusesource-ci authored Dec 15, 2016
2 parents 4f48b8a + b24a8d5 commit 64fd85b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion configmapcontroller/src/main/fabric8/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ spec:
spec:
containers:
- name: configmapcontroller
image: fabric8/configmapcontroller:${project.version}
image: fabric8/configmapcontroller:${configmapcontroller.version}
env:
- name: "KUBERNETES_NAMESPACE"
valueFrom:
Expand Down
2 changes: 1 addition & 1 deletion exposecontroller/src/main/fabric8/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
spec:
containers:
- name: exposecontroller
image: fabric8/exposecontroller:${project.version}
image: fabric8/exposecontroller:${exposecontroller.version}
env:
- name: "KUBERNETES_NAMESPACE"
valueFrom:
Expand Down
3 changes: 3 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.maven-bundle-plugin>2.3.7</version.maven-bundle-plugin>
<version.compiler.plugin>2.3.1</version.compiler.plugin>

<configmapcontroller.version>2.3.1</configmapcontroller.version>
<exposecontroller.version>2.3.1</exposecontroller.version>
</properties>

<distributionManagement>
Expand Down
2 changes: 1 addition & 1 deletion release.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ def imagesBuiltByPipeline() {
}

def externalImages(){
return ['configmapcontroller','exposecontroller','nginx-controller','alpine-caddy','hubot-irc','eclipse-orion','nexus','gerrit','fabric8-kiwiirc','brackets','jenkins-jnlp-client','taiga-front','taiga-back','hubot-slack','lets-chat','jenkins-docker','maven-builder','gogs','grafana']
return ['nginx-controller','alpine-caddy','hubot-irc','eclipse-orion','nexus','gerrit','fabric8-kiwiirc','brackets','jenkins-jnlp-client','taiga-front','taiga-back','hubot-slack','lets-chat','jenkins-docker','maven-builder','gogs','grafana']
}

def repo(){
Expand Down

0 comments on commit 64fd85b

Please sign in to comment.