From d2b0218abaad0833ede62f82e398aead156b4d3b Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Tue, 22 Nov 2022 18:26:41 +0000 Subject: [PATCH 1/3] feat: add build args for console --- Dockerfile | 3 +++ composer.lock | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index f63ed3ddda..12ee4ddc70 100755 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,9 @@ COPY app/console /usr/local/src/console WORKDIR /usr/local/src/console +ARG VITE_GA_PROJECT="" +ENV VITE_GA_PROJECT=$VITE_GA_PROJECT + RUN npm ci RUN npm run build diff --git a/composer.lock b/composer.lock index 3b4148a950..e97546287f 100644 --- a/composer.lock +++ b/composer.lock @@ -3358,16 +3358,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.18", + "version": "9.2.19", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a" + "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/12fddc491826940cf9b7e88ad9664cf51f0f6d0a", - "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c77b56b63e3d2031bd8997fcec43c1925ae46559", + "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559", "shasum": "" }, "require": { @@ -3423,7 +3423,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.18" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.19" }, "funding": [ { @@ -3431,7 +3431,7 @@ "type": "github" } ], - "time": "2022-10-27T13:35:33+00:00" + "time": "2022-11-18T07:47:47+00:00" }, { "name": "phpunit/php-file-iterator", From fc752039a4ba035bff76da824bdc243ebd43882a Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Wed, 23 Nov 2022 00:29:26 +0530 Subject: [PATCH 2/3] Update Dockerfile Co-authored-by: Torsten Dittmann --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 12ee4ddc70..5d36384140 100755 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ COPY app/console /usr/local/src/console WORKDIR /usr/local/src/console -ARG VITE_GA_PROJECT="" +ARG VITE_GA_PROJECT ENV VITE_GA_PROJECT=$VITE_GA_PROJECT RUN npm ci From 4813e6b4d5c286ee23b1bd73fd07197de5c35d27 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Tue, 22 Nov 2022 19:32:35 +0000 Subject: [PATCH 3/3] feat: add console mode --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 5d36384140..95073df08b 100755 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,10 @@ COPY app/console /usr/local/src/console WORKDIR /usr/local/src/console ARG VITE_GA_PROJECT +ARG VITE_CONSOLE_MODE + ENV VITE_GA_PROJECT=$VITE_GA_PROJECT +ENV VITE_CONSOLE_MODE=$VITE_CONSOLE_MODE RUN npm ci RUN npm run build