From b68047dc8a107b1b0c165bea93963c46345383d9 Mon Sep 17 00:00:00 2001 From: fedy95 Date: Tue, 9 Mar 2021 20:46:27 +0300 Subject: [PATCH] test --- .drone.yml | 14 ++++++-------- Makefile | 5 +++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.drone.yml b/.drone.yml index b88fe6e..3ee0619 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,14 +18,12 @@ steps: - apk add --no-cache make - docker login "$REGISTRY" -u"$REGISTRY_USERNAME" -p"$REGISTRY_PASSWORD" - docker pull "$REGISTRY"/"$YAMLLINT_TAG" - - echo "$REGISTRY" - - echo "$YAMLLINT_TAG" - - ls -lah - - echo `pwd` - - echo "$REGISTRY"/"$YAMLLINT_TAG" - - docker run --rm -v `pwd`:/data "$REGISTRY"/"$YAMLLINT_TAG" . && ls -lah - - docker run --rm -v `pwd`:/data "$REGISTRY"/"$YAMLLINT_TAG" . - - docker run --rm -v `pwd`:/data "$REGISTRY"/"$YAMLLINT_TAG" /data +# - echo "$REGISTRY" +# - echo "$YAMLLINT_TAG" +# - ls -lah +# - echo `pwd` +# - echo "$REGISTRY"/"$YAMLLINT_TAG" +# - docker run --rm $$(tty -s && echo "-it" || echo) -v `pwd`:/data "$REGISTRY"/"$YAMLLINT_TAG" . - make validate - docker logout "$REGISTRY" when: diff --git a/Makefile b/Makefile index 5caf3c0..4c19bc3 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,9 @@ YAMLLINT_TAG=baseimage-yamllint:latest validate: docker pull "${REGISTRY}"/"${YAMLLINT_TAG}" - docker run --rm -v "`pwd`:/data" "${REGISTRY}"/"${YAMLLINT_TAG}" /data && ls -lah - + docker run --rm $$(tty -s && echo "-it" || echo) -v `pwd`:/data "${REGISTRY}"/"${YAMLLINT_TAG}" . + #docker run --rm -v "`pwd`:/data" "${REGISTRY}"/"${YAMLLINT_TAG}" /data && ls -lah +# restart: docker-compose -f docker-compose.yml down docker-compose -f docker-compose.yml up -d