Skip to content
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

chore: Fix condition syntax in Dockerfile #37270

Merged
merged 3 commits into from
Nov 7, 2024
Merged

chore: Fix condition syntax in Dockerfile #37270

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d23f861
chore: Fix condition syntax in Dockerfile
sharat87 Nov 7, 2024
024a43b
🐇 suggestions
sharat87 Nov 7, 2024
6c73943
correct typo in comment
mohanarpit Nov 7, 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
16 changes: 6 additions & 10 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,10 @@ RUN <<END
exit 1
fi

if ! [ -f server/mongo/server.jar && -f server/pg/server.jar ]; then
if ! [ -f server/mongo/server.jar -a -f server/pg/server.jar ]; then
echo "Missing one or both server.jar files in the right place. Are you using the build script?" >&2
exit 1
fi

mkdir -p ./editor ./rts

# Ensure all *.sh scripts are executable.
find . -name node_modules -prune -or -type f -name '*.sh' -print -exec chmod +x '{}' ';'

# Ensure all custom command-scripts have executable permission
chmod +x /opt/bin/*
END

# Add client UI - Application Layer
Expand All @@ -48,7 +40,11 @@ RUN <<END
rm -rf utils/node_modules/resolve/test
cd -

chmod +x /opt/bin/* *.sh /watchtower-hooks/*.sh
# Make all `*.sh` files executable, excluding `node_modules`.
find . \( -name node_modules -prune \) -o \( -type f -name '*.sh' \) -exec chmod +x '{}' +

# Ensure all custom command-scripts have executable permission
chmod +x /opt/bin/* /watchtower-hooks/*.sh

# Disable setuid/setgid bits for the files inside container.
find / \( -path /proc -prune \) -o \( \( -perm -2000 -o -perm -4000 \) -exec chmod -s '{}' + \) || true
Expand Down
Loading