diff --git a/workspace/kali/Dockerfile b/workspace/kali/Dockerfile index 2da3f89..ccc1acc 100644 --- a/workspace/kali/Dockerfile +++ b/workspace/kali/Dockerfile @@ -50,16 +50,19 @@ COPY shared/src/ubuntu/install/common_env/install_system_bash.sh /usr/bin/ COPY shared/src/ubuntu/install/common_env/configure_user_bash.sh /usr/bin/ # Run installations -RUN \ +RUN set -x && \ for SCRIPT in $INST_SCRIPTS; do \ + echo "Running $SCRIPT"; \ bash ${INST_DIR}${SCRIPT} || exit 1; \ done && \ - $STARTUPDIR/set_user_permission.sh $HOME && \ - rm -f /etc/X11/xinit/Xclients && \ + ls -l $STARTUPDIR && \ + ls -l /usr/bin/configure_user_bash.sh || true && \ + echo "HOME=$HOME" && \ chown 1000:0 $HOME && \ /usr/bin/configure_user_bash.sh && \ rm -Rf ${INST_DIR} + ########## End Customizations ########### # Userspace Runtime diff --git a/workspace/noble/Dockerfile b/workspace/noble/Dockerfile index 72dea2e..8e4539e 100644 --- a/workspace/noble/Dockerfile +++ b/workspace/noble/Dockerfile @@ -53,12 +53,14 @@ COPY shared/src/ubuntu/install/common_env/install_ruby_gems.sh /usr/bin/ COPY shared/src/ubuntu/install/common_env/install_system_bash.sh /usr/bin/ COPY shared/src/ubuntu/install/common_env/configure_user_bash.sh /usr/bin/ # Run installations -RUN \ +RUN set -x && \ for SCRIPT in $INST_SCRIPTS; do \ + echo "Running $SCRIPT"; \ bash ${INST_DIR}${SCRIPT} || exit 1; \ done && \ - $STARTUPDIR/set_user_permission.sh $HOME && \ - rm -f /etc/X11/xinit/Xclients && \ + ls -l $STARTUPDIR && \ + ls -l /usr/bin/configure_user_bash.sh || true && \ + echo "HOME=$HOME" && \ chown 1000:0 $HOME && \ /usr/bin/configure_user_bash.sh && \ rm -Rf ${INST_DIR} diff --git a/workspace/shared/src/ubuntu/install/slack/install_slack.sh b/workspace/shared/src/ubuntu/install/slack/install_slack.sh index aa9d8f2..2da437c 100644 --- a/workspace/shared/src/ubuntu/install/slack/install_slack.sh +++ b/workspace/shared/src/ubuntu/install/slack/install_slack.sh @@ -1,22 +1,27 @@ #!/usr/bin/env bash set -ex ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') - if [ "${ARCH}" == "arm64" ] ; then echo "Slack for arm64 currently not supported, skipping install" exit 0 fi - -version=4.12.2 - +version=4.38.125 wget -q https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/slack-desktop-${version}-${ARCH}.deb apt-get update - +# 👇 FIX for Kali: install missing dependency if needed +apt-get install -y libappindicator3-1 || true # 👇 FIX: allow downgrades apt-get install -y --allow-downgrades ./slack-desktop-${version}-${ARCH}.deb - rm slack-desktop-${version}-${ARCH}.deb sed -i 's,/usr/bin/slack,/usr/bin/slack --no-sandbox,g' /usr/share/applications/slack.desktop cp /usr/share/applications/slack.desktop $HOME/Desktop/ chmod +x $HOME/Desktop/slack.desktop chown 1000:1000 $HOME/Desktop/slack.desktop + +# Test that slack --version works +echo "Testing Slack installation..." +if slack --version; then + echo "✅ Slack installed successfully and version command works" +else + echo "❌ Slack version command failed, but package should be installed" +fi \ No newline at end of file