Skip to content

Commit

Permalink
Remove anti deploy check from release
Browse files Browse the repository at this point in the history
This check is already done in travis, no need for it.
Also added QUAY vars to DAPPER_ENV so theyre passed down to the dapper
container.
  • Loading branch information
mkolesnik authored and mangelajo committed Mar 25, 2020
1 parent 8990595 commit 9021ae5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 14 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.dapper
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM quay.io/submariner/shipyard-dapper-base

ENV DAPPER_ENV=REPO DAPPER_ENV=TAG \
ENV DAPPER_ENV="REPO TAG QUAY_USERNAME QUAY_PASSWORD TRAVIS_COMMIT" \
DAPPER_SOURCE=/go/src/github.com/submariner-io/shipyard DAPPER_DOCKER_SOCKET=true
ENV DAPPER_OUTPUT=${DAPPER_SOURCE}/output

Expand Down
13 changes: 0 additions & 13 deletions scripts/release
Original file line number Diff line number Diff line change
@@ -1,22 +1,9 @@
#!/usr/bin/env bash
set -e

DEPLOY="${DEPLOY:-false}"


source ${SCRIPTS_DIR}/lib/debug_functions
source ${SCRIPTS_DIR}/lib/version


# This flag is passed from travis, so only the right jobs will deploy the
# container images to quay

if [ "$DEPLOY" != "true" ] ; then
echo "We don't need to deploy from this job, if you're trying to deploy manually set DEPLOY=true"
exit 0
fi


DOCKER_TAG=${1:-latest}
REPO=${REPO:-quay.io/submariner}

Expand Down

0 comments on commit 9021ae5

Please sign in to comment.