Updated ci tools and made sure chown is always executed when building the container

Author: bastianschwarz

.env.dist

@@ -0,0 +1,5 @@
+# UID and GID of your current user (e.g. wwwdev or developer). Can be looked up by using the linux command "id"
+# By default it is 1001 for vagrant vms (vagrant is 1000 and the next user is 1001)
+UID=1001
+GID=1001
+SSH_AUTH_SOCK=/run/user/1001/keyring/ssh

.idea/php.xml

@@ -43,6 +43,7 @@
     "composer-unused": "XDEBUG_MODE=off tools/composer-unused --no-progress --no-interaction",
     "composer-require-checker": "XDEBUG_MODE=off tools/composer-require-checker --no-interaction",
     "infection": "XDEBUG_MODE=coverage tools/infection --min-msi=100 --min-covered-msi=100 --threads=4 --no-progress --show-mutations",
+    "phive:update": "XDEBUG_MODE=off phive update && git add tools/* phive.xml && git commit tools/* -m 'Updated phive dependencies'",
     "ci-all": [
       "composer validate",
       "@phpunit",
@@ -58,6 +59,7 @@
     "composer-unused": "Checks for unused composer packages",
     "composer-require-checker": "Checks for missing required composer packages",
     "infection": "Creates mutation tests to discover missing test coverage",
+    "phive:update": "Updates phive dependencies and commits them",
     "ci-all": "Runs all ci tools in sequence"
   }
 }

composer.json

@@ -10,8 +10,9 @@ services:
         GID: ${GID:-1000}
     volumes:
       - ./:/app
-      - ${WORKSPACE_FOLDER:-.}/.devcontainer/data/.phive:/home/application/.phive
-      - ${WORKSPACE_FOLDER:-.}/.devcontainer/data/.ssh:/home/application/.ssh
+      - $HOME/.phive:/home/application/.phive
+      - $HOME/.ssh:/home/application/.ssh
+      - $HOME/.gitconfig:/home/application/.gitconfig
       - ${SSH_AUTH_SOCK:-/ssh-agent}:/ssh-agent # Forward local machine SSH key to docker
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro

docker-compose.yml

@@ -20,6 +20,7 @@ RUN set -x \
 
 WORKDIR /app
 
+ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache
 ARG UID
 ARG GID
 

docker/application/Dockerfile

@@ -16,9 +16,9 @@
   ~
   -->
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpunit" version="^9.0.1" installed="9.5.26" location="./tools/phpunit.phar" copy="true"/>
-  <phar name="psalm" version="^5.0" installed="5.0.0" location="./tools/psalm" copy="true"/>
-  <phar name="composer-unused" version="^0.8" installed="0.8.4" location="./tools/composer-unused" copy="true"/>
-  <phar name="composer-require-checker" version="^4.0" installed="4.2.0" location="./tools/composer-require-checker" copy="true"/>
+  <phar name="phpunit" version="^9.0.1" installed="9.5.27" location="./tools/phpunit.phar" copy="true"/>
+  <phar name="psalm" version="^5.0" installed="5.1.0" location="./tools/psalm" copy="true"/>
+  <phar name="composer-unused" version="^0.8" installed="0.8.5" location="./tools/composer-unused" copy="true"/>
+  <phar name="composer-require-checker" version="^4.0" installed="4.3.0" location="./tools/composer-require-checker" copy="true"/>
   <phar name="infection" version="^0.26" installed="0.26.16" location="./tools/infection" copy="true"/>
 </phive>