From a761e24109ee7e0c59666d20d720989cf27fc006 Mon Sep 17 00:00:00 2001 From: MarkoBosnjak98 Date: Thu, 8 May 2025 14:48:37 +0200 Subject: [PATCH 1/3] Remove chowns from dockerfile --- Dockerfile | 11 ++++++++++- cloud/entrypoint.sh | 25 ++++++------------------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3a80d28e18..e6532d8288 100644 --- a/Dockerfile +++ b/Dockerfile @@ -65,16 +65,25 @@ 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 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 RUN chmod +x /entrypoint.sh && \ chmod +x /var/init_data/on-event-extension-install.sh && \ chown -R devuser:devusergroup /pythagora && \ chown -R devuser: /var/init_data/ + # Create workspace directory 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..2e601abd0a 100644 --- a/cloud/entrypoint.sh +++ b/cloud/entrypoint.sh @@ -1,4 +1,9 @@ #!/bin/bash + +set -e +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 +25,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 From 6c68e5898c43f3404d145f1b8852d971846fa795 Mon Sep 17 00:00:00 2001 From: MarkoBosnjak98 Date: Fri, 9 May 2025 09:17:47 +0200 Subject: [PATCH 2/3] Remove date and set x --- cloud/entrypoint.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cloud/entrypoint.sh b/cloud/entrypoint.sh index 2e601abd0a..c4f31bae9c 100644 --- a/cloud/entrypoint.sh +++ b/cloud/entrypoint.sh @@ -1,8 +1,9 @@ #!/bin/bash set -e -export PS4='+ $(date "+%Y-%m-%d %H:%M:%S") ' -set -x +# 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 From 4215f1c20ae210767f862b6e4180b99c9f657e2a Mon Sep 17 00:00:00 2001 From: MarkoBosnjak98 Date: Fri, 9 May 2025 09:23:17 +0200 Subject: [PATCH 3/3] Fix icon comment --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e6532d8288..f81bd888e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,7 +66,7 @@ RUN mkdir -p /usr/local/share/code-server/data/User/globalStorage && \ 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 && \ - # Copy icons before changing permissions + # 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 @@ -75,7 +75,6 @@ RUN chmod +x /entrypoint.sh && \ chmod +x /var/init_data/on-event-extension-install.sh && \ chown -R devuser:devusergroup /pythagora && \ chown -R devuser: /var/init_data/ - # Create workspace directory RUN mkdir -p ${PYTH_INSTALL_DIR}/pythagora-core/workspace && \