Switch to PHP 8

Author: rybakit

.dockerignore

@@ -1 +1,11 @@
-vendor
+**/*.log
+**/*.md
+**/*.php~
+**/._*
+**/.dockerignore
+**/.DS_Store
+**/.gitignore
+**/Dockerfile
+**/Thumbs.db
+var/
+vendor/

.gitignore

@@ -1,6 +1,5 @@
-vendor
-composer.lock
-composer.phar
-public/admin/downloads
-public/admin/ext-6.2.0/
-public/admin/fontawesome-free-5.0.6/
+/var
+/vendor
+/public/admin/downloads
+/public/admin/ext-6.2.0/
+/public/admin/fontawesome-free-5.0.6/

Dockerfile

@@ -1,46 +1,60 @@
 # Build
-FROM php:7-apache as build
-WORKDIR /var/www/html
-RUN apt-get update && apt-get install -y git wget zip
+FROM php:8-apache AS build
+
+WORKDIR /build
+
+RUN apt-get update && apt-get install -y git wget zip libmpdec-dev \
+    && pecl install decimal \
+    && docker-php-ext-enable decimal
+
 RUN wget -q https://use.fontawesome.com/releases/v5.0.6/fontawesome-free-5.0.6.zip \
     && wget -q http://cdn.sencha.com/ext/gpl/ext-6.2.0-gpl.zip \
     && unzip -q ./fontawesome-free-5.0.6.zip \
     && unzip -q ./ext-6.2.0-gpl.zip
 
-ADD .git /var/www/html/.git
-RUN export CI_COMMIT_TAG=$(git describe --tags) \
-    && export CI_COMMIT_REF_NAME=$(git rev-parse --abbrev-ref HEAD) \
-    && export CI_COMMIT_SHA=$(git rev-parse --verify HEAD) \
-    && export CI_COMMIT_SHORT_SHA=$(git rev-parse --verify HEAD | head -c 8) \
-    && echo "<?php return ['tag'=>'$CI_COMMIT_TAG','sha'=>'$CI_COMMIT_SHA','short_sha'=>'$CI_COMMIT_SHORT_SHA','ref_name'=>'$CI_COMMIT_REF_NAME'];" > version.php
+COPY .git .git/
+RUN CI_COMMIT_TAG=$(git describe --tags) \
+    CI_COMMIT_REF_NAME=$(git rev-parse --abbrev-ref HEAD) \
+    CI_COMMIT_SHA=$(git rev-parse --verify HEAD) \
+    CI_COMMIT_SHORT_SHA=$(git rev-parse --verify HEAD | head -c 8) \
+    && echo "<?php return ['tag' => '$CI_COMMIT_TAG', 'sha' => '$CI_COMMIT_SHA', 'short_sha' => '$CI_COMMIT_SHORT_SHA','ref_name'=>'$CI_COMMIT_REF_NAME'];" > version.php
+
+COPY php php/
+COPY composer.json composer.lock ./
+
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+RUN composer install --prefer-dist --no-dev --no-autoloader --no-scripts --no-progress \
+    && composer dump-autoload --classmap-authoritative --no-dev \
+    && composer clear-cache
+
 
 # Runtime
-FROM php:7-apache
+FROM php:8-apache
 
 WORKDIR /var/www/html
 
 RUN apt-get update && apt-get install -y zip zlib1g-dev libzip-dev libmpdec-dev uuid-dev \
     && docker-php-ext-install zip opcache \
     && pecl install decimal uuid \
     && docker-php-ext-enable decimal uuid \
-    && curl -sS https://getcomposer.org/installer | php \
     && a2enmod rewrite
 
 RUN echo "ServerName tarantool-admin" > /etc/apache2/conf-enabled/server-name.conf
+RUN sed -i 's~DocumentRoot.*$~DocumentRoot /var/www/html/public~' /etc/apache2/sites-enabled/000-default.conf
 
-COPY --from=build /var/www/html/fontawesome-free-5.0.6/on-server ./admin/fontawesome-free-5.0.6
-COPY --from=build /var/www/html/ext-6.2.0/build/ext-all.js ./admin/ext-6.2.0/ext-all.js
-COPY --from=build /var/www/html/ext-6.2.0/build/classic/theme-crisp ./admin/ext-6.2.0/classic/theme-crisp
-
-ADD composer.json /var/www/html
-RUN php composer.phar install --no-dev
+RUN mkdir -p public/admin/downloads \
+    && chown www-data public/admin/downloads \
+    && chgrp www-data public/admin/downloads
 
-COPY --from=build /var/www/html/version.php .
+RUN mkdir var \
+    && chown www-data var \
+    && chgrp www-data var
 
-ADD public /var/www/html
-ADD . /var/www/html
+COPY php php/
+COPY public public/
 
-RUN mkdir admin/downloads -p \
-    && chown www-data admin/downloads \
-    && chgrp www-data admin/downloads \
-    && php composer.phar dump-autoload -o
+COPY --from=build /build/fontawesome-free-5.0.6/on-server public/admin/fontawesome-free-5.0.6
+COPY --from=build /build/ext-6.2.0/build/ext-all.js public/admin/ext-6.2.0/ext-all.js
+COPY --from=build /build/ext-6.2.0/build/classic/theme-crisp public/admin/ext-6.2.0/classic/theme-crisp
+COPY --from=build /build/vendor vendor/
+COPY --from=build /build/version.php var/

composer.json

@@ -1,20 +1,26 @@
 {
     "name": "basis-company/tarantool-admin",
+    "description": "A web interface for Tarantool.",
     "license": "MIT",
-    "require": {
-        "basis-company/framework" : "3.12.4",
-        "php": "^7.2",
-        "rybakit/msgpack": "0.7.2",
-        "symfony/uid": "^5.2.3",
-        "tarantool/mapper": "4.6.13"
-    },
     "authors": [{
         "name": "Dmitry Krokhin",
         "email": "[email protected]"
     }],
+    "require": {
+        "php": "^8",
+        "ext-decimal": "*",
+        "rybakit/msgpack": "^0.8",
+        "symfony/uid": "^5.3",
+        "tarantool/mapper": "^4.6",
+        "basis-company/framework": "^4.8",
+        "nyholm/psr7": "^1.4",
+        "symfony/http-client": "^5.3",
+        "symfony/cache": "^5.3",
+        "basis-company/opentelemetry": "^0.0.6"
+    },
     "autoload": {
         "psr-4": {
-            "": "php"
+            "": "php/"
         }
     }
 }