From 82859337f5081462559cf0f5620c335ced275328 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 17 Apr 2024 09:45:03 -0400 Subject: [PATCH] Fixup --- .woodpecker.yml | 70 +------------------------------------------------ 1 file changed, 1 insertion(+), 69 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 135fb5e..12bf9f4 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,4 +1,3 @@ -# build:0 labels: hostname: "macmini7" clone: @@ -8,7 +7,6 @@ clone: partial: false depth: 1 steps: - # Build Step for staging Branch build-staging: name: build-staging image: woodpeckerci/plugin-docker-buildx @@ -18,14 +16,6 @@ steps: commands: - echo "Building application for staging branch" - echo "$${REGISTRY_PASSWORD}" | docker login -u "$${REGISTRY_USER}" --password-stdin git.nixc.us - # ################################################ - # ######### Build a remote image locally ######### - # ################################################ - # - apk add --no-cache git - # - git clone --depth 1 https://github.com/Eugeny/tabby-web.git ./docker/tabby/ - # # - cd ./docker/tabby/ - # # - docker build -t your-image-name . - # ################################################ - echo compose build - docker compose -f docker-compose.staging.yml build when: @@ -48,31 +38,6 @@ steps: - echo "$${REGISTRY_PASSWORD}" | docker login -u "$${REGISTRY_USER}" --password-stdin git.nixc.us - echo compose push - docker compose -f docker-compose.staging.yml push - - docker stack deploy --with-registry-auth -c ./stack.staging.yml $${CI_REPO_NAME}-staging - - # # Wait for Deploy to Complete - # wait-for-deploy-staging: - # name: wait-for-deploy-staging - # image: woodpeckerci/plugin-git - # commands: - # - echo "Waiting for staging deploy step to complete rollout." - # - sleep 60 - # when: - # - branch: main - # - event: push - - # # Run Automated Tests on staging Branch - # test-staging: - # name: run-tests-staging - # image: git.nixc.us/colin/playwright:latest - # secrets: [ base_url ] - # when: - # - branch: main - # - event: push - # - path: - # include: [ 'tests/', 'src/','docker-compose.staging.yml', 'docker-compose.production.yml', '*.tests.ts' ] # Specify paths relevant to tests - # volumes: - # - /var/run/docker.sock:/var/run/docker.sock:ro cleanup-staging: name: cleanup-staging @@ -85,13 +50,9 @@ steps: volumes: - /var/run/docker.sock:/var/run/docker.sock commands: - # - docker stack rm $${CI_REPO_NAME}-staging - ## added fault tolerance for docker stack rm - - for i in {1..5}; do docker stack rm ${CI_REPO_NAME}-staging && break || sleep 10; done - docker compose -f docker-compose.staging.yml down - docker compose -f docker-compose.staging.yml rm -f - # Build Step for staging Branch build-build-push-production: name: build-build-push-production image: woodpeckerci/plugin-docker-buildx @@ -110,7 +71,6 @@ steps: - path: include: [ 'stack.production.yml', 'stack.staging.yml', 'docker-compose.staging.yml', 'docker-compose.production.yml', 'Dockerfile', '*.tests.ts' ] - # Deploy to Production Branch deploy-production: name: deploy-production image: woodpeckerci/plugin-docker-buildx @@ -119,34 +79,6 @@ steps: - /var/run/docker.sock:/var/run/docker.sock commands: - echo "$${REGISTRY_PASSWORD}" | docker login -u "$${REGISTRY_USER}" --password-stdin git.nixc.us - - docker stack deploy --with-registry-auth -c ./stack.production.yml $${CI_REPO_NAME} when: - branch: production - - event: push - # - path: - # include: [ 'stack.production.yml', 'stack.staging.yml', 'docker-compose.staging.yml', 'docker-compose.production.yml', 'Dockerfile', '*.tests.ts' ] - - - # # Wait for Deploy to Complete - # wait-for-deploy-production: - # name: wait-for-deploy-production - # image: woodpeckerci/plugin-git - # commands: - # - echo "Waiting for deploy step to complete rollout." - # - sleep 60 - # when: - # - branch: production - # - event: push - - # # Run Post-Deployment Smoke Tests - # post-deploy-smoke-tests-git-nixc-us: - # name: run-post-deploy-smoke-tests-git-nixc-us - # image: git.nixc.us/colin/playwright:latest - # # secrets: [TEST_USER, TEST_PASSWORD] - # environment: - # - BASE_URL=https://git.nixc.us - # when: - # - branch: production - # - event: push - # # - path: - # # include: [ 'stack.production.yml', 'stack.staging.yml', 'docker-compose.staging.yml', 'docker-compose.production.yml', 'Dockerfile', '*.tests.ts' ] \ No newline at end of file + - event: push \ No newline at end of file