Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into healthx-demo
Browse files Browse the repository at this point in the history
  • Loading branch information
tamslo committed Jun 7, 2023
2 parents 5548490 + 17a0952 commit d9a4bba
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lab-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- run: yarn
- run: cp test/helpers/e2e-users.json seeder/users.json
- run: cp test/helpers/e2e-users.json src/seeder/users.json
- run: yarn seed:run
- run: yarn test:e2e:cov
- uses: actions/upload-artifact@v3
Expand Down
3 changes: 3 additions & 0 deletions lab-server/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ _database. Instead, run the following commands:_
~`docker compose --file lab-server/docker-compose.yml --profile production up`~
~to start all components.~

~_Note: removed the .env file from the Dockerfile to fix workflow; should set_~
~_variables in `docker-compose.yml` when attemting to fix this whole setup._~

~The API and other components will be available under the ports specified in~
~the `.env` file.~

Expand Down
1 change: 0 additions & 1 deletion lab-server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ WORKDIR /app
COPY ./package.json ./yarn.lock ./

COPY ./lab-server/package.json ./lab-server/package.json
COPY ./lab-server/.env ./lab-server/.env
RUN yarn workspace lab-server --production=true --frozen-lockfile install && yarn cache clean
COPY --from=builder /app/lab-server/dist ./lab-server/dist

Expand Down

0 comments on commit d9a4bba

Please sign in to comment.