Skip to content
This repository was archived by the owner on Jul 30, 2025. It is now read-only.

Commit 5267e52

Browse files
myan9starpit
authored andcommitted
fix: proxy still runs http-allocate-cert even if NO_DOCKER is set
Fixes #4137
1 parent 43fbe6a commit 5267e52

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

packages/proxy/build.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,12 @@ function init {
4141
# install the proxy-specific build bits
4242
function initProxy {
4343
pushd "$STAGING_DIR" > /dev/null
44-
cp -a "$PROXY_HOME"/{package.json,build-docker.sh,Dockerfile,Dockerfile.http,.dockerignore} .
44+
cp -a "$PROXY_HOME"/package.json .
45+
46+
if [ -z "$NO_DOCKER" ]; then
47+
cp -a "$PROXY_HOME"/{build-docker.sh,Dockerfile,Dockerfile.http,.dockerignore} .
48+
fi
49+
4550
mkdir -p kui/packages/proxy
4651
cp -a "$PROXY_HOME"/app kui/packages/proxy
4752

@@ -65,7 +70,7 @@ function headless {
6570

6671
# create the self-signed certificate
6772
function cert {
68-
if [ "$KUI_USE_HTTP" != "true" ] && [ -d "$BUILDER_HOME/../webpack" ]; then
73+
if [ -z "${NO_DOCKER}" ] && [ "$KUI_USE_HTTP" != "true" ] && [ -d "$BUILDER_HOME/../webpack" ]; then
6974
pushd "$BUILDER_HOME/../webpack" > /dev/null
7075
CLIENT_HOME="$CLIENT_HOME" npm run http-allocate-cert
7176
cp -a "$CLIENT_HOME"/.keys "$STAGING_DIR"/app/bin

packages/webpack/build.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,12 @@ function init {
135135
# install the webpackery bits
136136
function initWebpack {
137137
pushd "$STAGING_DIR" > /dev/null
138-
cp -a "$BUILDER_HOME"/../webpack/{package.json,webpack.config.js,build-docker.sh,Dockerfile,Dockerfile.http,bin,conf.d} .
138+
cp -a "$BUILDER_HOME"/../webpack/{package.json,webpack.config.js} .
139+
140+
if [ -z "$NO_DOCKER" ]; then
141+
cp -a "$BUILDER_HOME"/../webpack/{build-docker.sh,Dockerfile,Dockerfile.http,bin,conf.d} .
142+
fi
143+
139144
popd > /dev/null
140145
}
141146

0 commit comments

Comments
 (0)