Merge pull request #1 from shochdoerfer/feature/gally_premium

shochdoerfer · web-flow · commit dcdf7a4b13d2 · 2025-12-20T20:08:56.000+01:00
Allow to install Gally Premium packages
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 0.1.2
+
+### Added
+
+- Support Gally Premium installation
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 0.1.1
 
 ### Added
diff --git a/README.md b/README.md
@@ -21,6 +21,18 @@ ddev restart
 
 After installation, make sure to commit the `.ddev` directory to version control.
 
+### Gally Premium Installation
+
+To install Gally Premium, set the `GALLY_PREMIUM_NAME` and `GALLY_PREMIUM_TOKEN` environment variables in `.ddev/.env.gally` before running `ddev restart`.
+
+If you want to use the AI features of Gally, you need to enable AI support for Opensearch by adding the following lines to the environment section in the file `.ddev/docker-compose.opensearch.yaml`:
+```yaml
+- plugins.ml_commons.only_run_on_ml_node=false
+- plugins.ml_commons.allow_registering_model_via_url=true
+- plugins.ml_commons.native_memory_threshold=100
+- plugins.ml_commons.jvm_heap_memory_threshold=100
+```
+
 ## Post-Installation steps
 
 To initialize the Gally database, run `ddev gally-cli doctrine:migrations:migrate`.
@@ -35,26 +47,28 @@ Make sure to commit the `.ddev/.env.gally` file to version control.
 
 All customization options (use with caution):
 
-| Variable                 | Default                                                   |
-|--------------------------|-----------------------------------------------------------|
-| GALLY_VERSION            | 2.2.0                                                     |
-| GALLY_HOSTNAME           | ${DDEV_SITENAME}-gally.ddev.site                          |
-| GALLY_CATALOG_MEDIA_URL  | https://${DDEV_SITENAME}.ddev.site/media/catalog/product/ |
-| GALLY_API_ROUTE_PREFIX   | api                                                       |
-| GALLY_APP_ENV            | prod                                                      |
-| GALLY_APP_DEBUG          | 0                                                         |
-| GALLY_APP_SECRET         | Bh9Phhoceiyasa7iebf22hah6OdfN8oh                          |
-| GALLY_DB_HOST            | gally-db                                                  |
-| GALLY_DB_PORT            | 5432                                                      |
-| GALLY_DB_NAME            | gally                                                     |
-| GALLY_DB_USER            | gally                                                     |
-| GALLY_DB_PASSWORD        | gally                                                     |
-| POSTGRES_VERSION         | 16                                                        |
-| VARNISH_VERSION          | 8.0                                                       |
-| REDIS_HOST               | redis                                                     |
-| REDIS_DB                 | 0                                                         |
-| OPENSEARCH_HOST          | opensearch                                                |
-| OPENSEARCH_PORT          | 9200                                                      |
+| Variable                | Default                                                   |
+|-------------------------|-----------------------------------------------------------|
+| GALLY_VERSION           | 2.2.0                                                     |
+| GALLY_PREMIUM_NAME      |                                                           |
+| GALLY_PREMIUM_TOKEN     |                                                           |
+| GALLY_HOSTNAME          | ${DDEV_SITENAME}-gally.ddev.site                          |
+| GALLY_CATALOG_MEDIA_URL | https://${DDEV_SITENAME}.ddev.site/media/catalog/product/ |
+| GALLY_API_ROUTE_PREFIX  | api                                                       |
+| GALLY_APP_ENV           | prod                                                      |
+| GALLY_APP_DEBUG         | 0                                                         |
+| GALLY_APP_SECRET        | Bh9Phhoceiyasa7iebf22hah6OdfN8oh                          |
+| GALLY_DB_HOST           | gally-db                                                  |
+| GALLY_DB_PORT           | 5432                                                      |
+| GALLY_DB_NAME           | gally                                                     |
+| GALLY_DB_USER           | gally                                                     |
+| GALLY_DB_PASSWORD       | gally                                                     |
+| POSTGRES_VERSION        | 16                                                        |
+| VARNISH_VERSION         | 8.0                                                       |
+| REDIS_HOST              | redis                                                     |
+| REDIS_DB                | 0                                                         |
+| OPENSEARCH_HOST         | opensearch                                                |
+| OPENSEARCH_PORT         | 9200                                                      |
 
 ## License
 
diff --git a/docker-compose.gally.yaml b/docker-compose.gally.yaml
@@ -6,14 +6,15 @@ services:
 
   gally:
     container_name: ddev-${DDEV_SITENAME}-gally
-    image: ddev-${DDEV_SITENAME}-gally:${GALLY_VERSION}
     labels:
       com.ddev.site-name: ${DDEV_SITENAME}
       com.ddev.approot: ${DDEV_APPROOT}
     build:
       context: ./gally
       args:
         - GALLY_VERSION=${GALLY_VERSION}
+        - GALLY_PREMIUM_NAME=${GALLY_PREMIUM_NAME}
+        - GALLY_PREMIUM_TOKEN=${GALLY_PREMIUM_TOKEN}
         - POSTGRES_VERSION=${POSTGRES_VERSION}
         - NEXT_PUBLIC_ENTRYPOINT=${GALLY_HOSTNAME}
         - NEXT_PUBLIC_API_URL=https://${GALLY_HOSTNAME}/${GALLY_API_ROUTE_PREFIX}
diff --git a/gally/Dockerfile b/gally/Dockerfile
@@ -4,12 +4,18 @@ FROM dunglas/frankenphp:1.11.0-php8.3-bookworm
 ARG GALLY_VERSION
 ENV GALLY_VERSION $GALLY_VERSION
 
+ARG GALLY_PREMIUM_NAME
+ENV GALLY_PREMIUM_NAME $GALLY_PREMIUM_NAME
+
+ARG GALLY_PREMIUM_TOKEN
+ENV GALLY_PREMIUM_TOKEN $GALLY_PREMIUM_TOKEN
+
 ARG POSTGRES_VERSION
 ENV POSTGRES_VERSION $POSTGRES_VERSION
 
 # Install global dependencies
 RUN apt-get update ; \
-    apt-get install -y curl gettext gnupg lsb-release openssl runit ; \
+    apt-get install -y curl gettext gnupg lsb-release openssl runit unzip ; \
     mkdir -p /var/log/frankenphp/ ; \
     mkdir -p /var/log/yarn/ ;
 
@@ -35,6 +41,16 @@ RUN install-php-extensions \
 RUN curl -L https://github.com/Elastic-Suite/gally/archive/refs/tags/v${GALLY_VERSION}.tar.gz | tar -xz --strip-components=1 ; \
     cd /app/api && composer install
 
+# Install Gally Premium if vars are defined
+RUN if [ -n "$GALLY_PREMIUM_NAME" ] && [ -n "$GALLY_PREMIUM_TOKEN" ]; then \
+      { \
+        cd /app/api; \
+        composer config http-basic.elasticsuite.repo.packagist.com token "${GALLY_PREMIUM_TOKEN}"; \
+        composer config repositories.gally-premium composer https://elasticsuite.repo.packagist.com/${GALLY_PREMIUM_NAME}/; \
+        composer require gally/gally-premium; \
+      }; \
+    fi
+
 # Install Gally PWA and dependencies
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash; \
     export NVM_DIR="/config/nvm"; \
diff --git a/gally/scripts/setup/env.php b/gally/scripts/setup/env.php
@@ -7,6 +7,8 @@
 $content = <<<EOT
 #ddev-generated
 GALLY_VERSION=2.2.0
+GALLY_PREMIUM_NAME=
+GALLY_PREMIUM_TOKEN=
 GALLY_HOSTNAME=$projectName-gally.ddev.site
 GALLY_CATALOG_MEDIA_URL=https://$projectName.ddev.site/media/catalog/product/
 GALLY_API_ROUTE_PREFIX=api
