Skip to content

fix(dashmate): invalid mount path from helper #2296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 31, 2024
Merged

fix(dashmate): invalid mount path from helper #2296

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b92f05
fix(dashmate): invalid mount path from helper
shumkov Oct 31, 2024
8917557
revert: DASHMATE_HELPER=1
shumkov Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/dashmate/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ services:
environment:
- LOCAL_UID=${LOCAL_UID:?err}
- LOCAL_GID=${LOCAL_GID:?err}
- DASHMATE_HOME_DIR=${DASHMATE_HOME_DIR:?err}
ports:
- 127.0.0.1:${DASHMATE_HELPER_API_PORT:?err}:${DASHMATE_HELPER_API_PORT:?err}
command: yarn workspace dashmate helper ${CONFIG_NAME:?err}
expose:
- ${DASHMATE_HELPER_API_PORT:?err}
volumes:
- ${DASHMATE_HOME_DIR:?err}:/home/dashmate/.dashmate
- ${DASHMATE_HOME_DIR:?err}:${DASHMATE_HOME_DIR:?err}
- /var/run/docker.sock:/var/run/docker.sock

core:
Expand Down
2 changes: 1 addition & 1 deletion packages/dashmate/docker/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ fi

echo "Starting with UID: $USER_ID, GID: $GROUP_ID, USER: $USERNAME, GROUP: $GROUP"

exec su - $USERNAME -c "cd /platform;DASHMATE_HELPER=1 DASHMATE_HOME_DIR=/home/dashmate/.dashmate $*"
exec su $USERNAME -c "cd /platform;DASHMATE_HOME_DIR=$DASHMATE_HOME_DIR $*"
1 change: 1 addition & 0 deletions packages/dashmate/scripts/helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import createDIContainer from '../src/createDIContainer.js';
// Register config collection in the container
container.register({
configFile: asValue(configFile),
isHelper: asValue(true),
});

const provider = config.get('platform.gateway.ssl.provider');
Expand Down
2 changes: 1 addition & 1 deletion packages/dashmate/src/createDIContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export default async function createDIContainer(options = {}) {
createConfigFile: asFunction(createConfigFileFactory).singleton(),
getConfigFileMigrations: asFunction(getConfigFileMigrationsFactory).singleton(),
migrateConfigFile: asFunction(migrateConfigFileFactory).singleton(),
isHelper: asValue(process.env.DASHMATE_HELPER === '1'),
isHelper: asValue(false),
getConnectionHost: asFunction(getConnectionHostFactory).singleton(),
generateEnvs: asFunction(generateEnvsFactory).singleton(),
getConfigProfiles: asFunction(getConfigProfilesFactory).singleton(),
Expand Down
Loading