swh-loader-git: Unify entrypoint copy and format

It's copied at the end of the Dockerfile so modification to it do not rebuild
deps. The entrypoint script is also adapted to work with actual docker run
calls.

apps/swh-loader-git/Dockerfile

@@ -14,19 +14,20 @@ USER swh
 WORKDIR /opt/swh
 
 COPY --chown=swh:swh requirements-frozen.txt /opt/swh
-COPY --chown=swh:swh entrypoint.sh /opt/swh
 
 ENV PYTHONPATH=/opt/swh
 ENV PATH=/opt/swh/.local/bin:$PATH
 
-RUN chmod u+x /opt/swh/entrypoint.sh && \
-    /usr/local/bin/python -m pip install --upgrade pip && \
+RUN /usr/local/bin/python -m pip install --upgrade pip && \
     pip install --no-cache-dir -r requirements-frozen.txt && \
     pip install gunicorn
 
+COPY --chown=swh:swh entrypoint.sh /opt/swh
+RUN chmod u+x /opt/swh/entrypoint.sh
+
 ENV SWH_CONFIG_FILENAME=/etc/swh/config.yml
 ENV SWH_WORKER_INSTANCE=loader
 ENV CONCURRENCY=1
 ENV MAX_TASKS_PER_CHILD=1
 
-ENTRYPOINT "/opt/swh/entrypoint.sh"
+ENTRYPOINT ["/opt/swh/entrypoint.sh"]

apps/swh-loader-git/entrypoint.sh

@@ -2,28 +2,31 @@
 
 set -e
 
-# If a pod is killed by the OOM killer, the ephemeral volumes
-# are not recreated so it can remain the previous work dir content.
-echo "Cleaning /tmp..."
-rm -rf /tmp/*
-
 case "$1" in
-  "shell")
-    shift
-    echo "Running command $@"
-    exec bash -i "$@"
-    ;;
-  *)
-    echo Starting the swh Celery worker for ${SWH_WORKER_INSTANCE}
-    exec python -m celery \
-       --app=swh.scheduler.celery_backend.config.app \
-       worker \
-       --pool=prefork \
-       --concurrency=${CONCURRENCY} \
-       --max-tasks-per-child=${MAX_TASKS_PER_CHILD} \
-       -Ofair \
-       --loglevel=${SWH_LOG_LEVEL:-INFO} \
-       --without-gossip --without-mingle --without-heartbeat \
-       --hostname "${SWH_WORKER_INSTANCE}@%h"
-    ;;
+    "shell")
+        shift
+        if (( $# == 0)); then
+            exec bash -i
+        else
+            "$@"
+        fi
+        ;;
+    *)
+        # If a pod is killed by the OOM killer, there can remain previous
+        # workdir as the ephemeral volumes are not recreated
+        echo "Cleaning /tmp..."
+        rm -rf /tmp/*
+
+        echo Starting the swh Celery worker for ${SWH_WORKER_INSTANCE}
+        exec python -m celery \
+             --app=swh.scheduler.celery_backend.config.app \
+             worker \
+             --pool=prefork \
+             --concurrency=${CONCURRENCY} \
+             --max-tasks-per-child=${MAX_TASKS_PER_CHILD} \
+             -Ofair \
+             --loglevel=${SWH_LOG_LEVEL:-INFO} \
+             --without-gossip --without-mingle --without-heartbeat \
+             --hostname "${SWH_WORKER_INSTANCE}@%h"
+        ;;
 esac