From 221e4492b59f09cf2f10ca793dfee009d270e048 Mon Sep 17 00:00:00 2001 From: David Ashby Date: Wed, 20 Apr 2022 20:20:00 -0400 Subject: [PATCH 01/11] test local routing options --- .woodpecker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index b834999..298c4c3 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -12,6 +12,8 @@ - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD registry.yetaga.in - docker build -t registry.yetaga.in/library:latest . - docker push registry.yetaga.in/library:latest + - "curl http://yetagain:4000/api/ps -H 'Authorization: Bearer ${COMPOSE_TOKEN}' || true" + - "curl http://localhost:4000/api/ps -H 'Authorization: Bearer ${COMPOSE_TOKEN}' || true" secrets: [docker_username, docker_password] when: branch: "master" -- 2.40.1 From b3be76d4780386a6629eb8846e52922eaafaf2fd Mon Sep 17 00:00:00 2001 From: David Ashby Date: Wed, 20 Apr 2022 20:21:09 -0400 Subject: [PATCH 02/11] hmm --- .woodpecker.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 298c4c3..fe46059 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -12,11 +12,17 @@ - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD registry.yetaga.in - docker build -t registry.yetaga.in/library:latest . - docker push registry.yetaga.in/library:latest - - "curl http://yetagain:4000/api/ps -H 'Authorization: Bearer ${COMPOSE_TOKEN}' || true" - - "curl http://localhost:4000/api/ps -H 'Authorization: Bearer ${COMPOSE_TOKEN}' || true" secrets: [docker_username, docker_password] when: branch: "master" + routing: + image: docker + commands: + - "curl http://yetagain:4000/api/ps -H 'Authorization: Bearer ${COMPOSE_TOKEN}' || true" + - "curl http://localhost:4000/api/ps -H 'Authorization: Bearer ${COMPOSE_TOKEN}' || true" + secrets: [COMPOSE_TOKEN] + when: + branch: "test-woodpecker" services: docker: -- 2.40.1 From 1e31fc51ceacce0238f00ac67c8373cfdc56d192 Mon Sep 17 00:00:00 2001 From: David Ashby Date: Wed, 20 Apr 2022 20:22:20 -0400 Subject: [PATCH 03/11] curl --- .woodpecker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index fe46059..cc4ce76 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -16,8 +16,9 @@ when: branch: "master" routing: - image: docker + image: alpine commands: + - apk add curl - "curl http://yetagain:4000/api/ps -H 'Authorization: Bearer ${COMPOSE_TOKEN}' || true" - "curl http://localhost:4000/api/ps -H 'Authorization: Bearer ${COMPOSE_TOKEN}' || true" secrets: [COMPOSE_TOKEN] -- 2.40.1 From 9de327af59d6671ef2a4385c67a2c7d50f4e3f29 Mon Sep 17 00:00:00 2001 From: David Ashby Date: Wed, 20 Apr 2022 20:23:51 -0400 Subject: [PATCH 04/11] this probably won't work --- .woodpecker.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index cc4ce76..3dde4d4 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -19,8 +19,7 @@ image: alpine commands: - apk add curl - - "curl http://yetagain:4000/api/ps -H 'Authorization: Bearer ${COMPOSE_TOKEN}' || true" - - "curl http://localhost:4000/api/ps -H 'Authorization: Bearer ${COMPOSE_TOKEN}' || true" + - "curl http://yetaga.in:4000/api/ps -H 'Authorization: Bearer ${COMPOSE_TOKEN}' || true" secrets: [COMPOSE_TOKEN] when: branch: "test-woodpecker" -- 2.40.1 From 77d784a1c5eb4c6c60397e4ea163ee3e4cc380b3 Mon Sep 17 00:00:00 2001 From: David Ashby Date: Wed, 20 Apr 2022 20:25:40 -0400 Subject: [PATCH 05/11] make sure secret works --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 3dde4d4..fa74111 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -20,7 +20,7 @@ commands: - apk add curl - "curl http://yetaga.in:4000/api/ps -H 'Authorization: Bearer ${COMPOSE_TOKEN}' || true" - secrets: [COMPOSE_TOKEN] + secrets: [compose_token] when: branch: "test-woodpecker" -- 2.40.1 From da7d882737332db454ef3623d1d155301fe3d55d Mon Sep 17 00:00:00 2001 From: David Ashby Date: Wed, 20 Apr 2022 20:27:25 -0400 Subject: [PATCH 06/11] odd --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index fa74111..df23e5d 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -19,7 +19,7 @@ image: alpine commands: - apk add curl - - "curl http://yetaga.in:4000/api/ps -H 'Authorization: Bearer ${COMPOSE_TOKEN}' || true" + - "curl http://yetaga.in:4000/api/ps -H 'Authorization: Bearer $COMPOSE_TOKEN' || true" secrets: [compose_token] when: branch: "test-woodpecker" -- 2.40.1 From 4f065def2c2bf299dadbbbe0f04374b7ef9d2f1a Mon Sep 17 00:00:00 2001 From: David Ashby Date: Wed, 20 Apr 2022 20:30:36 -0400 Subject: [PATCH 07/11] more testing --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index df23e5d..c4e1a96 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -19,7 +19,7 @@ image: alpine commands: - apk add curl - - "curl http://yetaga.in:4000/api/ps -H 'Authorization: Bearer $COMPOSE_TOKEN' || true" + - curl http://yetagain:4000/api/ps -H "Authorization: Bearer $COMPOSE_TOKEN" || true secrets: [compose_token] when: branch: "test-woodpecker" -- 2.40.1 From 8557cd1d786021da813b777a92680f75b2bcb2f2 Mon Sep 17 00:00:00 2001 From: David Ashby Date: Wed, 20 Apr 2022 20:39:07 -0400 Subject: [PATCH 08/11] host IP --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index c4e1a96..d4ab01f 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -19,7 +19,7 @@ image: alpine commands: - apk add curl - - curl http://yetagain:4000/api/ps -H "Authorization: Bearer $COMPOSE_TOKEN" || true + - "curl http://172.17.0.1:4000/api/ps -H "Authorization: Bearer $COMPOSE_TOKEN" || true" secrets: [compose_token] when: branch: "test-woodpecker" -- 2.40.1 From 5f05eec203aad445bdfbb743973f2d901c1abd10 Mon Sep 17 00:00:00 2001 From: David Ashby Date: Wed, 20 Apr 2022 20:40:57 -0400 Subject: [PATCH 09/11] escaping is hard --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index d4ab01f..a5d3ae0 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -19,7 +19,7 @@ image: alpine commands: - apk add curl - - "curl http://172.17.0.1:4000/api/ps -H "Authorization: Bearer $COMPOSE_TOKEN" || true" + - "curl http://172.17.0.1:4000/api/ps -H 'Authorization: Bearer $COMPOSE_TOKEN' || true" secrets: [compose_token] when: branch: "test-woodpecker" -- 2.40.1 From 4dff6ee2dfca7552aa4df3fd635925845c82dfbe Mon Sep 17 00:00:00 2001 From: David Ashby Date: Wed, 20 Apr 2022 20:42:17 -0400 Subject: [PATCH 10/11] more escaping --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index a5d3ae0..a347c76 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -19,7 +19,7 @@ image: alpine commands: - apk add curl - - "curl http://172.17.0.1:4000/api/ps -H 'Authorization: Bearer $COMPOSE_TOKEN' || true" + - 'curl http://172.17.0.1:4000/api/ps -H "Authorization: Bearer $COMPOSE_TOKEN"' secrets: [compose_token] when: branch: "test-woodpecker" -- 2.40.1 From 6a7eff3fd756d66884d2ba85dfe92c9db7dbe21e Mon Sep 17 00:00:00 2001 From: David Ashby Date: Wed, 20 Apr 2022 20:44:26 -0400 Subject: [PATCH 11/11] add deployment --- .woodpecker.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index a347c76..9e1f7ba 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -8,21 +8,16 @@ environment: - DOCKER_HOST=tcp://docker:2375 commands: + - apk add curl - sleep 5 # wait for docker service to come up - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD registry.yetaga.in - docker build -t registry.yetaga.in/library:latest . - docker push registry.yetaga.in/library:latest + - 'curl http://172.17.0.1:4000/api/fetch -H "Authorization: Bearer $COMPOSE_TOKEN"' + - 'curl http://172.17.0.1:4000/api/update -H "Authorization: Bearer $COMPOSE_TOKEN"' secrets: [docker_username, docker_password] when: branch: "master" - routing: - image: alpine - commands: - - apk add curl - - 'curl http://172.17.0.1:4000/api/ps -H "Authorization: Bearer $COMPOSE_TOKEN"' - secrets: [compose_token] - when: - branch: "test-woodpecker" services: docker: -- 2.40.1