fix composer install within test containers; rename user dir in those from build...

diff --git a/tests/ci/Dockerfile b/tests/ci/Dockerfile
index 792d787..e34f156 100644 (file)
--- a/tests/ci/Dockerfile
+++ b/tests/ci/Dockerfile
@@ -24,6 +24,6 @@ RUN chmod 755 /root/entrypoint.sh
 EXPOSE 80 443 8080
 
 # @todo can we avoid hardcoding this here? We can f.e. get it passed down as ARG...
-WORKDIR /home/docker/build
+WORKDIR /home/docker/workspace
 
 ENTRYPOINT ["/root/entrypoint.sh"]

diff --git a/tests/ci/docker/entrypoint.sh b/tests/ci/docker/entrypoint.sh
index bb3c826..58a496d 100644 (file)
--- a/tests/ci/docker/entrypoint.sh
+++ b/tests/ci/docker/entrypoint.sh
@@ -63,7 +63,7 @@ echo "[$(date)] Running Composer..."
 # @todo if there is a composer.lock file present, there are chances it might be a leftover from when running the
 #       container using a different php version. We should then back it up / do some symlink magic to make sure that
 #       it matches the current php version and a hash of composer.json...
-sudo "${USERNAME}" -c "cd ${TESTS_ROOT_DIR} && composer install"
+su "${USERNAME}" -c "cd ${TESTS_ROOT_DIR} && composer install"
 
 trap clean_up TERM
 

diff --git a/tests/ci/vm.sh b/tests/ci/vm.sh
index ac6ff87..e726d21 100755 (executable)
--- a/tests/ci/vm.sh
+++ b/tests/ci/vm.sh
@@ -12,7 +12,7 @@ export PHP_VERSION=${PHP_VERSION:-default}
 export UBUNTU_VERSION=${UBUNTU_VERSION:-focal}
 
 CONTAINER_USER=docker
-CONTAINER_BUILD_DIR="/home/${CONTAINER_USER}/build"
+CONTAINER_WORKSPACE_DIR="/home/${CONTAINER_USER}/workspace"
 ROOT_DIR="$(dirname -- "$(dirname -- "$(dirname -- "$(readlink -f "$0")")")")"
 IMAGE_NAME=phpxmlrpc:${UBUNTU_VERSION}-${PHP_VERSION}
 CONTAINER_NAME=phpxmlrpc_${UBUNTU_VERSION}_${PHP_VERSION}
@@ -56,7 +56,7 @@ build() {
         -p 80:80 -p 443:443 -p 8080:8080 \
         --name "${CONTAINER_NAME}" \
         --env CONTAINER_USER_UID=$(id -u) --env CONTAINER_USER_GID=$(id -g) \
-        --env TESTS_ROOT_DIR=${CONTAINER_BUILD_DIR} \
+        --env TESTS_ROOT_DIR=${CONTAINER_WORKSPACE_DIR} \
         --env HTTPSERVER=localhost \
         --env HTTPURI=/demo/server/server.php \
         --env HTTPSSERVER=localhost \
@@ -66,7 +66,7 @@ build() {
         --env HTTPSIGNOREPEER=1 \
         --env SSLVERSION=0 \
         --env DEBUG=0 \
-        -v "${ROOT_DIR}":"${CONTAINER_BUILD_DIR}" \
+        -v "${ROOT_DIR}":"${CONTAINER_WORKSPACE_DIR}" \
          "${IMAGE_NAME}"
 }
 
@@ -113,9 +113,9 @@ case "${ACTION}" in
     runcoverage)
         # @todo clean up /tmp/phpxmlrpc and .phpunit.result.cache
         if [ ! -d build ]; then mkdir build; fi
-        docker exec -t "${CONTAINER_NAME}" /home/${CONTAINER_USER}/build/tests/ci/setup/setup_code_coverage.sh enable
+        docker exec -t "${CONTAINER_NAME}" "${CONTAINER_WORKSPACE_DIR}/tests/ci/setup/setup_code_coverage.sh" enable
         docker exec -it "${CONTAINER_NAME}" su "${CONTAINER_USER}" -c "./vendor/bin/phpunit --coverage-html build/coverage -v tests"
-        docker exec -t "${CONTAINER_NAME}" /home/${CONTAINER_USER}/build/tests/ci/setup/setup_code_coverage.sh disable
+        docker exec -t "${CONTAINER_NAME}" "${CONTAINER_WORKSPACE_DIR}/tests/ci/setup/setup_code_coverage.sh" disable
         ;;
 
     runtests)