diff --git a/.drone.yml b/.drone.yml index 562db74..a6d7ea4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,6 +9,7 @@ steps: path: /var/run/docker.sock environment: REGISTRY: registry.fedy95.com + YAMLLINT_TAG: baseimage-yamllint:latest REGISTRY_USERNAME: from_secret: REGISTRY_USERNAME REGISTRY_PASSWORD: @@ -16,8 +17,9 @@ steps: commands: - apk add --no-cache make - docker login "$REGISTRY" -u"$REGISTRY_USERNAME" -p"$REGISTRY_PASSWORD" - - make validate - - + - docker pull "$REGISTRY"/"$YAMLLINT_TAG" + - echo ${PWD} + - docker run --rm -v ${PWD}:/data "$REGISTRY"/"$YAMLLINT_TAG" . - docker logout "$REGISTRY" when: event: pull_request @@ -55,3 +57,4 @@ trigger: - master event: - push +... diff --git a/Makefile b/Makefile index ea54796..18553fd 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,6 @@ YAMLLINT_TAG=baseimage-yamllint:latest validate: docker pull "${REGISTRY}"/"${YAMLLINT_TAG}" docker run --rm -v $(PWD):/data "${REGISTRY}"/"${YAMLLINT_TAG}" . - wait 5 restart: docker-compose -f docker-compose.yml down