From a8d9bb531c1cf4b783c9d11af4027a7d94814e77 Mon Sep 17 00:00:00 2001 From: fedy95 Date: Tue, 9 Mar 2021 20:07:31 +0300 Subject: [PATCH] test --- .drone.yml | 10 +++++----- Makefile | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index a6d7ea4..b3ee046 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,8 +8,8 @@ steps: - name: dockersock path: /var/run/docker.sock environment: - REGISTRY: registry.fedy95.com - YAMLLINT_TAG: baseimage-yamllint:latest +# REGISTRY: registry.fedy95.com +# YAMLLINT_TAG: baseimage-yamllint:latest REGISTRY_USERNAME: from_secret: REGISTRY_USERNAME REGISTRY_PASSWORD: @@ -17,9 +17,9 @@ steps: commands: - apk add --no-cache make - docker login "$REGISTRY" -u"$REGISTRY_USERNAME" -p"$REGISTRY_PASSWORD" - - docker pull "$REGISTRY"/"$YAMLLINT_TAG" - - echo ${PWD} - - docker run --rm -v ${PWD}:/data "$REGISTRY"/"$YAMLLINT_TAG" . +# - docker pull "$REGISTRY"/"$YAMLLINT_TAG" +# - docker run --rm -v `pwd`:/data "$REGISTRY"/"$YAMLLINT_TAG" . + - make validate - docker logout "$REGISTRY" when: event: pull_request diff --git a/Makefile b/Makefile index 18553fd..2a20da2 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ YAMLLINT_TAG=baseimage-yamllint:latest validate: docker pull "${REGISTRY}"/"${YAMLLINT_TAG}" - docker run --rm -v $(PWD):/data "${REGISTRY}"/"${YAMLLINT_TAG}" . + docker run --rm -v `pwd`:/data "${REGISTRY}"/"${YAMLLINT_TAG}" . restart: docker-compose -f docker-compose.yml down