Skip to content

Commit 1fc3df5

Browse files
committed
aligns dev and prod versions
1 parent bc22706 commit 1fc3df5

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

services/static-webserver/client/Makefile

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ compile-dev: qx_packages source-output ## qx compiles host' 'source' -> host's '
3131
# qx compile 'source' $(flags) --> 'source-output' [itisfoundation/qooxdoo-kit:${QOOXDOO_KIT_TAG}]
3232
$(docker_compose) run --detach --rm --name=$(container_name) qooxdoo-kit \
3333
qx compile $(flags) \
34+
--set-env osparc.vcsOriginUrl="${VCS_URL}" \
3435
--set-env osparc.vcsRef="${VCS_REF}" \
3536
--set-env osparc.vcsRefClient="${VCS_REF_CLIENT}" \
36-
--set-env osparc.vcsStatusClient="${VCS_STATUS_CLIENT}" \
37-
--set-env osparc.vcsOriginUrl="${VCS_URL}"
37+
--set-env osparc.vcsStatusClient="${VCS_STATUS_CLIENT}"
3838

3939
.PHONY: follow-dev-logs
4040
follow-dev-logs: ## follow the logs of the qx compiler
@@ -44,8 +44,10 @@ follow-dev-logs: ## follow the logs of the qx compiler
4444
.PHONY: compile touch upgrade
4545
compile: ## qx compiles host' 'source' -> image's 'build-output'
4646
# qx compile 'source' within $(docker_image) image [itisfoundation/qooxdoo-kit:${QOOXDOO_KIT_TAG}]
47-
@docker buildx build --file $(docker_file) --tag $(docker_image) \
47+
@docker --debug buildx build \
4848
--load \
49+
--file $(docker_file) \
50+
--tag $(docker_image) \
4951
--build-arg tag=${QOOXDOO_KIT_TAG} \
5052
--build-arg VCS_REF=${VCS_REF} \
5153
--build-arg VCS_REF_CLIENT=${VCS_REF_CLIENT} \
@@ -56,7 +58,13 @@ compile: ## qx compiles host' 'source' -> image's 'build-output'
5658

5759
touch: ## minimal image build with /project/output-build inside
5860
# touch /project/output-build such that multi-stage 'services/web/Dockerfile' can build development target (fixes #1097)
59-
@docker buildx build --load --file $(docker_file) --tag $(docker_image) --build-arg tag=${QOOXDOO_KIT_TAG} --target=touch .
61+
@docker --debug buildx build \
62+
--load \
63+
--file $(docker_file) \
64+
--tag $(docker_image) \
65+
--build-arg tag=${QOOXDOO_KIT_TAG} \
66+
--target=touch \
67+
.
6068

6169
upgrade: ## upgrade to official version of the tool
6270
# upgrading to ${QOOXDOO_KIT_TAG}

services/static-webserver/client/tools/docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ services:
99
ports:
1010
- '8080:8080'
1111
working_dir: /project
12+
environment:
13+
NODE_OPTIONS: "--max-old-space-size=5120"
1214
command: >
1315
qx serve --set qx.allowUrlSettings=true
1416
--set-env osparc.vcsOriginUrl="${VCS_URL}"

0 commit comments

Comments
 (0)