Skip to content

Commit

Permalink
Stick with DOCKER_* env variables for now
Browse files Browse the repository at this point in the history
Keep DOCKER_PREFIX and DOCKER_TAG also for bazel right now. If we change
that, let's change it for everything to CONTAINER_TAG and
CONTAINER_PREFIX.
  • Loading branch information
rmohr committed Mar 5, 2019
1 parent b2e09e8 commit dc638e4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ script:

deploy:
- provider: script
script: docker login -u="$DOCKER_USER" -p="$DOCKER_PASS" && CONTAINER_PREFIX="index.docker.io/kubevirt" CONTAINER_TAG="latest" make bazel-push-images
script: docker login -u="$DOCKER_USER" -p="$DOCKER_PASS" && DOCKER_PREFIX="index.docker.io/kubevirt" DOCKER_TAG="latest" make bazel-push-images
skip_cleanup: true
on:
branch: master
Expand All @@ -39,7 +39,7 @@ deploy:
all_branches: true
condition: $TRAVIS_BRANCH != revert-*
- provider: script
script: docker login -u="$DOCKER_USER" -p="$DOCKER_PASS" && CONTAINER_PREFIX="index.docker.io/kubevirt" CONTAINER_TAG="$TRAVIS_TAG" make bazel-push-images
script: docker login -u="$DOCKER_USER" -p="$DOCKER_PASS" && DOCKER_PREFIX="index.docker.io/kubevirt" DOCKER_TAG="$TRAVIS_TAG" make bazel-push-images
skip_cleanup: true
file:
on:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ bazel-push-images:
hack/dockerized "bazel run \
--platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 \
--workspace_status_command=./hack/print-workspace-status.sh \
--define container_prefix=${CONTAINER_PREFIX} \
--define container_tag=${CONTAINER_TAG} \
--define container_prefix=${DOCKER_PREFIX} \
--define container_tag=${DOCKER_TAG} \
//:push-images"

bazel-tests:
Expand Down
2 changes: 1 addition & 1 deletion cluster/ephemeral-provider-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function _add_common_params() {
function build() {
# Build everyting and publish it
${KUBEVIRT_PATH}hack/dockerized "DOCKER_PREFIX=${DOCKER_PREFIX} DOCKER_TAG=${DOCKER_TAG} KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER} IMAGE_PULL_POLICY=${IMAGE_PULL_POLICY} VERBOSITY=${VERBOSITY} ./hack/build-manifests.sh"
CONTAINER_PREFIX=${docker_prefix} CONTAINER_TAG=${docker_tag} make bazel-push-images
DOCKER_PREFIX=${docker_prefix} DOCKER_TAG=${docker_tag} make bazel-push-images

# Make sure that all nodes use the newest images
container=""
Expand Down

0 comments on commit dc638e4

Please sign in to comment.