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: diff --git a/.github/workflows/print-env-data.yml b/.github/workflows/print-env-data.yml new file mode 100644 index 0000000..177854e --- /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@v3 + - name: Integrate Shipyard + uses: shipyard/shipyard-action@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 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 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'