Skip to content

Commit

Permalink
Fix Yarn and Docker
Browse files Browse the repository at this point in the history
  • Loading branch information
gabalafou committed Sep 4, 2024
1 parent 246403f commit 3c64705
Show file tree
Hide file tree
Showing 7 changed files with 10,704 additions and 16,131 deletions.
925 changes: 0 additions & 925 deletions .yarn/releases/yarn-4.4.0.cjs

This file was deleted.

3 changes: 0 additions & 3 deletions .yarnrc.yml

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn \

EXPOSE 8000

CMD [ "yarn", "webpack-dev-server", "--port", "8000" ]
CMD [ "yarn", "run", "start:ui" ]
5 changes: 3 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ services:

conda-store-ui:
build: .
command: "yarn run start:ui --port 8000 --history-api-fallback"
command: yarn run start:ui
profiles:
- local-dev
ports:
Expand All @@ -91,7 +91,8 @@ services:
condition: service_healthy
platform: linux/amd64
volumes:
- .:/usr/src/app
- ./src:/usr/src/app/src
- ./style:/usr/src/app/style
healthcheck:
test:
["CMD", "curl", "--fail", "http://localhost:8000"]
Expand Down
3 changes: 1 addition & 2 deletions environment_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ channels:
- conda-forge
dependencies:
- python=3.10
- yarn>=4.4.0
- nodejs>=18.0
- nodejs=18.18 # do not install Yarn separately, will get Yarn via Corepack
- pytest
- pip
- pip:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -143,5 +143,5 @@
"engines": {
"node": ">=18.0.0"
},
"packageManager": "yarn@4.4.0"
"packageManager": "yarn@1.22.19"
}
Loading

0 comments on commit 3c64705

Please sign in to comment.