Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2024-12-16 20:26:19 -05:00
Code Issues Activity

refactor(cli): keep alteration scripts folder writable by gid 0 (#6328)

Browse source 
facilitates running in rootless container with r/w mounted alteration-scripts
directory (fixed #6327)
This commit is contained in:
Bradford Powell 2024-09-26 00:47:26 -04:00 committed by GitHub
parent 349a6a405b
commit fc6f94f111
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Dockerfile
View file

@ -40,6 +40,7 @@ RUN rm -rf .scripts pnpm-*.yaml packages/cloud
FROM node:20-alpine as app FROM node:20-alpine as app
WORKDIR /etc/logto WORKDIR /etc/logto
COPY --from=builder /etc/logto . COPY --from=builder /etc/logto .
RUN mkdir -p /etc/logto/packages/cli/alteration-scripts && chmod g+w /etc/logto/packages/cli/alteration-scripts
EXPOSE 3001 EXPOSE 3001
ENTRYPOINT ["npm", "run"] ENTRYPOINT ["npm", "run"]
CMD ["start"] CMD ["start"]

23
packages/cli/src/commands/database/alteration/utils.ts
View file

@ -44,8 +44,27 @@ export const getAlterationFiles = async (): Promise<AlterationFile[]> => {
} }
// We need to copy alteration files to execute in the CLI context to make `slonik` available // We need to copy alteration files to execute in the CLI context to make `slonik` available
await fs.rm(localAlterationDirectory, { force: true, recursive: true }); // Notice that we don't remove the folder,
await fs.cp(alterationDirectory, localAlterationDirectory, { recursive: true }); // this ensures that the writabiliy remains (and also allows this to be a separately-mounted directory.
if (!existsSync(localAlterationDirectory)) {
await fs.mkdir(localAlterationDirectory, { recursive: true });
}
const oldFiles = await fs.readdir(localAlterationDirectory);
await Promise.all(
oldFiles.map(async (file) =>
fs.rm(path.join(localAlterationDirectory, file), { force: true, recursive: true })
)
);
const newFiles = await fs.readdir(alterationDirectory);
await Promise.all(
newFiles.map(async (file) =>
fs.cp(path.join(alterationDirectory, file), path.join(localAlterationDirectory, file), {
recursive: true,
preserveTimestamps: true,
})
)
);
const directory = await fs.readdir(localAlterationDirectory); const directory = await fs.readdir(localAlterationDirectory);
const files = directory.filter((file) => alterationFilenameRegex.test(file)); const files = directory.filter((file) => alterationFilenameRegex.test(file));