Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Switch to global jobs (python) - dcaegen2/services/hearbeat"
[ci-management.git]
/
jjb
/
include-docker-push.sh
diff --git
a/jjb/include-docker-push.sh
b/jjb/include-docker-push.sh
old mode 100644
(file)
new mode 100755
(executable)
index
58e0989
..
cd88f9d
--- a/
jjb/include-docker-push.sh
+++ b/
jjb/include-docker-push.sh
@@
-17,21
+17,24
@@
fi
RELEASE_VERSION_REGEX="^[0-9]+\.[0-9]+\.[0-9]+$";
RELEASE_VERSION_REGEX="^[0-9]+\.[0-9]+\.[0-9]+$";
-SNAPSHOT_TAG=${VERSION}-SNAPSHOT-${DATETIME_STAMP};
-STAGING_TAG=${VERSION}-STAGING-${DATETIME_STAMP};
+SNAPSHOT_TAG=${VERSION}-SNAPSHOT-${DATETIME_STAMP}
Z
;
+STAGING_TAG=${VERSION}-STAGING-${DATETIME_STAMP}
Z
;
# Set REPO_PATH variable
if [ ! -z "$DOCKER_IMAGE_NAME" ]; then
REPO_PATH=$DOCKER_REPOSITORY/${DOCKER_IMAGE_NAME};
# Set REPO_PATH variable
if [ ! -z "$DOCKER_IMAGE_NAME" ]; then
REPO_PATH=$DOCKER_REPOSITORY/${DOCKER_IMAGE_NAME};
+
+ # tag image with nexus3 proxy prefix
+ docker tag ${DOCKER_IMAGE_NAME} $REPO_PATH
elif [[ $PROJECT =~ $SEARCH ]] ; then
elif [[ $PROJECT =~ $SEARCH ]] ; then
- REPO_PATH=$DOCKER_REPOSITORY/o
penecom
p/ajsc-aai;
+ REPO_PATH=$DOCKER_REPOSITORY/o
na
p/ajsc-aai;
else
# Cut the prefix aai/ in example aai/model-loader
DOCKER_REPO_NAME=$(echo ${PROJECT} | cut -d"/" -f2-);
else
# Cut the prefix aai/ in example aai/model-loader
DOCKER_REPO_NAME=$(echo ${PROJECT} | cut -d"/" -f2-);
- REPO_PATH=$DOCKER_REPOSITORY/o
penecom
p/${DOCKER_REPO_NAME};
+ REPO_PATH=$DOCKER_REPOSITORY/o
na
p/${DOCKER_REPO_NAME};
fi
fi