diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 7134c69fa..422e77cf5 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -7,6 +7,7 @@ "workspaceFolder": "/workspace", "shutdownAction": "stopCompose", "postCreateCommand": "/docker-init.sh", + "postStartCommand": "/docker-start.sh", "containerEnv": { "EDITOR_VSCODE": "true" }, diff --git a/docker/app.Dockerfile b/docker/app.Dockerfile index 5ff03a5c9..c8e0fe7ad 100644 --- a/docker/app.Dockerfile +++ b/docker/app.Dockerfile @@ -42,7 +42,9 @@ RUN rm -rf /tmp/library-scripts # Copy the startup file COPY docker/scripts/app-init.sh /docker-init.sh +COPY docker/scripts/app-start.sh /docker-start.sh RUN sed -i 's/\r$//' /docker-init.sh && chmod +x /docker-init.sh +RUN sed -i 's/\r$//' /docker-start.sh && chmod +x /docker-start.sh # Fix user UID / GID to match host RUN groupmod --gid $USER_GID $USERNAME \ diff --git a/docker/scripts/app-init.sh b/docker/scripts/app-init.sh index f04e5c0a6..dd8404b10 100755 --- a/docker/scripts/app-init.sh +++ b/docker/scripts/app-init.sh @@ -94,14 +94,13 @@ echo "Running initial checks..." /usr/local/bin/python $WORKSPACEDIR/ietf/manage.py migrate --fake-initial --settings=settings_local -echo "-----------------------------------------------------------------" -echo "Done!" -echo "-----------------------------------------------------------------" - if [ -z "$EDITOR_VSCODE" ]; then CODE=0 python -m smtpd -n -c DebuggingServer localhost:2025 & if [ -z "$*" ]; then + echo "-----------------------------------------------------------------" + echo "Ready!" + echo "-----------------------------------------------------------------" echo echo "You can execute arbitrary commands now, e.g.," echo diff --git a/docker/scripts/app-start.sh b/docker/scripts/app-start.sh new file mode 100644 index 000000000..c3369bab9 --- /dev/null +++ b/docker/scripts/app-start.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +sudo service rsyslog start &>/dev/null + +# Run nginx + +echo "Starting nginx..." +pidof nginx >/dev/null && echo "nginx is already running [ OK ]" || sudo nginx + +# Run memcached + +echo "Starting memcached..." +pidof memcached >/dev/null && echo "memcached is already running [ OK ]" || /usr/bin/memcached -u dev -d + +echo "-----------------------------------------------------------------" +echo "Ready!" +echo "-----------------------------------------------------------------"