diff --git a/Dockerfile b/Dockerfile index d0bed5f7..be85faa6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,9 @@ ARG BASE_TAG=latest -LABEL maintainer="eric.rosas@noirlab.edu" # Composer dependencies FROM composer:2 as vendor + +LABEL maintainer="eric.rosas@noirlab.edu" + COPY api/composer.json composer.json COPY api/composer.lock composer.lock COPY api/plugins ./plugins diff --git a/api/composer.json b/api/composer.json index d010d6e3..d44cdfe0 100755 --- a/api/composer.json +++ b/api/composer.json @@ -9,7 +9,7 @@ "craftcms/google-cloud": "^2.0.0", "craftcms/redactor": "3.0.4", "jamesedmonston/graphql-authentication": "2.4.0", - "lsst-epo/canto-dam-assets": "^1.0", + "lsst-epo/canto-dam-assets": "dev-develop-v4", "lsst/canto-dam-integrator": "dev-EPO-7854#v0.3.2", "rynpsc/craft-phone-number": "^2.1.0", "sebastianlenz/linkfield": "^2.1.4", @@ -25,8 +25,8 @@ "url": "https://github.com/lsst-epo/craft-canto-dam-integrator.git" }, { - "type": "path", - "url": "plugins/canto-dam-assets" + "type": "vcs", + "url": "https://github.com/lsst-epo/canto-dam-assets.git" }, { "type": "path", diff --git a/api/composer.lock b/api/composer.lock index 1bca492e..de32855e 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": "660f7a89822d3e91e2bef2f80c31d344", + "content-hash": "e5025817109384bfb93e07c48ca23c07", "packages": [ { "name": "abraham/twitteroauth", @@ -3431,12 +3431,18 @@ }, { "name": "lsst-epo/canto-dam-assets", - "version": "1.0.0", - "dist": { - "type": "path", - "url": "plugins/canto-dam-assets", + "version": "dev-develop-v4", + "source": { + "type": "git", + "url": "https://github.com/lsst-epo/canto-dam-assets.git", "reference": "a7351e63f1b5ab1937ca79c0f59a66c9848f0d84" }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/lsst-epo/canto-dam-assets/zipball/a7351e63f1b5ab1937ca79c0f59a66c9848f0d84", + "reference": "a7351e63f1b5ab1937ca79c0f59a66c9848f0d84", + "shasum": "" + }, "require": { "craftcms/cms": "^4.4.0", "nystudio107/craft-plugin-vite": "^4.0.0", @@ -3446,6 +3452,7 @@ "craftcms/ecs": "dev-main", "craftcms/phpstan": "dev-main" }, + "default-branch": true, "type": "craft-plugin", "extra": { "handle": "_canto-dam-assets", @@ -3482,9 +3489,7 @@ "issues": "https://github.com/lsst-epo/canto-dam-assets/issues", "source": "https://github.com/lsst-epo/canto-dam-assets/" }, - "transport-options": { - "relative": true - } + "time": "2023-08-16T14:57:28+00:00" }, { "name": "lsst/canto-dam-integrator", @@ -7894,6 +7899,7 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { + "lsst-epo/canto-dam-assets": 20, "lsst/canto-dam-integrator": 20 }, "prefer-stable": true, diff --git a/api/plugins/canto-dam-assets b/api/plugins/canto-dam-assets deleted file mode 160000 index a7351e63..00000000 --- a/api/plugins/canto-dam-assets +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a7351e63f1b5ab1937ca79c0f59a66c9848f0d84 diff --git a/composer.json b/composer.json deleted file mode 100644 index 2c63c085..00000000 --- a/composer.json +++ /dev/null @@ -1,2 +0,0 @@ -{ -}