diff --git a/.drone.yml b/.drone.yml index ee7f005..fec9590 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,19 +10,20 @@ steps: - name: dockersock path: /var/run/docker.sock settings: - repo: baseimage/yamlint + repo: baseimage/yamllint tags: - ${DRONE_TAG} environment: - DOCKER_USERNAME: - from_secret: DOCKER_USERNAME - DOCKER_PASSWORD: - from_secret: DOCKER_PASSWORD + REGISTRY: registry.fedy95.com + REGISTRY_USERNAME: + from_secret: REGISTRY_USERNAME + REGISTRY_PASSWORD: + from_secret: REGISTRY_PASSWORD commands: - - docker build -t registry.fedy95.com/baseimage-yamllint:"$DRONE_TAG" image -f image/Dockerfile - - docker login registry.fedy95.com -u"$DOCKER_USERNAME" -p"$DOCKER_PASSWORD" - - docker push registry.fedy95.com/baseimage-yamllint:"$DRONE_TAG" - - docker logout registry.fedy95.com + - docker build -t "$REGISTRY"/baseimage-yamllint:"$DRONE_TAG" image -f image/Dockerfile + - docker login "$REGISTRY" -u"$REGISTRY_USERNAME" -p"$REGISTRY_PASSWORD" + - docker push "$REGISTRY"/baseimage-yamllint:"$DRONE_TAG" + - docker logout "$REGISTRY" when: event: tag @@ -30,3 +31,4 @@ volumes: - name: dockersock host: path: /var/run/docker.sock +... diff --git a/.editorconfig b/.editorconfig index 6d42378..37d1263 100644 --- a/.editorconfig +++ b/.editorconfig @@ -4,9 +4,8 @@ root = true charset = utf-8 end_of_line = lf indent_style = space -indent_size = 4 +indent_size = 2 trim_trailing_whitespace = true insert_final_newline = true +max_line_length = 100 -[.drone.yml] -indent_size = 2 diff --git a/image/relaxed.yaml b/image/relaxed.yaml index 4da784b..4e635a9 100644 --- a/image/relaxed.yaml +++ b/image/relaxed.yaml @@ -2,9 +2,21 @@ extends: default rules: - braces: - min-spaces-inside: 0 - max-spaces-inside: -1 - line-length: - max: 120 - level: warning + braces: + min-spaces-inside: 0 + max-spaces-inside: -1 + brackets: + min-spaces-inside: 0 + max-spaces-inside: -1 + min-spaces-inside-empty: 1 + max-spaces-inside-empty: 1 + line-length: + max: 100 + level: warning + document-end: + present: true + document-start: + present: true + new-lines: + type: unix +...