Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the way how shared/ folder is used #4696

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Update the way how shared/ folder is used #4696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b9652f3
Update the way how `shared/` folder is used
valtterikantanen Dec 11, 2024
c5b6800
Commit one more changed file
valtterikantanen Dec 11, 2024
ffdfa23
Debug build process
valtterikantanen Dec 11, 2024
112f54c
Merge branch 'master' into shared-path-fix
valtterikantanen Dec 11, 2024
cfa0d6e
Commit one more changed file
valtterikantanen Dec 11, 2024
2c4863b
More debugging
valtterikantanen Dec 11, 2024
e196446
Fix outDir
valtterikantanen Dec 11, 2024
1055e6a
More fixes
valtterikantanen Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docker-compose.ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ services:
build:
context: services
dockerfile: frontend/Dockerfile
args:
- --progress=plain

kone-db:
<<: *defaults
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ services:
volumes:
- backend-nodemod:/opt/app-root/src/node_modules
- ./services/backend/:/opt/app-root/src
- ./services/shared/:/opt/app-root/src/src/shared
- ./services/shared/:/opt/app-root/shared

frontend:
<<: *defaults
Expand All @@ -61,7 +61,7 @@ services:
volumes:
- frontend-nodemod:/opt/app-root/src/node_modules
- ./services/frontend/:/opt/app-root/src
- ./services/shared/:/opt/app-root/src/src/shared
- ./services/shared/:/opt/app-root/shared

kone-db:
<<: *defaults
Expand Down
8 changes: 1 addition & 7 deletions eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,6 @@ export default [
'no-console': 'off',
},
},
{
files: ['services/**/shared/**/*'],
rules: {
'import/no-unused-modules': 'off',
},
},
{
files: ['cypress/**/*.js', 'services/backend/**/*.js', 'updater/**/*.js'],
languageOptions: {
Expand All @@ -164,7 +158,7 @@ export default [
},
{
settings: {
'import/internal-regex': '^@/shared/',
'import/internal-regex': '^@shared/',
'import/resolver': {
typescript: {
project: [
Expand Down
8 changes: 6 additions & 2 deletions services/backend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,15 @@ ENV SENTRY_RELEASE=$SENTRY_RELEASE

COPY ./backend/package*.json ./
RUN npm ci --include=dev
COPY ./shared ./src/shared
COPY ./shared ../shared
COPY ./backend .

RUN npm run build

RUN ls -la /opt/app-root/
RUN ls -la /opt/app-root/src/src/
RUN ls -la /opt/app-root/src
RUN ls -la /opt/app-root/src/dist


FROM registry.access.redhat.com/ubi9/nodejs-22-minimal
Expand Down Expand Up @@ -56,4 +60,4 @@ COPY --from=build /opt/app-root/src/dist ./dist

RUN npm ci

CMD ["node", "dist/index.js"]
CMD ["node", "dist/backend/index.js"]
Loading
Loading