Skip to content

Commit

Permalink
Restore docker-compose-puppeteer-up command in Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
ivangabriele committed Feb 21, 2024
1 parent f1b0c8e commit ead2847
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,6 @@ jobs:
run: |
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${GITHUB_ACTOR} --password-stdin
- name: Run docker images
run: make docker-compose-puppeteer-up

- name: Setup Node.js
uses: actions/setup-node@v4
with:
Expand All @@ -291,6 +288,9 @@ jobs:
run: npm ci
working-directory: ./frontend

- name: Run docker images
run: make docker-compose-puppeteer-up

- name: Install Firefox
run: npx puppeteer browsers install firefox

Expand Down
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
INFRA_FOLDER="$(shell pwd)/infra/configurations/"
HOST_MIGRATIONS_FOLDER=$(shell pwd)/backend/src/main/resources/db/migration

.PHONY: clean env install test
.PHONY: clean install test

docker-env:
cd ./infra/docker && ../../frontend/node_modules/.bin/import-meta-env-prepare -u -x ./.env.local.defaults\
Expand Down Expand Up @@ -93,6 +93,11 @@ docker-compose-up:
@printf 'Waiting for backend app to be ready'
@until curl --output /dev/null --silent --fail "http://localhost:8880/bff/v1/healthcheck"; do printf '.' && sleep 1; done

docker-compose-puppeteer-up: docker-env
docker compose -f ./infra/docker/docker-compose.puppeteer.yml up -d
@printf 'Waiting for backend app to be ready'
@until curl --output /dev/null --silent --fail "http://localhost:8880/bff/v1/healthcheck"; do printf '.' && sleep 1; done

# CI commands - data pipeline
docker-build-pipeline:
docker build -f ./infra/docker/datapipeline/Dockerfile . -t monitorfish-pipeline:$(VERSION)
Expand Down

0 comments on commit ead2847

Please sign in to comment.