Skip to content

Commit

Permalink
Docker compose config for root context
Browse files Browse the repository at this point in the history
  • Loading branch information
jonkafton committed Apr 26, 2024
1 parent 5f219f9 commit 85ba9fb
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 28 deletions.
3 changes: 2 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ services:

watch:
build:
context: ./frontends
context: .
dockerfile: frontends/Dockerfile
command: >
/bin/sh -c 'yarn rebuild && yarn watch:docker'
environment:
Expand Down
19 changes: 0 additions & 19 deletions frontends/.yarnrc.yml

This file was deleted.

9 changes: 7 additions & 2 deletions frontends/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
FROM node:20.12-alpine
LABEL maintainer "ODL DevOps <[email protected]>"

COPY . /src
COPY ./package.json /src/package.json
COPY ./yarn.lock /src/yarn.lock
COPY ./.yarn /src/.yarn
COPY ./frontends /src/frontends

WORKDIR /src

RUN yarn set version 4.1.1
RUN yarn install --immutable
RUN yarn install

# Rebuilds for the case that the lockfile contains platform-specific dependencies
RUN yarn rebuild

WORKDIR /src/frontends

RUN yarn build-storybook

CMD ["yarn", "watch:docker"]
6 changes: 3 additions & 3 deletions frontends/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
"./test-utils": "./src/test-utils/index.ts"
},
"peerDependencies": {
"@tanstack/react-query": "^4.36.1",
"axios": "^1.6.3",
"react": "^18.2.0"
},
"devDependencies": {
Expand All @@ -24,6 +22,8 @@
"ol-test-utilities": "0.0.0"
},
"dependencies": {
"@lukemorales/query-key-factory": "^1.3.2"
"@lukemorales/query-key-factory": "^1.3.2",
"@tanstack/react-query": "^4.36.1",
"axios": "^1.6.3"
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"private": true,
"engines": {
"node": "^20",
"yarn": "^3.8.1"
"yarn": "^4.1.1"
},
"workspaces": [
"frontends"
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 85ba9fb

Please sign in to comment.