[SKIP CI] fix versionning
All checks were successful
continuous-integration/drone/tag Build is passing

This commit is contained in:
Robert Kaussow 2020-02-20 18:23:49 +01:00
parent ae018484a7
commit 53e998863a
2 changed files with 7 additions and 0 deletions

View File

@ -15,6 +15,9 @@ local PipelineBuild(arch='amd64') = {
repo: 'xoxys/molecule', repo: 'xoxys/molecule',
username: { from_secret: 'docker_username' }, username: { from_secret: 'docker_username' },
password: { from_secret: 'docker_password' }, password: { from_secret: 'docker_password' },
build_args: {
MOLECULE_VERSION: "${DRONE_TAG%-*}",
},
}, },
when: { when: {
ref: [ ref: [
@ -32,6 +35,9 @@ local PipelineBuild(arch='amd64') = {
repo: 'xoxys/molecule', repo: 'xoxys/molecule',
username: { from_secret: 'docker_username' }, username: { from_secret: 'docker_username' },
password: { from_secret: 'docker_password' }, password: { from_secret: 'docker_password' },
build_args: {
MOLECULE_VERSION: "${DRONE_TAG%-*}",
},
}, },
when: { when: {
ref: [ ref: [

View File

@ -24,6 +24,7 @@ RUN apk add --update --no-cache --virtual .build-deps gcc make libffi-dev musl-d
pip install -qq --upgrade --no-cache-dir pip setuptools requests~=2.22.0 && \ pip install -qq --upgrade --no-cache-dir pip setuptools requests~=2.22.0 && \
pip install -qq --no-cache-dir ansible~="$ANSIBLE_VERSION" && \ pip install -qq --no-cache-dir ansible~="$ANSIBLE_VERSION" && \
echo "Installing requirements ..." && \ echo "Installing requirements ..." && \
MOLECULE_VERSION="${MOLECULE_VERSION#v}" && \
MOLECULE_MAJOR="${MOLECULE_VERSION%%.*}" && \ MOLECULE_MAJOR="${MOLECULE_VERSION%%.*}" && \
pip install -qq --no-cache-dir -r /root/requirements.txt && \ pip install -qq --no-cache-dir -r /root/requirements.txt && \
if [ -z "${MOLECULE_MAJOR//[0-9]}" ] && [ -n "$MOLECULE_MAJOR" ]; then \ if [ -z "${MOLECULE_MAJOR//[0-9]}" ] && [ -n "$MOLECULE_MAJOR" ]; then \