From 18769d49fb9cbfa4609e228bb9bc4125c907f53a Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Wed, 10 Nov 2021 13:43:36 +0200 Subject: [PATCH] docker update for cache and temporary user remove --- docker/red-ui/Dockerfile | 14 +++++++++++--- tools/auto-i18n/i18n-cleanup.ts | 9 +++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/docker/red-ui/Dockerfile b/docker/red-ui/Dockerfile index 9dd0db290..574d0e487 100644 --- a/docker/red-ui/Dockerfile +++ b/docker/red-ui/Dockerfile @@ -1,9 +1,17 @@ +FROM node:14.17-alpine as prep +RUN apk add --update jq && rm -rf /var/cache/apk/* + +COPY package.json /tmp + +RUN jq '{ dependencies, devDependencies, peerDependencies, scripts: (.scripts | { postinstall }) }' < /tmp/package.json > /tmp/deps.json +# keep postinstall script + ### STAGE 1: Build ### # We label our stage as ‘builder’ FROM node:14.17-alpine as builder -RUN apk add --update jq && rm -rf /var/cache/apk/* -COPY package.json yarn.lock ./ +COPY --from=prep /tmp/deps.json ./package.json +COPY yarn.lock ./ ## Storing node modules on a separate layer will prevent unnecessary npm installs at each build RUN yarn install --verbose && mkdir /ng-app && mv ./node_modules ./ng-app @@ -46,7 +54,7 @@ RUN chmod g+r -R /usr/share/nginx/html ## Change permissions to enable openShift functionality RUN chmod -R g+rwx /var/cache/nginx /var/run /var/log/nginx /usr/share /etc/nginx -USER 1001 +# USER 1001 COPY docker/red-ui/docker-entrypoint.sh / CMD ["/docker-entrypoint.sh"] diff --git a/tools/auto-i18n/i18n-cleanup.ts b/tools/auto-i18n/i18n-cleanup.ts index 069fdf003..32388e279 100644 --- a/tools/auto-i18n/i18n-cleanup.ts +++ b/tools/auto-i18n/i18n-cleanup.ts @@ -87,6 +87,15 @@ async function execute() { } } + for (let key of Object.keys(flatEnglish)) { + try { + const result = tmfc.compile(flatEnglish[key], 'de'); + //console.log(result); + } catch (e) { + console.error('ERROR AT: ', flatEnglish[key]); + } + } + const mergedGerman = { ...flatEnglish, ...flatGerman }; const finalGerman = unflatten(mergedGerman);