Use run-before-daemon to simplify implementation

.docker/Dockerfile

@@ -17,8 +17,7 @@ RUN mamba install -y -c conda-forge qe=${QE_VERSION} && \
     fix-permissions "${CONDA_DIR}" && \
     fix-permissions "/home/${SYSTEM_USER}"
 
-COPY s6-assets/s6-rc.d /etc/s6-overlay/s6-rc.d
-COPY s6-assets/init /etc/init
+COPY scripts/60-pseudo-code-setup.sh /etc/init/run-before-daemon-start/
 
 # Static example files
 RUN mkdir -p /opt/examples

.docker/s6-assets/init/run-before-daemon-start.sh → .docker/scripts/60-pseudo-code-setup.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
 # If lock file exists, then we have already run this script
-if [ -f ${HOME}/.run-before-daemon-start-done ]; then
+if [ -f ${HOME}/.lock_pseudo_code_setup ]; then
     exit 0
 else
-    touch ${HOME}/.run-before-daemon-start-done
+    touch ${HOME}/.lock_pseudo_code_setup
 fi
 
 # Install pseudopotential libraries

.docker/tests/conftest.py

@@ -23,16 +23,11 @@ def is_container_ready(dodkec_compose):
 @pytest.fixture(scope='session', autouse=True)
 def _docker_service_wait(docker_services):
     """Container startup wait."""
-    # XXX: Temporary fail the real run test because daemon start is should depened on
-    # run-before-daemon-start but it does not.
-
-    #docker_compose = docker_services._docker_compose
+    docker_compose = docker_services._docker_compose
 
-    #docker_services.wait_until_responsive(
-    #    timeout=120.0, pause=0.1, check=lambda: is_container_ready(docker_compose)
-    #)
-    import time
-    time.sleep(60)
+    docker_services.wait_until_responsive(
+        timeout=120.0, pause=0.1, check=lambda: is_container_ready(docker_compose)
+    )
 
 @pytest.fixture
 def container_user():

.docker/tests/test_aiida.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 # pylint: disable=missing-docstring
-import time
 
 def test_verdi_status(aiida_exec, container_user):
     output = aiida_exec('verdi status', user=container_user).decode().strip()