From e4b27c55bffa727da76fcbe85af45377852d2de9 Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Wed, 25 Dec 2024 10:32:08 +0300
Subject: [PATCH] Move image building to taskfile

---
 Makefile                |  3 ---
 docker/php/Dockerfile   | 26 +++++++++++++++++++++++---
 docker/php/provision.sh | 30 ------------------------------
 tools/build-docker      | 15 ---------------
 4 files changed, 23 insertions(+), 51 deletions(-)
 delete mode 100755 docker/php/provision.sh
 delete mode 100755 tools/build-docker

diff --git a/Makefile b/Makefile
index fdb8428..3c93598 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,6 @@ endif
 
 install: build-docker install-php-deps install-js-deps
 
-build-docker:
-	./tools/build-docker
-
 install-php-deps:
 	./tools/composer install --no-interaction
 
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index 2e8e4bf..d949d8d 100644
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@ -1,7 +1,27 @@
-FROM php:7.4.21-cli
+FROM php:8.1-cli
 
-COPY ./docker/php/provision.sh /opt/
+RUN apt-get update && apt-get install -y \
+    curl \
+    git \
+    gnupg \
+    gzip \
+    libtidy-dev \
+    rsync \
+    zip \
+;
 
-RUN /opt/provision.sh
+RUN docker-php-ext-install tidy \
+    && docker-php-ext-enable tidy
+
+# Composer and required tools
+RUN curl -sLO https://getcomposer.org/download/2.8.4/composer.phar \
+    && mv composer.phar /usr/local/bin/composer \
+    && chmod +x /usr/local/bin/composer
+
+
+# PHP-CS-Fixer
+RUN curl -sLO https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v3.65.0/php-cs-fixer.phar \
+    && mv php-cs-fixer.phar /usr/local/bin/php-cs-fixer \
+    && chmod +x /usr/local/bin/php-cs-fixer
 
 WORKDIR /srv/app
diff --git a/docker/php/provision.sh b/docker/php/provision.sh
deleted file mode 100755
index 2bb50e5..0000000
--- a/docker/php/provision.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env sh
-
-set -eux
-
-apt-get update && apt-get install -y \
-    curl \
-    git \
-    gnupg \
-    gzip \
-    libtidy-dev \
-    rsync \
-    zip \
-;
-
-docker-php-ext-install tidy \
-    && docker-php-ext-enable tidy
-
-# Project folder
-mkdir -p /srv/app
-
-# Composer and required tools
-curl -sLO https://getcomposer.org/download/2.3.10/composer.phar \
-    && mv composer.phar /usr/local/bin/composer \
-    && chmod +x /usr/local/bin/composer
-
-
-# PHP-CS-Fixer
-curl -sLO https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v3.9.5/php-cs-fixer.phar \
-    && mv php-cs-fixer.phar /usr/local/bin/php-cs-fixer \
-    && chmod +x /usr/local/bin/php-cs-fixer
diff --git a/tools/build-docker b/tools/build-docker
deleted file mode 100755
index 9daadfb..0000000
--- a/tools/build-docker
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-source .env
-
-docker build \
-    --file docker/php/Dockerfile \
-    --tag "${PHP_IMAGE}" \
-    "$PWD"
-
-docker build \
-    --file docker/node/Dockerfile \
-    --tag "${NODE_IMAGE}" \
-    "$PWD"