From af2710e1566a98ad33d185b20f5e14b012f901db Mon Sep 17 00:00:00 2001 From: Jared Trouth Date: Tue, 27 Feb 2024 21:12:10 -0600 Subject: [PATCH] fixes --- Dockerfile | 2 +- api/composer.json | 4 +- api/composer.lock | 237 +++++++++------------------------------------- 3 files changed, 50 insertions(+), 193 deletions(-) diff --git a/Dockerfile b/Dockerfile index a73ad976..0ba689c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ LABEL maintainer="eric.rosas@noirlab.edu" COPY api/composer.json composer.json COPY api/composer.lock composer.lock COPY api/plugins ./plugins -RUN composer install --ignore-platform-reqs --no-interaction --prefer-dist +RUN composer install --ignore-platform-reqs --no-interaction --prefer-dist --optimize-autoloader --classmap-authoritative FROM us-central1-docker.pkg.dev/skyviewer/public-images/craft-base-image:$BASE_TAG diff --git a/api/composer.json b/api/composer.json index 04507a6f..d93de4eb 100755 --- a/api/composer.json +++ b/api/composer.json @@ -2,7 +2,6 @@ "require": { "carlcs/craft-assetmetadata": "^4.0", "castiron/next-builds": "^1.0", - "craftcms/aws-s3": "2.0.3", "craftcms/cms": "4.5.4", "craftcms/contact-form": "3.0.1", "craftcms/contact-form-honeypot": "^2.0.0", @@ -16,7 +15,8 @@ "venveo/craft-bulkedit": "4.0.1", "verbb/super-table": "3.0.9", "vlucas/phpdotenv": "^3.4.0", - "wrav/oembed": "^2.2.2" + "wrav/oembed": "^2.2.2", + "yiisoft/yii2-redis": "^2.0" }, "repositories": [ { diff --git a/api/composer.lock b/api/composer.lock index 3baea52c..29c8fa73 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": "60ef3417ee155e314e4721aa96f83c8d", + "content-hash": "5e9f57c4830738a8f2a7912d3bd67682", "packages": [ { "name": "abraham/twitteroauth", @@ -924,65 +924,6 @@ "url": "https://github.com/craftcms/cms.git", "reference": "bf4756f4079d883852ce50343e4d9668558dfb1c" }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/craftcms/aws-s3/zipball/a04ee659490d53da879e302e660ba3807532a926", - "reference": "a04ee659490d53da879e302e660ba3807532a926", - "shasum": "" - }, - "require": { - "craftcms/cms": "^4.0.0-beta.1", - "craftcms/flysystem": "^1.0.0-beta.2", - "league/flysystem-aws-s3-v3": "^3.0.0", - "php": "^8.0.2" - }, - "require-dev": { - "craftcms/ecs": "dev-main", - "craftcms/phpstan": "dev-main", - "craftcms/rector": "dev-main" - }, - "type": "craft-plugin", - "extra": { - "name": "Amazon S3", - "handle": "aws-s3", - "documentationUrl": "https://github.com/craftcms/aws-s3/blob/master/README.md" - }, - "autoload": { - "psr-4": { - "craft\\awss3\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Pixel & Tonic", - "homepage": "https://pixelandtonic.com/" - } - ], - "description": "Amazon S3 integration for Craft CMS", - "keywords": [ - "Flysystem", - "aws", - "cms", - "craftcms", - "s3", - "yii2" - ], - "support": { - "docs": "https://github.com/craftcms/aws-s3/blob/master/README.md", - "email": "support@craftcms.com", - "issues": "https://github.com/craftcms/aws-s3/issues?state=open", - "rss": "https://github.com/craftcms/aws-s3/commits/master.atom", - "source": "https://github.com/craftcms/aws-s3" - }, - "time": "2023-03-16T22:49:16+00:00" - }, - { - "name": "craftcms/cms", - "version": "4.5.4", "dist": { "type": "zip", "url": "https://api.github.com/repos/craftcms/cms/zipball/bf4756f4079d883852ce50343e4d9668558dfb1c", @@ -3732,134 +3673,7 @@ }, { "name": "lsst-epo/canto-dam-assets", - "version": "dev-develop-v4", - "source": { - "type": "git", - "url": "https://github.com/lsst-epo/canto-dam-assets.git", - "reference": "23b37e676db58fc84171b78ad2f2089b90696247" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/lsst-epo/canto-dam-assets/zipball/23b37e676db58fc84171b78ad2f2089b90696247", - "reference": "23b37e676db58fc84171b78ad2f2089b90696247", - "shasum": "" - }, - "require": { - "craftcms/cms": "^4.4.0", - "nystudio107/craft-plugin-vite": "^4.0.0", - "php": ">=8.0.2" - }, - "require-dev": { - "craftcms/ecs": "dev-main", - "craftcms/phpstan": "dev-main" - }, - "default-branch": true, - "type": "craft-plugin", - "extra": { - "handle": "_canto-dam-assets", - "name": "Canto DAM Assets", - "developer": "nystudio107", - "documentationUrl": "https://github.com/lsst-epo/canto-dam-assets/blob/develop-v4/README.md", - "class": "lsst\\cantodamassets\\CantoDamAssets" - }, - "autoload": { - "psr-4": { - "lsst\\cantodamassets\\": "src/" - } - }, - "scripts": { - "check-cs": [ - "ecs check --ansi" - ], - "fix-cs": [ - "ecs check --ansi --fix" - ], - "phpstan": [ - "phpstan --memory-limit=1G" - ] - }, - "license": [ - "MIT" - ], - "authors": [ - { - "name": "nystudio107", - "homepage": "https://nystudio107.com" - } - ], - "description": "This Craft CMS plugin adds a Field Type with GraphQL support for the Canto Digital Asset Management (DAM) web system", - "support": { - "docs": "https://github.com/lsst-epo/canto-dam-assets/blob/develop-v4/README.md", - "issues": "https://github.com/lsst-epo/canto-dam-assets/issues", - "source": "https://github.com/lsst-epo/canto-dam-assets/" - }, - "time": "2023-10-10T03:01:45+00:00" - }, - { - "name": "lsst/canto-dam-integrator", - "version": "dev-EPO-7854", - "source": { - "type": "git", - "url": "https://github.com/lsst-epo/craft-canto-dam-integrator.git", - "reference": "3ddd7eb9b0f2de0fbf551ae45e14aca0e577274e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/lsst-epo/craft-canto-dam-integrator/zipball/3ddd7eb9b0f2de0fbf551ae45e14aca0e577274e", - "reference": "3ddd7eb9b0f2de0fbf551ae45e14aca0e577274e", - "shasum": "" - }, - "require": { - "craftcms/cms": "^4.4.0", - "daccess1/yii2-json-query-helper": "^1.0.0", - "nystudio107/craft-plugin-vite": "^4.0.0", - "php": ">=8.0.2" - }, - "require-dev": { - "craftcms/ecs": "dev-main", - "craftcms/phpstan": "dev-main" - }, - "type": "craft-plugin", - "extra": { - "handle": "_canto-dam-assets", - "name": "Canto DAM Assets", - "developer": "nystudio107", - "documentationUrl": "https://github.com/lsst-epo/canto-dam-assets/blob/develop-v4/README.md", - "class": "lsst\\cantodamassets\\CantoDamAssets" - }, - "autoload": { - "psr-4": { - "lsst\\cantodamassets\\": "src/" - } - }, - "scripts": { - "check-cs": [ - "ecs check --ansi" - ], - "fix-cs": [ - "ecs check --ansi --fix" - ], - "phpstan": [ - "phpstan --memory-limit=1G" - ] - }, - "authors": [ - { - "name": "nystudio107", - "homepage": "https://nystudio107.com" - } - ], - "description": "This Craft CMS plugin adds a Field Type with GraphQL support for the Canto Digital Asset Management (DAM) web system", - "support": { - "docs": "https://github.com/lsst-epo/canto-dam-assets/blob/develop-v4/README.md", - "issues": "https://github.com/lsst-epo/canto-dam-assets/issues", - "source": "https://github.com/lsst-epo/canto-dam-assets/" - }, - "time": "2023-08-16T14:57:28+00:00" - }, - { - "name": "lsst/canto-dam-integrator", - "version": "dev-EPO-7854", + "version": "4.0.9", "source": { "type": "git", "url": "https://github.com/lsst-epo/canto-dam-assets.git", @@ -3920,7 +3734,7 @@ "issues": "https://github.com/lsst-epo/canto-dam-assets/issues", "source": "https://github.com/lsst-epo/canto-dam-assets/" }, - "time": "2023-10-03T22:20:08+00:00" + "time": "2023-11-13T23:48:10+00:00" }, { "name": "mikehaertl/php-shellcommand", @@ -9412,6 +9226,49 @@ ], "time": "2022-11-18T17:16:47+00:00" }, + { + "name": "yiisoft/yii2-redis", + "version": "2.0.18", + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/yiisoft/yii2-redis/zipball/08aecdf44e091c5fae3411e719ac0fdb803ef594", + "reference": "08aecdf44e091c5fae3411e719ac0fdb803ef594", + "shasum": "" + }, + "require": { + "ext-openssl": "*", + "yiisoft/yii2": "~2.0.39" + }, + "type": "yii2-extension", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "yii\\redis\\": "src" + } + }, + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Carsten Brandt", + "email": "mail@cebe.cc" + } + ], + "description": "Redis Cache, Session and ActiveRecord for the Yii framework", + "keywords": [ + "active-record", + "cache", + "redis", + "session", + "yii2" + ], + "time": "2022-09-04T10:34:42+00:00" + }, { "name": "yiisoft/yii2-symfonymailer", "version": "2.0.4", @@ -9697,5 +9554,5 @@ "platform-overrides": { "php": "8.1.10" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" }