Refactoring install actions

.gitignore

@@ -1,5 +1,9 @@
 .idea/
 .vscode/
+.cache/
+.config/
+.home/
+
 output_*
 node_modules/
 var/

Makefile

@@ -10,16 +10,6 @@ ifeq ($(TARGET), prod)
 	APP_NPM_BUILD_CMD := build-prod
 endif
 
-# Installation
-
-install: build-docker install-php-deps install-js-deps
-
-install-php-deps:
-	./tools/composer install --no-interaction
-
-install-js-deps:
-	./tools/npm ci
-
 # Building
 
 clean:

Taskfile.yml

@@ -3,13 +3,50 @@
 version: '3'
 
 vars:
+  USER_ID:
+    sh: id -u
+  GROUP_ID:
+    sh: id -g
+
   PROJECT: "homepage"
   PHP_IMAGE: "{{.PROJECT}}-php"
   NODE_IMAGE: "{{.PROJECT}}-node"  
 
+  DOCKER_COMMON_OPTS: >-
+    --rm
+    --interactive
+    --tty
+    --user {{.USER_ID}}:{{.GROUP_ID}}
+    --volume /etc/passwd:/etc/passwd:ro
+    --volume /etc/group:/etc/group:ro
+    --volume "./:/srv/app"
+    --workdir "/srv/app"
+    -e XDG_CONFIG_HOME=/srv/app/.config
+    -e XDG_CACHE_HOME=/srv/app/.cache
+    -e HOME=/srv/app/.home
+
 tasks:
 
   build-docker:
     cmds:
       - docker build --file docker/php/Dockerfile --tag "{{.PHP_IMAGE}}" .
       - docker build --file docker/node/Dockerfile --tag "{{.NODE_IMAGE}}" .
+
+  composer:
+    cmds:
+      - docker run {{.DOCKER_COMMON_OPTS}} "{{.PHP_IMAGE}}" composer {{.CLI_ARGS}}
+
+  shell-node:
+    cmds:
+      - docker run {{.DOCKER_COMMON_OPTS}} "{{.NODE_IMAGE}}" bash
+
+  npm:
+    cmds:
+      - docker run {{.DOCKER_COMMON_OPTS}} "{{.NODE_IMAGE}}" npm {{.CLI_ARGS}}
+
+  install-dependencies:
+    cmds:
+      - task: composer
+        vars: { CLI_ARGS: "install" }
+      - task: npm
+        vars: { CLI_ARGS: "install" }

composer.json

@@ -9,7 +9,7 @@
         }
     ],
     "require": {
-        "php": "~7.4",
+        "php": "^8.0",
         "ext-tidy": "*"
     },
     "require-dev": {

docker/node/Dockerfile

@@ -1,3 +1,6 @@
-FROM node:12.22.3-alpine
+FROM node:12
 
-RUN npm install -g npm
+ENV npm_config_fund=false
+ENV npm_config_update_notifier=false
+
+WORKDIR /srv/app

docker/php/Dockerfile

@@ -1,5 +1,7 @@
 FROM php:8.1-cli
 
+ENV COMPOSER_FUND=0
+
 RUN apt-get update && apt-get install -y \
     curl \
     git \

tools/composer

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-source .env
-
-mkdir -p var/docker-cache/.composer
-
-docker run \
-    --rm \
-    --interactive \
-    --tty \
-    --user "$UID:$(id -g)" \
-    --volume /etc/passwd:/etc/passwd:ro \
-    --volume /etc/group:/etc/group:ro \
-    --volume "$PWD:/srv/app" \
-    --volume "$HOME:$HOME" \
-    --volume "$PWD/var/docker-cache/.composer:/tmp/.composer" \
-    --env COMPOSER_HOME=/tmp/.composer \
-    "${PHP_IMAGE}" \
-    composer "$@"

tools/npm

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-source .env
-
-mkdir -p var/docker-cache/.npm
-
-docker run \
-    --rm \
-    --interactive \
-    --tty \
-    --user "$UID:$(id -g)" \
-    --volume /etc/passwd:/etc/passwd:ro \
-    --volume /etc/group:/etc/group:ro \
-    --volume "$PWD:/srv/app" \
-    --volume "$HOME:$HOME" \
-    --volume "$PWD/var/docker-cache/.npm:/tmp/.npm" \
-    --env npm_config_cache=/tmp/.npm \
-    --workdir /srv/app \
-    "${NODE_IMAGE}" \
-    npm "$@"