Skip to content

Commit

Permalink
Be more specific about docker version
Browse files Browse the repository at this point in the history
  • Loading branch information
WillNilges committed Aug 29, 2023
1 parent 08c226b commit 9cac930
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 23 deletions.
27 changes: 4 additions & 23 deletions .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,44 +30,25 @@ jobs:
run: |
sed -i '/start_period: 3s/d' docker-compose.yaml
sed -i '/ports:/d' docker-compose.yaml
sed -i '/- "8080:8080"/d' docker-compose.yaml
sed -i '/- "8080:8080"/d' docker-compose.yaml
sed -i 's/^gunicorn meshdb:app$/sleep 3 \&\& gunicorn meshdb:app/' docker-compose.yaml
- uses: isbang/[email protected]
with:
compose-file: "./docker-compose.yml"
down-flags: "--volumes"
services: |
postgres
env:
MESHDB_DB_NAME: nymesh-dev
MESHDB_DB_USER: nycmesh
MESHDB_DB_HOST: localhost
MESHDB_DB_PASSWORD: helloThisIsATest
- name: "We live in the stone age but again"
run: |
sleep 3
- uses: isbang/[email protected]
with:
compose-file: "./docker-compose.yml"
down-flags: "--volumes"
services: |
meshdb
env:
MESHDB_DB_NAME: nymesh-dev
MESHDB_DB_USER: nycmesh
MESHDB_DB_HOST: localhost
MESHDB_DB_PASSWORD: helloThisIsATest
#- name: "Setup ephemeral environment"
# run: |
# docker-compose up
# env:
# MESHDB_DB_NAME: nymesh-dev
# MESHDB_DB_USER: nycmesh
# MESHDB_DB_HOST: localhost
# MESHDB_DB_PASSWORD: helloThisIsATest
- name: "Run Integration Test Script"
- name: "Install Dependencies"
run: |
pip install -r requirements.txt
pip install -r tests/requirements.txt
- name: "Run Integration Tests"
PYTHONPATH=. pytest .
env:
MESHDB_DB_NAME: nymesh-dev
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ services:
build:
context: .
dockerfile: Dockerfile
ports:
- "8080:8080"
# Other configuration options for your app service
environment:
MESHDB_DB_NAME: ${MESHDB_DB_NAME}
Expand Down

0 comments on commit 9cac930

Please sign in to comment.