From fbbe450498bbcee82d717c0daddf96cf9b718b7f Mon Sep 17 00:00:00 2001 From: Magnus Walbeck Date: Sat, 23 Jan 2021 22:32:37 +0100 Subject: [PATCH 1/4] Test --- .drone.yml | 426 +++++++++++++++++++++++++++-------------------------- 1 file changed, 216 insertions(+), 210 deletions(-) diff --git a/.drone.yml b/.drone.yml index c852d11..8bc2d91 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,246 +10,252 @@ steps: dockerfile: 1.6/Dockerfile repo: mwalbeck/getgrav dry_run: true + tags: 1.6-test + + - name: test + image: mwalbeck/getgrav:1.6-test + commands: + - echo "hello" trigger: event: - pull_request ---- -kind: pipeline -type: docker -name: build_and_release_1.6 +# --- +# kind: pipeline +# type: docker +# name: build_and_release_1.6 -steps: - - name: determine tags - image: mwalbeck/determine-docker-tags - environment: - VERSION_TYPE: "docker_env" - APP_NAME: "GRAV" - DOCKERFILE_PATH: "1.6/Dockerfile" - APP_ENV: "" - CUSTOM_TAGS: "" - INCLUDE_MAJOR: "no" +# steps: +# - name: determine tags +# image: mwalbeck/determine-docker-tags +# environment: +# VERSION_TYPE: "docker_env" +# APP_NAME: "GRAV" +# DOCKERFILE_PATH: "1.6/Dockerfile" +# APP_ENV: "" +# CUSTOM_TAGS: "" +# INCLUDE_MAJOR: "no" - - name: build and publish - image: plugins/docker - settings: - dockerfile: 1.6/Dockerfile - username: - from_secret: dockerhub_username - password: - from_secret: dockerhub_password - repo: mwalbeck/getgrav +# - name: build and publish +# image: plugins/docker +# settings: +# dockerfile: 1.6/Dockerfile +# username: +# from_secret: dockerhub_username +# password: +# from_secret: dockerhub_password +# repo: mwalbeck/getgrav - - name: notify - image: plugins/matrix - settings: - homeserver: https://matrix.mwalbeck.org - roomid: - from_secret: matrix_roomid - username: - from_secret: matrix_username - password: - from_secret: matrix_password - when: - status: - - success - - failure +# - name: notify +# image: plugins/matrix +# settings: +# homeserver: https://matrix.mwalbeck.org +# roomid: +# from_secret: matrix_roomid +# username: +# from_secret: matrix_username +# password: +# from_secret: matrix_password +# when: +# status: +# - success +# - failure -trigger: - branch: - - master - event: - - push +# trigger: +# branch: +# - master +# event: +# - push ---- -kind: pipeline -type: docker -name: test_1.6-prod +# --- +# kind: pipeline +# type: docker +# name: test_1.6-prod -steps: - - name: build test - image: plugins/docker - settings: - dockerfile: 1.6/Dockerfile.prod - repo: mwalbeck/getgrav - dry_run: true +# steps: +# - name: build test +# image: plugins/docker +# settings: +# dockerfile: 1.6/Dockerfile.prod +# repo: mwalbeck/getgrav +# dry_run: true -trigger: - event: - - pull_request +# trigger: +# event: +# - pull_request ---- -kind: pipeline -type: docker -name: build_and_release_1.6-prod +# --- +# kind: pipeline +# type: docker +# name: build_and_release_1.6-prod -steps: - - name: determine tags - image: mwalbeck/determine-docker-tags - environment: - VERSION_TYPE: "docker_env" - APP_NAME: "GRAV" - DOCKERFILE_PATH: "1.6/Dockerfile.prod" - APP_ENV: "prod" - CUSTOM_TAGS: "" - INCLUDE_MAJOR: "no" +# steps: +# - name: determine tags +# image: mwalbeck/determine-docker-tags +# environment: +# VERSION_TYPE: "docker_env" +# APP_NAME: "GRAV" +# DOCKERFILE_PATH: "1.6/Dockerfile.prod" +# APP_ENV: "prod" +# CUSTOM_TAGS: "" +# INCLUDE_MAJOR: "no" - - name: build and publish - image: plugins/docker - settings: - dockerfile: 1.6/Dockerfile.prod - username: - from_secret: dockerhub_username - password: - from_secret: dockerhub_password - repo: mwalbeck/getgrav +# - name: build and publish +# image: plugins/docker +# settings: +# dockerfile: 1.6/Dockerfile.prod +# username: +# from_secret: dockerhub_username +# password: +# from_secret: dockerhub_password +# repo: mwalbeck/getgrav - - name: notify - image: plugins/matrix - settings: - homeserver: https://matrix.mwalbeck.org - roomid: - from_secret: matrix_roomid - username: - from_secret: matrix_username - password: - from_secret: matrix_password - when: - status: - - success - - failure +# - name: notify +# image: plugins/matrix +# settings: +# homeserver: https://matrix.mwalbeck.org +# roomid: +# from_secret: matrix_roomid +# username: +# from_secret: matrix_username +# password: +# from_secret: matrix_password +# when: +# status: +# - success +# - failure -trigger: - branch: - - master - event: - - push +# trigger: +# branch: +# - master +# event: +# - push ---- -kind: pipeline -type: docker -name: test_1.7 +# --- +# kind: pipeline +# type: docker +# name: test_1.7 -steps: - - name: build test - image: plugins/docker - settings: - dockerfile: 1.7/Dockerfile - repo: mwalbeck/getgrav - dry_run: true +# steps: +# - name: build test +# image: plugins/docker +# settings: +# dockerfile: 1.7/Dockerfile +# repo: mwalbeck/getgrav +# dry_run: true -trigger: - event: - - pull_request +# trigger: +# event: +# - pull_request ---- -kind: pipeline -type: docker -name: build_and_release_1.7 +# --- +# kind: pipeline +# type: docker +# name: build_and_release_1.7 -steps: - - name: determine tags - image: mwalbeck/determine-docker-tags - environment: - VERSION_TYPE: "docker_env" - APP_NAME: "GRAV" - DOCKERFILE_PATH: "1.7/Dockerfile" - APP_ENV: "" - CUSTOM_TAGS: "latest" - INCLUDE_MAJOR: "no" +# steps: +# - name: determine tags +# image: mwalbeck/determine-docker-tags +# environment: +# VERSION_TYPE: "docker_env" +# APP_NAME: "GRAV" +# DOCKERFILE_PATH: "1.7/Dockerfile" +# APP_ENV: "" +# CUSTOM_TAGS: "latest" +# INCLUDE_MAJOR: "no" - - name: build and publish - image: plugins/docker - settings: - dockerfile: 1.7/Dockerfile - username: - from_secret: dockerhub_username - password: - from_secret: dockerhub_password - repo: mwalbeck/getgrav +# - name: build and publish +# image: plugins/docker +# settings: +# dockerfile: 1.7/Dockerfile +# username: +# from_secret: dockerhub_username +# password: +# from_secret: dockerhub_password +# repo: mwalbeck/getgrav - - name: notify - image: plugins/matrix - settings: - homeserver: https://matrix.mwalbeck.org - roomid: - from_secret: matrix_roomid - username: - from_secret: matrix_username - password: - from_secret: matrix_password - when: - status: - - success - - failure +# - name: notify +# image: plugins/matrix +# settings: +# homeserver: https://matrix.mwalbeck.org +# roomid: +# from_secret: matrix_roomid +# username: +# from_secret: matrix_username +# password: +# from_secret: matrix_password +# when: +# status: +# - success +# - failure -trigger: - branch: - - master - event: - - push +# trigger: +# branch: +# - master +# event: +# - push ---- -kind: pipeline -type: docker -name: test_1.7-prod +# --- +# kind: pipeline +# type: docker +# name: test_1.7-prod -steps: - - name: build test - image: plugins/docker - settings: - dockerfile: 1.7/Dockerfile.prod - repo: mwalbeck/getgrav - dry_run: true +# steps: +# - name: build test +# image: plugins/docker +# settings: +# dockerfile: 1.7/Dockerfile.prod +# repo: mwalbeck/getgrav +# dry_run: true -trigger: - event: - - pull_request +# trigger: +# event: +# - pull_request ---- -kind: pipeline -type: docker -name: build_and_release_1.7-prod +# --- +# kind: pipeline +# type: docker +# name: build_and_release_1.7-prod -steps: - - name: determine tags - image: mwalbeck/determine-docker-tags - environment: - VERSION_TYPE: "docker_env" - APP_NAME: "GRAV" - DOCKERFILE_PATH: "1.7/Dockerfile.prod" - APP_ENV: "prod" - CUSTOM_TAGS: "latest-prod" - INCLUDE_MAJOR: "no" +# steps: +# - name: determine tags +# image: mwalbeck/determine-docker-tags +# environment: +# VERSION_TYPE: "docker_env" +# APP_NAME: "GRAV" +# DOCKERFILE_PATH: "1.7/Dockerfile.prod" +# APP_ENV: "prod" +# CUSTOM_TAGS: "latest-prod" +# INCLUDE_MAJOR: "no" - - name: build and publish - image: plugins/docker - settings: - dockerfile: 1.7/Dockerfile.prod - username: - from_secret: dockerhub_username - password: - from_secret: dockerhub_password - repo: mwalbeck/getgrav +# - name: build and publish +# image: plugins/docker +# settings: +# dockerfile: 1.7/Dockerfile.prod +# username: +# from_secret: dockerhub_username +# password: +# from_secret: dockerhub_password +# repo: mwalbeck/getgrav - - name: notify - image: plugins/matrix - settings: - homeserver: https://matrix.mwalbeck.org - roomid: - from_secret: matrix_roomid - username: - from_secret: matrix_username - password: - from_secret: matrix_password - when: - status: - - success - - failure +# - name: notify +# image: plugins/matrix +# settings: +# homeserver: https://matrix.mwalbeck.org +# roomid: +# from_secret: matrix_roomid +# username: +# from_secret: matrix_username +# password: +# from_secret: matrix_password +# when: +# status: +# - success +# - failure -trigger: - branch: - - master - event: - - push +# trigger: +# branch: +# - master +# event: +# - push -- 2.45.2 From 1adaa12b11beca37293814b48786c44ee7cf2016 Mon Sep 17 00:00:00 2001 From: Magnus Walbeck Date: Sat, 23 Jan 2021 22:49:41 +0100 Subject: [PATCH 2/4] Test2 --- .drone.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/.drone.yml b/.drone.yml index 8bc2d91..504a8cf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,6 +10,7 @@ steps: dockerfile: 1.6/Dockerfile repo: mwalbeck/getgrav dry_run: true + purge: false tags: 1.6-test - name: test @@ -21,6 +22,39 @@ trigger: event: - pull_request +# --- +# kind: pipeline +# type: docker +# name: test_1.6 + +# services: +# - name: registry +# image: registry + +# steps: +# - name: build test +# image: plugins/docker +# settings: +# dockerfile: 1.6/Dockerfile +# repo: registry:5000/mwalbeck/getgrav +# registry: registry:5000 +# tags: "1.6-test" + +# - name: test +# image: mwalbeck/getgrav:1.6-test +# commands: +# - echo "hello" + +# trigger: +# event: +# - pull_request + + + + + + + # --- # kind: pipeline # type: docker -- 2.45.2 From c4582617d687fac8bc66f598453a04230b05242e Mon Sep 17 00:00:00 2001 From: Magnus Walbeck Date: Sat, 23 Jan 2021 22:53:15 +0100 Subject: [PATCH 3/4] Test 3 --- .drone.yml | 46 ++++++++-------------------------------------- 1 file changed, 8 insertions(+), 38 deletions(-) diff --git a/.drone.yml b/.drone.yml index 504a8cf..908324c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,18 +3,21 @@ kind: pipeline type: docker name: test_1.6 +services: + - name: registry + image: registry + steps: - name: build test image: plugins/docker settings: dockerfile: 1.6/Dockerfile - repo: mwalbeck/getgrav - dry_run: true - purge: false - tags: 1.6-test + repo: registry:5000/mwalbeck/getgrav + registry: registry:5000 + tags: "1.6-test" - name: test - image: mwalbeck/getgrav:1.6-test + image: registry:5000/mwalbeck/getgrav:1.6-test commands: - echo "hello" @@ -22,39 +25,6 @@ trigger: event: - pull_request -# --- -# kind: pipeline -# type: docker -# name: test_1.6 - -# services: -# - name: registry -# image: registry - -# steps: -# - name: build test -# image: plugins/docker -# settings: -# dockerfile: 1.6/Dockerfile -# repo: registry:5000/mwalbeck/getgrav -# registry: registry:5000 -# tags: "1.6-test" - -# - name: test -# image: mwalbeck/getgrav:1.6-test -# commands: -# - echo "hello" - -# trigger: -# event: -# - pull_request - - - - - - - # --- # kind: pipeline # type: docker -- 2.45.2 From 37e4217933bc3349d076745a104503725182316c Mon Sep 17 00:00:00 2001 From: Magnus Walbeck Date: Sat, 23 Jan 2021 22:58:07 +0100 Subject: [PATCH 4/4] Test 4 --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 908324c..37c0855 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,6 +14,7 @@ steps: dockerfile: 1.6/Dockerfile repo: registry:5000/mwalbeck/getgrav registry: registry:5000 + insecure: true tags: "1.6-test" - name: test -- 2.45.2