Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Robert Verkerk
B2SAFE Core
Commits
e9dd4a3c
Commit
e9dd4a3c
authored
Mar 30, 2021
by
Stefan Wolfsheimer
Committed by
Stefan Wolfsheimer
Mar 30, 2021
Browse files
fixed: determine version name of image
parent
af2a02be
Changes
1
Hide whitespace changes
Inline
Side-by-side
ci/test.sh
View file @
e9dd4a3c
...
@@ -44,6 +44,8 @@ set -x
...
@@ -44,6 +44,8 @@ set -x
set
-e
set
-e
export
VERSION
=
$_VERSION
export
VERSION
=
$_VERSION
source
$(
cd
`
dirname
"
${
BASH_SOURCE
[0]
}
"
`
&&
pwd
)
/version.sh
IMAGE_NAME_VERSION
=
`
image_name
$VERSION
`
cleanup
()
{
cleanup
()
{
exit_code
=
$?
exit_code
=
$?
...
@@ -65,13 +67,18 @@ then
...
@@ -65,13 +67,18 @@ then
trap
cleanup EXIT ERR INT TERM
trap
cleanup EXIT ERR INT TERM
fi
fi
if
[
-z
"
$
{
GIT_BRANCH
}
"
]
if
[
-z
"
$
CI_COMMIT_TAG
"
]
then
then
GIT_BRANCH
=
${
CI_COMMIT_REF_NAME
}
if
[
-z
"
${
GIT_BRANCH
}
"
]
then
GIT_BRANCH
=
${
CI_COMMIT_REF_NAME
}
fi
else
GIT_BRANCH
=
release
fi
fi
export
DOCKER_IMAGE
=
b2safe_
${
GIT_BRANCH
}
_
${
VERSION
}
:latest
export
DOCKER_IMAGE
=
${
IMAGE_NAME_
VERSION
}
IMAGE_NAME
=
${
REGISTRY
}
/
${
DOCKER_IMAGE
}
IMAGE_NAME
=
${
REGISTRY
}
/
${
IMAGE_NAME_VERSION
}
if
[
-z
"
${
SECRET_DIR
}
"
]
if
[
-z
"
${
SECRET_DIR
}
"
]
then
then
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment