Skip to content

Commit 72f124d

Browse files
committed
wip
1 parent e4ae587 commit 72f124d

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/pull-request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ jobs:
1919
with:
2020
version-package: package.json
2121
version-package-lock: package-lock.json
22-
pre-lint-command: npm ci --ignore-scripts; npm run lint
23-
pre-test-unit-command: npm ci --ignore-scripts; npm run test
22+
pre-lint-command: NODEAPP_UID=$(id -u) NODEAPP_RESTART_POLICY=no NODEAPP_COMMAND="bash -c 'npm ci --ignore-scripts; npm run lint'" docker compose up nodeapp --force-recreate --remove-orphans --abort-on-container-exit --exit-code-from nodeapp
23+
pre-test-unit-command: NODEAPP_UID=$(id -u) NODEAPP_RESTART_POLICY=no NODEAPP_COMMAND="bash -c 'npm ci --ignore-scripts; npm run test'" docker compose up nodeapp --force-recreate --remove-orphans --abort-on-container-exit --exit-code-from nodeapp

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
2-
webapp:
3-
image: ${NODEAPP_IMAGE:-optimusclean-hmi-webapp:dev}
2+
nodeapp:
3+
image: ${NODEAPP_IMAGE:-nodeapp:dev}
44
user: '${NODEAPP_UID:-1000}'
55
working_dir: '${NODEAPP_WORKING_DIR:-/home/node/app}'
66
network_mode: 'host'
@@ -13,7 +13,7 @@ services:
1313
args:
1414
NODE_UID: '${NODEAPP_UID:-1000}'
1515
dockerfile: '${NODEAPP_DOCKERFILE:-Dockerfile}'
16-
target: '${OPTIMUSCLEAN_HMI_WEBSERVER_DOCKERFILE_TARGET:-webapp-dev}'
16+
target: '${NODEAPP_DOCKERFILE_TARGET:-nodeapp-dev}'
1717
environment:
1818
- PORT=${NODEAPP_PORT:-5173}
1919
- NODE_UID=${NODEAPP_UID:-1000}

0 commit comments

Comments
 (0)