From f2ac4f408413c1ca6515a876140411649aa84ada Mon Sep 17 00:00:00 2001 From: Leonardo Custodio Date: Fri, 8 Nov 2024 17:59:10 +0400 Subject: [PATCH 1/6] Update docker-compose.yml Signed-off-by: Leonardo Custodio --- docker-compose.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 942ac70..c8774ad 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.9" - services: database: image: mysql:8 @@ -28,13 +26,13 @@ services: decoder: platform: linux/amd64 - image: enjin/platform-decoder:v2.0.1 + image: enjin/platform-decoder:v2.1.2 restart: unless-stopped ports: - "${DECODER_EXTERNAL_PORT}:8090" app: - image: enjin/platform:v1.11.0 + image: enjin/platform:v2.0.0 build: context: . dockerfile: configs/core/Dockerfile @@ -50,7 +48,7 @@ services: - "host.docker.internal:host-gateway" websocket: - image: enjin/platform:v1.11.0 + image: enjin/platform:v2.0.0 build: context: . dockerfile: configs/core/Dockerfile @@ -66,7 +64,7 @@ services: - "host.docker.internal:host-gateway" ingest: - image: enjin/platform:v1.11.0 + image: enjin/platform:v2.0.0 build: context: . dockerfile: configs/core/Dockerfile @@ -80,7 +78,7 @@ services: - "host.docker.internal:host-gateway" relay: - image: enjin/platform:v1.11.0 + image: enjin/platform:v2.0.0 build: context: . dockerfile: configs/core/Dockerfile @@ -93,7 +91,7 @@ services: - "host.docker.internal:host-gateway" beam: - image: enjin/platform:v1.11.0 + image: enjin/platform:v2.0.0 build: context: . dockerfile: configs/core/Dockerfile @@ -107,7 +105,7 @@ services: daemon: platform: linux/amd64 - image: enjin/wallet-daemon:v1.9.0 + image: enjin/wallet-daemon:v2.0.1 restart: unless-stopped env_file: - ./configs/daemon/.env From 2ee6554bc6b08b780833f4b15f4d1c9ad9b1c484 Mon Sep 17 00:00:00 2001 From: Leonardo Custodio Date: Fri, 8 Nov 2024 18:00:32 +0400 Subject: [PATCH 2/6] Update composer.json Signed-off-by: Leonardo Custodio --- configs/core/composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/core/composer.json b/configs/core/composer.json index a083f4f..a63455a 100644 --- a/configs/core/composer.json +++ b/configs/core/composer.json @@ -20,12 +20,12 @@ } ], "require": { - "php": "^8.2|^8.3", - "enjin/platform-core": "^1.0", - "enjin/platform-beam": "^1.0", - "enjin/platform-fuel-tanks": "^1.0", - "enjin/platform-marketplace": "^1.0", - "enjin/platform-ui": "^1.0", + "php": "^8.3", + "enjin/platform-core": "^2.0", + "enjin/platform-beam": "^2.0", + "enjin/platform-fuel-tanks": "^2.0", + "enjin/platform-marketplace": "^2.0", + "enjin/platform-ui": "^2.0", "guzzlehttp/guzzle": "^7.0", "laravel/framework": "^11.0", "laravel/horizon": "^5.0", From 05f6ec2ab56e864bb16e06790da1a4c32bc00a2f Mon Sep 17 00:00:00 2001 From: Leonardo Custodio Date: Fri, 8 Nov 2024 18:01:25 +0400 Subject: [PATCH 3/6] Update Dockerfile Signed-off-by: Leonardo Custodio --- configs/core/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/core/Dockerfile b/configs/core/Dockerfile index 8fd8f04..896a084 100644 --- a/configs/core/Dockerfile +++ b/configs/core/Dockerfile @@ -25,7 +25,7 @@ FROM setup-web-server AS create-application WORKDIR /app/ COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer -RUN composer create-project laravel/laravel:^10.0 laravel-application +RUN composer create-project laravel/laravel:^11.0 laravel-application COPY configs/core/composer.json /app/laravel-application COPY configs/core/config/ /app/laravel-application/config/ From 6620f69cb5338a2e3a2651e3aa01aa013bbdaa28 Mon Sep 17 00:00:00 2001 From: Leonardo Custodio Date: Fri, 8 Nov 2024 11:21:15 -0300 Subject: [PATCH 4/6] Upgrade php version --- configs/core/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/core/Dockerfile b/configs/core/Dockerfile index 896a084..5c589bf 100644 --- a/configs/core/Dockerfile +++ b/configs/core/Dockerfile @@ -1,9 +1,9 @@ # Stage: setup-web-server -FROM php:apache-buster AS setup-web-server +FROM php:8.3-apache AS setup-web-server # Install dependencies RUN apt-get update -y && \ - apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python2 && \ + apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python3 && \ apt-get install -y libpq-dev libgmp-dev libsodium-dev libmemcached-dev zlib1g-dev wait-for-it libffi-dev golang-go && \ apt-get install -y inotify-tools libcurl4-openssl-dev libpq-dev libssl-dev supervisor dos2unix From 41ac5a5e1102bb6e5ebda31b874f2b97c5655e65 Mon Sep 17 00:00:00 2001 From: Leonardo Custodio Date: Fri, 8 Nov 2024 11:29:40 -0300 Subject: [PATCH 5/6] Fixes imagick --- configs/core/Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configs/core/Dockerfile b/configs/core/Dockerfile index 5c589bf..e1cbc5b 100644 --- a/configs/core/Dockerfile +++ b/configs/core/Dockerfile @@ -9,7 +9,11 @@ RUN apt-get update -y && \ # Install imagick and redis RUN apt-get install -y libmagickwand-dev --no-install-recommends && \ - pecl install imagick redis uv + pecl install redis uv + +# This is required on PHP 8.3 (check following issue: https://github.com/Imagick/imagick/issues/640) +ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ +RUN install-php-extensions imagick # Install node and npm RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - &&\ @@ -17,7 +21,7 @@ RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - &&\ # Install and enable additional php modules RUN docker-php-ext-install ffi pdo pdo_mysql gmp bcmath sodium mysqli sockets pcntl gd -RUN docker-php-ext-enable redis imagick +RUN docker-php-ext-enable redis # Stage: create-application FROM setup-web-server AS create-application From 100aa9a713a0d1d5f048eb176f269254ce7c2557 Mon Sep 17 00:00:00 2001 From: Leonardo Custodio Date: Fri, 8 Nov 2024 11:32:01 -0300 Subject: [PATCH 6/6] Fix imagick --- configs/core/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/core/Dockerfile b/configs/core/Dockerfile index e1cbc5b..b23dca1 100644 --- a/configs/core/Dockerfile +++ b/configs/core/Dockerfile @@ -13,7 +13,7 @@ RUN apt-get install -y libmagickwand-dev --no-install-recommends && \ # This is required on PHP 8.3 (check following issue: https://github.com/Imagick/imagick/issues/640) ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ -RUN install-php-extensions imagick +RUN install-php-extensions imagick/imagick@master # Install node and npm RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - &&\