From 3969473b99cbe653c93b5372253725ed00830c09 Mon Sep 17 00:00:00 2001 From: "Ronald A. Richardson" Date: Fri, 9 Jun 2023 16:08:38 +0800 Subject: [PATCH] updated Dockerfile to handle permission issues and patch composer install and dump, as well as dependency updates for api --- api/composer.json | 4 ++-- api/composer.lock | 30 +++++++++++++++--------------- docker/Dockerfile | 15 ++++++--------- packages/core-api | 2 +- packages/storefront-api | 2 +- 5 files changed, 25 insertions(+), 28 deletions(-) diff --git a/api/composer.json b/api/composer.json index 30b5e95c..9cfdf8a3 100644 --- a/api/composer.json +++ b/api/composer.json @@ -6,9 +6,9 @@ "license": "MIT", "require": { "php": "^7.3|^8.0", - "fleetbase/core-api": "^1.0.6-alpha", + "fleetbase/core-api": "^1.0.7-alpha", "fleetbase/fleetops-api": "^1.0.2-alpha", - "fleetbase/storefront-api": "^1.0.1-alpha", + "fleetbase/storefront-api": "^1.0.2-alpha", "fruitcake/laravel-cors": "^2.0", "guzzlehttp/guzzle": "^7.0.1", "laravel/framework": "^8.75", diff --git a/api/composer.lock b/api/composer.lock index fe4e8c26..217db63c 100644 --- a/api/composer.lock +++ b/api/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0c48f488648424e57133c3479ecf9d2b", + "content-hash": "11e7059f6f618ea6033dd2ab553e0d4c", "packages": [ { "name": "aloha/twilio", @@ -2002,16 +2002,16 @@ }, { "name": "fleetbase/core-api", - "version": "1.0.6-alpha", + "version": "1.0.7-alpha", "source": { "type": "git", "url": "https://github.com/fleetbase/core-api.git", - "reference": "20890b9623c0ea8aa416d711fb45c15738025b6f" + "reference": "f3e10518eaa1f3f2f43778ed441497c6289e8bf0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fleetbase/core-api/zipball/20890b9623c0ea8aa416d711fb45c15738025b6f", - "reference": "20890b9623c0ea8aa416d711fb45c15738025b6f", + "url": "https://api.github.com/repos/fleetbase/core-api/zipball/f3e10518eaa1f3f2f43778ed441497c6289e8bf0", + "reference": "f3e10518eaa1f3f2f43778ed441497c6289e8bf0", "shasum": "" }, "require": { @@ -2085,7 +2085,7 @@ ], "support": { "issues": "https://github.com/fleetbase/core-api/issues", - "source": "https://github.com/fleetbase/core-api/tree/v1.0.6-alpha" + "source": "https://github.com/fleetbase/core-api/tree/v1.0.7-alpha" }, "funding": [ { @@ -2093,7 +2093,7 @@ "type": "github" } ], - "time": "2023-06-09T04:36:21+00:00" + "time": "2023-06-09T07:41:45+00:00" }, { "name": "fleetbase/fleetops-api", @@ -2179,21 +2179,21 @@ }, { "name": "fleetbase/storefront-api", - "version": "1.0.1-alpha", + "version": "1.0.2-alpha", "source": { "type": "git", "url": "https://github.com/fleetbase/storefront-api.git", - "reference": "0d0dee2b8a173757e0f4e5c4e12c98d6d6dda37e" + "reference": "44cb6d4d91ee1ba0c76476ec9d6273bf887f8883" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fleetbase/storefront-api/zipball/0d0dee2b8a173757e0f4e5c4e12c98d6d6dda37e", - "reference": "0d0dee2b8a173757e0f4e5c4e12c98d6d6dda37e", + "url": "https://api.github.com/repos/fleetbase/storefront-api/zipball/44cb6d4d91ee1ba0c76476ec9d6273bf887f8883", + "reference": "44cb6d4d91ee1ba0c76476ec9d6273bf887f8883", "shasum": "" }, "require": { - "fleetbase/core-api": "^1.0.0-alpha", - "fleetbase/fleetops-api": "^1.0.0-alpha", + "fleetbase/core-api": "^1.0.7-alpha", + "fleetbase/fleetops-api": "^1.0.2-alpha", "geocoder-php/google-maps-places-provider": "^1.4", "laravel-notification-channels/apn": "^3.8", "laravel-notification-channels/fcm": "^2.7", @@ -2251,7 +2251,7 @@ ], "support": { "issues": "https://github.com/fleetbase/storefront-api/issues", - "source": "https://github.com/fleetbase/storefront-api/tree/v1.0.1-alpha" + "source": "https://github.com/fleetbase/storefront-api/tree/v1.0.2-alpha" }, "funding": [ { @@ -2259,7 +2259,7 @@ "type": "github" } ], - "time": "2023-05-26T04:39:13+00:00" + "time": "2023-06-09T08:00:56+00:00" }, { "name": "fruitcake/laravel-cors", diff --git a/docker/Dockerfile b/docker/Dockerfile index 8225e527..71899ad7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -30,21 +30,18 @@ RUN curl -L https://github.com/springload/ssm-parent/releases/download/v1.4.3/ss && rm /tmp/ssm-parent.tar.gz # Install Composer -RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer +WORKDIR /var/www +COPY docker/composer-install.sh ./ +RUN chmod +x ./composer-install.sh && ./composer-install.sh # Setup application WORKDIR /var/www/html/api - -# Copy application files -COPY --chown=www-data:www-data api ./ +RUN mkdir -p ./storage/logs/ && ln -sf /dev/stdout ./storage/logs/laravel-$(date +'%Y-%m-%d').log RUN chown -R www-data:www-data /var/www/html/api -RUN chown -R www-data:www-data /var/www/html/api/bootstrap/cache -RUN chmod -R 755 /var/www/html/api/storage -RUN chmod -R 755 /var/www/html/api/bootstrap/cache +COPY --chown=www-data:nogroup api ./ USER www-data - -# Install Composer dependencies RUN composer install --no-dev --no-scripts --no-autoloader +RUN composer dumpautoload # Continue USER root diff --git a/packages/core-api b/packages/core-api index 20890b96..f3e10518 160000 --- a/packages/core-api +++ b/packages/core-api @@ -1 +1 @@ -Subproject commit 20890b9623c0ea8aa416d711fb45c15738025b6f +Subproject commit f3e10518eaa1f3f2f43778ed441497c6289e8bf0 diff --git a/packages/storefront-api b/packages/storefront-api index 0d0dee2b..44cb6d4d 160000 --- a/packages/storefront-api +++ b/packages/storefront-api @@ -1 +1 @@ -Subproject commit 0d0dee2b8a173757e0f4e5c4e12c98d6d6dda37e +Subproject commit 44cb6d4d91ee1ba0c76476ec9d6273bf887f8883