From aa77b4d263e111b0fb54f1f0fb1572cf7448f95a Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Thu, 20 Feb 2020 21:12:11 +0100 Subject: [PATCH] [SKIP CI] debug --- .drone.jsonnet | 12 ++++++------ .drone.yml | 6 +++--- Dockerfile | 29 +++++++++++++++-------------- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index bf3ccd1..e8268a8 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -15,9 +15,9 @@ local PipelineBuild(arch='amd64') = { repo: 'xoxys/molecule', username: { from_secret: 'docker_username' }, password: { from_secret: 'docker_password' }, - build_args: { - MOLECULE_VERSION: '${DRONE_TAG%-*}', - }, + build_args: [ + 'MOLECULE_VERSION=${DRONE_TAG%-*}', + ], }, when: { ref: [ @@ -35,9 +35,9 @@ local PipelineBuild(arch='amd64') = { repo: 'xoxys/molecule', username: { from_secret: 'docker_username' }, password: { from_secret: 'docker_password' }, - build_args: { - MOLECULE_VERSION: '${DRONE_TAG%-*}', - }, + build_args: [ + 'MOLECULE_VERSION=${DRONE_TAG%-*}', + ], }, when: { ref: [ diff --git a/.drone.yml b/.drone.yml index d3c3628..817f597 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,7 +11,7 @@ steps: image: plugins/docker settings: build_args: - MOLECULE_VERSION: ${DRONE_TAG%-*} + - MOLECULE_VERSION=${DRONE_TAG%-*} dockerfile: Dockerfile dry_run: true password: @@ -29,7 +29,7 @@ steps: auto_tag: true auto_tag_suffix: amd64 build_args: - MOLECULE_VERSION: ${DRONE_TAG%-*} + - MOLECULE_VERSION=${DRONE_TAG%-*} dockerfile: Dockerfile password: from_secret: docker_password @@ -124,6 +124,6 @@ depends_on: --- kind: signature -hmac: fa487cfd38a0eb95fe99e8c676b90426589aff4954556d23e59be0895771bcc4 +hmac: 6a2f2a70cc4190a5b53d031261940b46d75e758c78da024c6945fe4740d70191 ... diff --git a/Dockerfile b/Dockerfile index f1f46a5..a2bb263 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,9 +16,10 @@ ENV PY_COLORS=1 \ COPY overlay/ / -RUN apk add --update --no-cache --virtual .build-deps gcc make libffi-dev musl-dev \ - openssl-dev python3-dev && \ - apk add --update --no-cache git openssh-client && \ +RUN \ + # apk add --update --no-cache --virtual .build-deps gcc make libffi-dev musl-dev \ + # openssl-dev python3-dev && \ + # apk add --update --no-cache git openssh-client && \ # Required to fix hcloud dependency: # hcloud 1.6.3 has requirement requests<2.23,>=2.20, but you'll have requests 2.23.0 # echo "Installing ansible 'v$ANSIBLE_VERSION' ..." && \ @@ -26,18 +27,18 @@ RUN apk add --update --no-cache --virtual .build-deps gcc make libffi-dev musl-d # pip install -qq --no-cache-dir ansible~="$ANSIBLE_VERSION" && \ # echo "Installing requirements ..." && \ echo "$TEST" && \ - MOLECULE_VERSION="${MOLECULE_VERSION#v}" && \ - MOLECULE_MAJOR="${MOLECULE_VERSION%%.*}" && \ + # MOLECULE_VERSION="${MOLECULE_VERSION#v}" && \ + # MOLECULE_MAJOR="${MOLECULE_VERSION%%.*}" && \ echo "$MOLECULE_VERSION" && \ - pip install -qq --no-cache-dir -r /root/requirements.txt && \ - if [ -z "${MOLECULE_MAJOR//[0-9]}" ] && [ -n "$MOLECULE_MAJOR" ]; then \ - echo "Installing molecule 'v$MOLECULE_VERSION' ..." && \ - pip install -qq --no-cache-dir molecule~="$MOLECULE_VERSION"; \ - else \ - echo "Installing latest molecule ..." && \ - pip install -qq --no-cache-dir molecule; \ - fi && \ - apk del .build-deps && \ + # pip install -qq --no-cache-dir -r /root/requirements.txt && \ + # if [ -z "${MOLECULE_MAJOR//[0-9]}" ] && [ -n "$MOLECULE_MAJOR" ]; then \ + # echo "Installing molecule 'v$MOLECULE_VERSION' ..." && \ + # pip install -qq --no-cache-dir molecule~="$MOLECULE_VERSION"; \ + # else \ + # echo "Installing latest molecule ..." && \ + # pip install -qq --no-cache-dir molecule; \ + # fi && \ + # apk del .build-deps && \ rm -rf /var/cache/apk/* && \ rm -rf /tmp/* && \ rm -rf /root/.cache/