diff --git a/dist/setup.sh b/dist/setup.sh index 35a9fba..9ed8b9d 100755 --- a/dist/setup.sh +++ b/dist/setup.sh @@ -181,6 +181,7 @@ configure() { # configure features of cyphernode docker run -v $current_path:/data \ + -e DEFAULT_USER=$USER \ --log-driver=none$pw_env \ --rm$interactive cyphernodeconf:latest $(id -u):$(id -g) yo --no-insight cyphernode$gen_options $recreate } diff --git a/install/generator-cyphernode/generators/app/index.js b/install/generator-cyphernode/generators/app/index.js index b67858a..57574e4 100644 --- a/install/generator-cyphernode/generators/app/index.js +++ b/install/generator-cyphernode/generators/app/index.js @@ -327,6 +327,7 @@ module.exports = class extends Generator { lightning_nodename: '', lightning_nodecolor: '' }, this.props ); + this.props.default_username = process.env.DEFAULT_USER || ''; } _isChecked( name, value ) { diff --git a/install/generator-cyphernode/generators/app/templates/installer/start.sh b/install/generator-cyphernode/generators/app/templates/installer/start.sh index 0cec47a..189451e 100644 --- a/install/generator-cyphernode/generators/app/templates/installer/start.sh +++ b/install/generator-cyphernode/generators/app/templates/installer/start.sh @@ -1,7 +1,7 @@ #!/bin/sh # run as user <%= username %> -export USER=$(id -u <%= run_as_different_user?username:'' %>):$(id -g <%= run_as_different_user?username:'' %>) +export USER=$(id -u <%= run_as_different_user?username:default_username %>):$(id -g <%= run_as_different_user?username:default_username %>) export ARCH=$(uname -m) <% if (docker_mode == 'swarm') { %>