From 73db4de2a7be4eea72026a30e555935e2e39d077 Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Thu, 10 Sep 2015 16:21:16 +0100 Subject: [PATCH] Update transcoder image name --- .travis.yml | 8 ++++---- executors/kubernetes/kubernetes_executor.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 20019ab..56bb289 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,10 +36,10 @@ script: after_success: - CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o plex-elastic-transcoder github.com/munnerz/plex-elastic-transcoder - docker build -t registry.marley.xyz/munnerz/elastic-plex:${TRAVIS_COMMIT:0:7} -f Dockerfile.plex . - - docker build -t registry.marley.xyz/munnerz/plex-elastic-transcoder:${TRAVIS_COMMIT:0:7} -f Dockerfile.runner . + - docker build -t registry.marley.xyz/munnerz/plex-new-transcoder:${TRAVIS_COMMIT:0:7} -f Dockerfile.runner . - docker tag -f registry.marley.xyz/munnerz/elastic-plex:latest registry.marley.xyz/munnerz/elastic-plex:${TRAVIS_COMMIT:0:7} - - docker tag -f registry.marley.xyz/munnerz/plex-elastic-transcoder:latest registry.marley.xyz/munnerz/plex-elastic-transcoder:${TRAVIS_COMMIT:0:7} + - docker tag -f registry.marley.xyz/munnerz/plex-new-transcoder:latest registry.marley.xyz/munnerz/plex-new-transcoder:${TRAVIS_COMMIT:0:7} - docker push registry.marley.xyz/munnerz/elastic-plex:latest - docker push registry.marley.xyz/munnerz/elastic-plex:${TRAVIS_COMMIT:0:7} - - docker push registry.marley.xyz/munnerz/plex-elastic-transcoder:latest - - docker push registry.marley.xyz/munnerz/plex-elastic-transcoder:${TRAVIS_COMMIT:0:7} + - docker push registry.marley.xyz/munnerz/plex-new-transcoder:latest + - docker push registry.marley.xyz/munnerz/plex-new-transcoder:${TRAVIS_COMMIT:0:7} diff --git a/executors/kubernetes/kubernetes_executor.go b/executors/kubernetes/kubernetes_executor.go index 30e5c98..5401528 100644 --- a/executors/kubernetes/kubernetes_executor.go +++ b/executors/kubernetes/kubernetes_executor.go @@ -17,7 +17,7 @@ import ( const podBasename = "plex-transcoder" const kubernetesHost = "10.20.40.254:8080" const kubernetesNamespace = "plex" -const dockerImage = "munnerz/plex-new-transcoder" +const dockerImage = "registry.marley.xyz/munnerz/plex-new-transcoder" type KubernetesExecutor struct { executors.AbstractExecutor