From 4f6fa36942a6e9fe2c1c01ad8ea5a1b171479409 Mon Sep 17 00:00:00 2001 From: David Lougheed Date: Wed, 22 Mar 2023 11:51:44 -0400 Subject: [PATCH 1/9] fix: missing config prod js --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 35a6fdadf..c9eff72c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,6 +37,8 @@ WORKDIR /web COPY --from=build /web/dist ./dist # Copy in package.json to provide version COPY package.json . +# Copy in the production config generation script +COPY create_config_prod.js . # Copy in the service info generator COPY create_service_info.js . # Copy in the entrypoint, which writes the config file and starts NGINX From b91a9ab73b5a5850efab9b1f5258ffab15620d3b Mon Sep 17 00:00:00 2001 From: David Lougheed Date: Wed, 22 Mar 2023 12:31:10 -0400 Subject: [PATCH 2/9] chore: bump version to 1.8.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ed2fbd55f..785d344af 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bento_web", - "version": "1.8.0", + "version": "1.8.1", "description": "Bento platform front-end", "main": "src/index.js", "dependencies": { From 6c6d67b2cc47c1cf56fe4b9a80c9a51376a2567a Mon Sep 17 00:00:00 2001 From: David Lougheed Date: Wed, 22 Mar 2023 15:11:44 -0400 Subject: [PATCH 3/9] chore: show different entrypoint warning if git is missing entirely in dev --- create_service_info.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/create_service_info.js b/create_service_info.js index e41ca0686..a8c9d42ef 100644 --- a/create_service_info.js +++ b/create_service_info.js @@ -28,9 +28,9 @@ const serviceInfo = { }, }; - +const hasGit = childProcess.execSync("which git").toString().trim() === ""; const git = cmd => childProcess.execSync(`git ${cmd}`).toString().trim(); -if (nodeEnv === "development") { +if (nodeEnv === "development" && hasGit) { try { serviceInfo.bento.gitTag = git("describe --tags --abbrev=0"); serviceInfo.bento.gitBranch = git("branch --show-current"); @@ -38,6 +38,8 @@ if (nodeEnv === "development") { } catch (e) { console.warn(`Could not get git information (${e})`); } +} else if (!hasGit) { + console.warn("Could not get git information (missing git)"); } if (typeof require !== "undefined" && require.main === module) { From 58acfacd79f7d0ec655daa3dcefac708ef275c04 Mon Sep 17 00:00:00 2001 From: David Lougheed Date: Wed, 22 Mar 2023 15:12:18 -0400 Subject: [PATCH 4/9] chore: bump version in package lock --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index e2065bc22..4150af319 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "bento_web", - "version": "1.8.0", + "version": "1.8.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "bento_web", - "version": "1.8.0", + "version": "1.8.1", "license": "LGPL-3.0-only", "dependencies": { "antd": "^3.26.20", From bfda3652e01e45fe36a1584aeb84f44eee875654 Mon Sep 17 00:00:00 2001 From: David Lougheed Date: Wed, 22 Mar 2023 15:28:24 -0400 Subject: [PATCH 5/9] fix: git detection in service info generator --- create_service_info.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/create_service_info.js b/create_service_info.js index a8c9d42ef..b17e593c4 100644 --- a/create_service_info.js +++ b/create_service_info.js @@ -28,7 +28,14 @@ const serviceInfo = { }, }; -const hasGit = childProcess.execSync("which git").toString().trim() === ""; +const hasGit = (() => { + try { + return childProcess.execSync("which git").toString().trim() === ""; + } catch (_e) { + // Exit code 1 (git not found) + return false; + } +})(); const git = cmd => childProcess.execSync(`git ${cmd}`).toString().trim(); if (nodeEnv === "development" && hasGit) { try { From 6d95afcc18bcbb563f5655afd6fe8f3bf4e1c0da Mon Sep 17 00:00:00 2001 From: David Lougheed Date: Wed, 22 Mar 2023 15:35:23 -0400 Subject: [PATCH 6/9] chore: update dev base image --- dev.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev.Dockerfile b/dev.Dockerfile index 2fcfdd2ff..fdd6bea7e 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -7,7 +7,7 @@ COPY package-lock.json . RUN npm ci -FROM ghcr.io/bento-platform/bento_base_image:node-debian-2023.03.06 +FROM ghcr.io/bento-platform/bento_base_image:node-debian-2023.03.22 WORKDIR /web From 4e9a76cce5fdc92ac4b1c124a7509c6fd4ddefb1 Mon Sep 17 00:00:00 2001 From: David Lougheed Date: Wed, 22 Mar 2023 15:50:43 -0400 Subject: [PATCH 7/9] chore: let base image handle setting .gitconfig --- run.dev.bash | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/run.dev.bash b/run.dev.bash index 05945a215..94a22e22e 100644 --- a/run.dev.bash +++ b/run.dev.bash @@ -1,14 +1,9 @@ #!/bin/bash -echo "[bento_web] [entrypoint] setting .gitconfig" +# Base image handles making bento_user and setting its .gitconfig -# Set .gitconfig for development -/set_gitconfig.bash - -if [[ -z "${BENTO_WEB_PORT}" ]]; then - # Set default internal port to 80 - export BENTO_WEB_PORT=80 -fi +# Set default internal port to 80 +: "${BENTO_WEB_PORT:=80}" # ----- Begin /service-info creation ---------------------------------- echo "[bento_web] [entrypoint] creating service-info file" From 37a46309cf6272283e2711b3df7cff332ea68efa Mon Sep 17 00:00:00 2001 From: David Lougheed Date: Wed, 22 Mar 2023 15:51:50 -0400 Subject: [PATCH 8/9] chore: dev dockerfile description --- dev.Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev.Dockerfile b/dev.Dockerfile index fdd6bea7e..38cee9c02 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -9,6 +9,8 @@ RUN npm ci FROM ghcr.io/bento-platform/bento_base_image:node-debian-2023.03.22 +LABEL org.opencontainers.image.description="Local development image for Bento Web." + WORKDIR /web COPY package.json . From 1617805f802da35fbc704ff1fe21345053dc550b Mon Sep 17 00:00:00 2001 From: David Lougheed Date: Wed, 22 Mar 2023 16:09:04 -0400 Subject: [PATCH 9/9] fix: export web port --- run.dev.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/run.dev.bash b/run.dev.bash index 94a22e22e..0c5828160 100644 --- a/run.dev.bash +++ b/run.dev.bash @@ -4,6 +4,7 @@ # Set default internal port to 80 : "${BENTO_WEB_PORT:=80}" +export BENTO_WEB_PORT # ----- Begin /service-info creation ---------------------------------- echo "[bento_web] [entrypoint] creating service-info file"