From 8225c7a2e45bb6b37d6f5f872ce63454dc7e4676 Mon Sep 17 00:00:00 2001 From: Rogerio Shieh Barbosa <40327446+rogerioshieh@users.noreply.github.com> Date: Tue, 14 Dec 2021 11:45:18 -0500 Subject: [PATCH 1/5] Update shipyard orb version on circleci config The new version adds support for applications. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f13dfc9..02fc5ca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ version: '2.1' orbs: - shipyard: shipyard/shipyard@3.0.0 + shipyard: shipyard/shipyard@3.1.0 jobs: print-env-data: machine: From c93669af28646c638a2923959fc55623ad7803b9 Mon Sep 17 00:00:00 2001 From: Akshay K Date: Mon, 18 Apr 2022 11:44:31 -0400 Subject: [PATCH 2/5] feat: add `fetch-shipyard-env` gh workflow Added new Github Action workflow to retrieve Shipyard's vars and print them --- .github/workflows/print-env-data.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/print-env-data.yml diff --git a/.github/workflows/print-env-data.yml b/.github/workflows/print-env-data.yml new file mode 100644 index 0000000..fb733f9 --- /dev/null +++ b/.github/workflows/print-env-data.yml @@ -0,0 +1,20 @@ +on: [push] + +jobs: + print-env-data: + runs-on: ubuntu-latest + name: Fetch Shipyard Vars + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Fetch Shipyard Environment + uses: shipyard/github-action/fetch-shipyard-env@1.0.0 + with: + api-token: ${{ secrets.SHIPYARD_API_TOKEN }} + timeout-minutes: "10" + - name: Print Env Data + run: | + export CYPRESS_BASE_URL=${SHIPYARD_ENVIRONMENT_URL} + export CYPRESS_BYPASS_TOKEN=${SHIPYARD_BYPASS_TOKEN} + env | grep -e SHIPYARD -e CYPRESS + shell: bash From 3f8a5404cdbf5632aa8df94ea32c8f269261f818 Mon Sep 17 00:00:00 2001 From: Natalie Lunbeck Date: Thu, 5 Oct 2023 09:35:31 -0700 Subject: [PATCH 3/5] use version 3.8, before --> init swap (#10) --- docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 4570aaf..093decb 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '3' +version: '3.8' services: @@ -19,7 +19,7 @@ services: worker: labels: - shipyard.before: 'poetry run flask db upgrade' + shipyard.init: 'poetry run flask db upgrade' build: '.' environment: DATABASE_URL: 'postgres://obscure-user:obscure-password@postgres/app' From 5f4bb6fa4560727113adc3f63094a6a634a49f5f Mon Sep 17 00:00:00 2001 From: Natalie Lunbeck Date: Tue, 2 Jan 2024 13:10:04 -0800 Subject: [PATCH 4/5] feat: Use new integrate-shipyard action (#11) --- .github/workflows/print-env-data.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/print-env-data.yml b/.github/workflows/print-env-data.yml index fb733f9..177854e 100644 --- a/.github/workflows/print-env-data.yml +++ b/.github/workflows/print-env-data.yml @@ -6,9 +6,9 @@ jobs: name: Fetch Shipyard Vars steps: - name: Checkout - uses: actions/checkout@v2 - - name: Fetch Shipyard Environment - uses: shipyard/github-action/fetch-shipyard-env@1.0.0 + uses: actions/checkout@v3 + - name: Integrate Shipyard + uses: shipyard/shipyard-action@1.0.0 with: api-token: ${{ secrets.SHIPYARD_API_TOKEN }} timeout-minutes: "10" From 8d35428a6db09eecac5b6ca057cee973b60553dc Mon Sep 17 00:00:00 2001 From: Oscar Romero Date: Tue, 20 Feb 2024 11:52:58 -0500 Subject: [PATCH 5/5] chore: Update Makefile to Compose v2 (#13) --- Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 6b954a9..23ff3fe 100644 --- a/Makefile +++ b/Makefile @@ -3,42 +3,42 @@ VOLUME=$(shell basename $(PWD)) develop: clean build migrations.upgrade run clean: - docker-compose rm -vf + docker compose rm -vf build: - docker-compose build + docker compose build run: - docker-compose up + docker compose up shell: - docker-compose run worker \ + docker compose run worker \ sh python-shell: - docker-compose run worker \ + docker compose run worker \ poetry run flask shell postgres.data.delete: clean docker volume rm $(VOLUME)_postgres postgres.start: - docker-compose up -d postgres - docker-compose exec postgres \ + docker compose up -d postgres + docker compose exec postgres \ sh -c 'while ! nc -z postgres 5432; do sleep 0.1; done' migrations.blank: postgres.start - docker-compose run worker \ + docker compose run worker \ poetry run flask db revision migrations.create: postgres.start - docker-compose run worker \ + docker compose run worker \ poetry run flask db migrate migrations.upgrade: postgres.start - docker-compose run worker \ + docker compose run worker \ poetry run flask db upgrade migrations.heads: postgres.start - docker-compose run worker \ + docker compose run worker \ poetry run flask db heads