remove borked data.sql path and make new cypress docker compose

CDCgov · Oct 18, 2024 · b1c23b3 · b1c23b3
1 parent d2dec02
commit b1c23b3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/container-ecr-viewer.yaml b/.github/workflows/container-ecr-viewer.yaml
@@ -65,12 +65,8 @@ jobs:
  working-directory: ./containers/${{env.CONTAINER}} # Navigate to your Node.js app directory
  run: npm install
 
- - name: Copy seed data
- working-directory: ./containers/${{env.CONTAINER}}
- run: cp ./cypress/assets/data.sql ./seed-scripts/sql
-
  - name: Start ${{env.CONTAINER}}
- working-directory: ./containers/${{env.CONTAINER}}
+ working-directory: ./containers/${{env.CONTAINER}}/cypress
  run: docker compose --env-file .env.test up -d
 
  - name: Wait for server to be ready

diff --git a/containers/ecr-viewer/cypress/docker-compose-cypress.yml b/containers/ecr-viewer/cypress/docker-compose-cypress.yml
@@ -5,9 +5,10 @@ services:
  ports:
  - "5432:5432"
  volumes:
- - ./sql/core.sql:/docker-entrypoint-initdb.d/core.sql
- - ./seed-scripts/sql/01-init.sql:/docker-entrypoint-initdb.d/01-init.sql
- - ./seed-scripts/sql/.pgpass/:/usr/local/lib/.pgpass
+ - ../sql/core.sql:/docker-entrypoint-initdb.d/core.sql
+ - ../seed-scripts/sql/01-init.sql:/docker-entrypoint-initdb.d/01-init.sql
+ - ./assets/data.sql:/docker-entrypoint-initdb.d/data.sql
+ - ../seed-scripts/sql/.pgpass/:/usr/local/lib/.pgpass
  environment:
  - POSTGRES_USER=postgres
  - PGUSER=postgres

diff --git a/containers/ecr-viewer/docker-compose.yml b/containers/ecr-viewer/docker-compose.yml
@@ -7,7 +7,6 @@ services:
  volumes:
  - ./sql/core.sql:/docker-entrypoint-initdb.d/core.sql
  - ./seed-scripts/sql/01-init.sql:/docker-entrypoint-initdb.d/01-init.sql
- - ./seed-scripts/sql/data.sql:/docker-entrypoint-initdb.d/data.sql
  - ./seed-scripts/sql/.pgpass/:/usr/local/lib/.pgpass
  environment:
  - POSTGRES_USER=postgres