From 66528553a377d59480f6d6df06b9b01511abe7bb Mon Sep 17 00:00:00 2001 From: surtur Date: Sun, 20 Mar 2022 20:15:28 +0100 Subject: [PATCH] fix: correctly indent and init yaml documents still some lines are over 80 characters, that needs fixing, too --- .drone.yml | 258 ++++++++++++++++++++++++------------------------- .hadolint.yaml | 1 + 2 files changed, 130 insertions(+), 129 deletions(-) diff --git a/.drone.yml b/.drone.yml index d6aaaf5..7aef7bc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,25 +11,25 @@ trigger: exclude: [push, pull_request] steps: -- name: fedora-hugo - pull: always - image: immawanderer/fedora-hugo:latest - commands: - - uname -r - - cat /etc/fedora-release + - name: fedora-hugo + pull: always + image: immawanderer/fedora-hugo:latest + commands: + - uname -r + - cat /etc/fedora-release -- name: alpine-rsync - pull: always - image: immawanderer/alpine-rsync:latest - commands: - - uname -r + - name: alpine-rsync + pull: always + image: immawanderer/alpine-rsync:latest + commands: + - uname -r -- name: hadolint - pull: always - image: hadolint/hadolint:2.9.1-alpine - commands: - - uname -r - - hadolint --version + - name: hadolint + pull: always + image: hadolint/hadolint:2.9.1-alpine + commands: + - uname -r + - hadolint --version --- kind: pipeline @@ -45,17 +45,17 @@ trigger: event: pull_request depends_on: -- pull + - pull steps: -- name: hugo-extended - pull: if-not-exists - image: immawanderer/fedora-hugo:latest - commands: - - git submodule init - - git submodule update - - hugo version - - hugo --gc=true --minify + - name: hugo-extended + pull: if-not-exists + image: immawanderer/fedora-hugo:latest + commands: + - git submodule init + - git submodule update + - hugo version + - hugo --gc=true --minify --- kind: pipeline @@ -71,31 +71,31 @@ trigger: event: pull_request depends_on: -- build + - build steps: -- name: hadolint - image: hadolint/hadolint:v2.9.1-alpine - commands: - - hadolint --version - - hadolint Dockerfile + - name: hadolint + image: hadolint/hadolint:v2.9.1-alpine + commands: + - hadolint --version + - hadolint Dockerfile -- name: build - pull: always - image: tmaier/docker-compose:latest - volumes: - - name: s - path: /var/run/docker.sock - environment: - COMPOSE_DOCKER_CLI_BUILD: 1 - DOCKER_BUILDKIT: 1 - commands: - - docker-compose build --no-cache --pull + - name: build + pull: always + image: tmaier/docker-compose:latest + volumes: + - name: s + path: /var/run/docker.sock + environment: + COMPOSE_DOCKER_CLI_BUILD: 1 + DOCKER_BUILDKIT: 1 + commands: + - docker-compose build --no-cache --pull volumes: -- name: s - host: - path: /var/run/docker.sock + - name: s + host: + path: /var/run/docker.sock --- @@ -109,44 +109,44 @@ platform: trigger: branch: - - testing + - testing event: exclude: [pull_request, tag] depends_on: -- build + - build steps: -- name: hugo-extended - pull: if-not-exists - image: immawanderer/fedora-hugo:latest - commands: - - git submodule init - - git submodule update - - hugo version - - hugo --gc=true --minify + - name: hugo-extended + pull: if-not-exists + image: immawanderer/fedora-hugo:latest + commands: + - git submodule init + - git submodule update + - hugo version + - hugo --gc=true --minify -- name: deploy - pull: if-not-exists - image: immawanderer/alpine-rsync:latest - when: - status: - - success - branch: - - testing - depends_on: - - hugo-extended - environment: - OL: - from_secret: hugo_user - OL_P: - from_secret: hugo_passwd - OL_D: - from_secret: hugo_dir - commands: - - echo $OL_P > nupass - - export RSYNC_RSH='sshpass -f ./nupass ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' - - rsync -av --delete --chown $OL public/ $OL@dotya.ml:$OL_D + - name: deploy + pull: if-not-exists + image: immawanderer/alpine-rsync:latest + when: + status: + - success + branch: + - testing + depends_on: + - hugo-extended + environment: + OL: + from_secret: hugo_user + OL_P: + from_secret: hugo_passwd + OL_D: + from_secret: hugo_dir + commands: + - echo $OL_P > nupass + - export RSYNC_RSH='sshpass -f ./nupass ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' + - rsync -av --delete --chown $OL public/ $OL@dotya.ml:$OL_D --- @@ -160,7 +160,7 @@ platform: trigger: branch: - - master + - master event: exclude: [pull_request, tag] @@ -173,58 +173,58 @@ node: r: main depends_on: -- build + - build steps: -- name: hugo-extended - pull: if-not-exists - image: immawanderer/fedora-hugo:latest - commands: - - git submodule init - - git submodule update - - hugo version - - hugo --gc=true --minify + - name: hugo-extended + pull: if-not-exists + image: immawanderer/fedora-hugo:latest + commands: + - git submodule init + - git submodule update + - hugo version + - hugo --gc=true --minify -- name: rm-intermediate - pull: if-not-exists - image: immawanderer/fedora-hugo:latest - depends_on: - - hugo-extended - commands: - - rm -rf ./public + - name: rm-intermediate + pull: if-not-exists + image: immawanderer/fedora-hugo:latest + depends_on: + - hugo-extended + commands: + - rm -rf ./public -- name: build - pull: always - image: tmaier/docker-compose:latest - depends_on: - - rm-intermediate - volumes: - - name: s - path: /var/run/docker.sock - commands: - - docker-compose build --no-cache - when: - branch: master - status: success + - name: build + pull: always + image: tmaier/docker-compose:latest + depends_on: + - rm-intermediate + volumes: + - name: s + path: /var/run/docker.sock + commands: + - docker-compose build --no-cache + when: + branch: master + status: success -- name: deploy - pull: always - image: tmaier/docker-compose:latest - depends_on: - - build - volumes: - - name: s - path: /var/run/docker.sock - commands: - - docker-compose -p ${DRONE_REPO_NAME} up -d --remove-orphans --scale homepage=4 - when: - branch: master - status: success + - name: deploy + pull: always + image: tmaier/docker-compose:latest + depends_on: + - build + volumes: + - name: s + path: /var/run/docker.sock + commands: + - docker-compose -p ${DRONE_REPO_NAME} up -d --remove-orphans --scale homepage=4 + when: + branch: master + status: success volumes: -- name: s - host: - path: /var/run/docker.sock + - name: s + host: + path: /var/run/docker.sock --- @@ -240,14 +240,14 @@ clone: trigger: branch: - - master - - testing + - master + - testing event: - - push - - tag + - push + - tag status: - - success - - failure + - success + - failure depends_on: [deploy, deploy-staging] diff --git a/.hadolint.yaml b/.hadolint.yaml index 6ee0f37..3cc5e59 100644 --- a/.hadolint.yaml +++ b/.hadolint.yaml @@ -1 +1,2 @@ +--- ignored: