Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DAM plugin installed but not enabled + ImageGrid content block + composer updates #174

Merged
merged 8 commits into from
Sep 14, 2023
Merged

DAM plugin installed but not enabled + ImageGrid content block + composer updates #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4ec9a1a
Supervisord impl work in progress
ericdrosas87 Aug 25, 2023
15a942b
Cleaned up supervisord code
ericdrosas87 Aug 25, 2023
edd59ee
Updated composer.json to install new DAM plugin
ericdrosas87 Aug 25, 2023
27ca0a0
[F] ImageGrid content block
Sep 13, 2023
01d587f
[F] Composer updates
Sep 13, 2023
1e4b53b
[C] Bump project config dateModified
Sep 13, 2023
19464a9
[C] Downgrade craft to 4.4.15
Sep 14, 2023
aacc518
[C] Re-up craft to 4.5.3
Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
ARG BASE_TAG=latest
# Composer dependencies
FROM composer:2 as vendor

LABEL maintainer="[email protected]"

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

FROM us-central1-docker.pkg.dev/skyviewer/public-images/craft-base-image:$BASE_TAG

LABEL maintainer="[email protected]"

USER root

# Copy in custom code from the host machine.
WORKDIR /var/www/html
COPY --chown=www-data:www-data api/ ./

COPY --from=vendor --chown=www-data:www-data /app/vendor ./vendor
RUN mkdir /var/secrets && [ -d ./storage ] || mkdir storage

USER www-data

CMD ["supervisord"]
4 changes: 3 additions & 1 deletion api/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@

# Miscellenious
/log
/tmp
/tmp

supervisor.log
18 changes: 14 additions & 4 deletions api/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@
"carlcs/craft-assetmetadata": "^4.0",
"castiron/next-builds": "^1.0",
"craftcms/aws-s3": "2.0.3",
"craftcms/cms": "4.4.14",
"craftcms/cms": "4.5.4",
"craftcms/contact-form": "3.0.1",
"craftcms/contact-form-honeypot": "^2.0.0",
"craftcms/google-cloud": "^2.0.0",
"craftcms/redactor": "3.0.4",
"jamesedmonston/graphql-authentication": "2.4.0",
"jamesedmonston/graphql-authentication": "2.5.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",
"spicyweb/craft-neo": "3.8.0",
"spicyweb/craft-neo": "3.8.6",
"venveo/craft-bulkedit": "4.0.1",
"verbb/super-table": "3.0.9",
"vlucas/phpdotenv": "^3.4.0",
Expand All @@ -23,9 +24,18 @@
"type": "vcs",
"url": "https://github.com/lsst-epo/craft-canto-dam-integrator.git"
},
{
"type": "vcs",
"url": "https://github.com/lsst-epo/canto-dam-assets.git"
},
{
"type": "path",
"url": "plugins/nextbuilds"
},
{
"type": "composer",
"url": "https://composer.craftcms.com",
"canonical": false
}
],
"require-dev": {
Expand Down Expand Up @@ -55,4 +65,4 @@
},
"minimum-stability": "dev",
"prefer-stable": true
}
}
Loading