diff --git a/Dockerfile b/Dockerfile index 3a80d28e18..f81bd888e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -65,7 +65,11 @@ RUN mkdir -p /usr/local/share/code-server/data/User/globalStorage && \ mkdir -p /usr/local/share/code-server/data/Machine && \ mkdir -p /usr/local/share/code-server/data/logs && \ chown -R devuser:devusergroup /usr/local/share/code-server && \ - chmod -R 755 /usr/local/share/code-server + chmod -R 755 /usr/local/share/code-server && \ + # Copy icons + cp -f /favicon.ico /usr/local/lib/code-server/src/browser/media/favicon.ico && \ + cp -f /favicon.svg /usr/local/lib/code-server/src/browser/media/favicon-dark-support.svg && \ + cp -f /favicon.svg /usr/local/lib/code-server/src/browser/media/favicon.svg RUN chmod +x /entrypoint.sh && \ chmod +x /var/init_data/on-event-extension-install.sh && \ @@ -76,5 +80,9 @@ RUN chmod +x /entrypoint.sh && \ RUN mkdir -p ${PYTH_INSTALL_DIR}/pythagora-core/workspace && \ chown -R devuser:devusergroup ${PYTH_INSTALL_DIR}/pythagora-core/workspace +# Set up git config +RUN su -c "git config --global user.email 'devuser@pythagora.ai'" devuser && \ + su -c "git config --global user.name 'pythagora'" devuser + # Remove the USER directive to keep root as the running user ENTRYPOINT ["/entrypoint.sh"] \ No newline at end of file diff --git a/cloud/entrypoint.sh b/cloud/entrypoint.sh index 9b9828278f..c4f31bae9c 100644 --- a/cloud/entrypoint.sh +++ b/cloud/entrypoint.sh @@ -1,4 +1,10 @@ #!/bin/bash + +set -e +# Production instances are slow with date command and stderr +# export PS4='+ $(date "+%Y-%m-%d %H:%M:%S") ' +# set -x + echo "TASK: Entrypoint script started" export MONGO_DB_DATA=$PYTHAGORA_DATA_DIR/mongodata mkdir -p $MONGO_DB_DATA @@ -20,27 +26,9 @@ export DB_DIR=$PYTHAGORA_DATA_DIR/database chown -R devuser: $PYTHAGORA_DATA_DIR su -c "mkdir -p $DB_DIR" devuser -# Copy icons before changing permissions -cp -f /favicon.ico /usr/local/lib/code-server/src/browser/media/favicon.ico -cp -f /favicon.svg /usr/local/lib/code-server/src/browser/media/favicon-dark-support.svg -cp -f /favicon.svg /usr/local/lib/code-server/src/browser/media/favicon.svg -# Ensure code-server directories have correct permissions -chown -R devuser:devusergroup /usr/local/share/code-server -chmod -R 755 /usr/local/share/code-server - -set -e - # Start the VS Code extension installer/HTTP server script in the background su -c "cd /var/init_data/ && ./on-event-extension-install.sh" devuser -# Set up git config -su -c "git config --global user.email 'devuser@pythagora.ai'" devuser -su -c "git config --global user.name 'pythagora'" devuser - -# Mark entrypoint as done -su -c "touch /tmp/entrypoint.done" devuser - -echo "FINISH: Entrypoint script finished" - # Keep container running +echo "FINISH: Entrypoint script finished" tail -f /dev/null