diff options
| author | Ewan Jones <[email protected]> | 2023-06-02 20:18:42 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-06-02 11:18:42 -0700 |
| commit | 0bbe3415268ee5772b7ae392a0dc3e128701c09e (patch) | |
| tree | 64b3f3d1234c4d1077f159e6fbf52783eb05f850 /public | |
| parent | 2ab0d596b5ec671052019dc910cc7f0e91f0f7f3 (diff) | |
| download | caprover-one-click-apps-0bbe3415268ee5772b7ae392a0dc3e128701c09e.tar.gz caprover-one-click-apps-0bbe3415268ee5772b7ae392a0dc3e128701c09e.zip | |
#942 - Penpot - adding environment variables to frontend (#943)
* #942 - Penpot - adding environment variables to frontend
Fixes #942
Nginx config can no longer be updated with custom `sed` commands in docker image as it is created by penpot image upon startup.
However environmen variables are now supported to configure the backend and exporter URI so update to those instead.
* penpot.yml - adding back frontend image
* penpot - update versions and simplify
Updating Penpot, PostgreSQL and Redis versions and ensuring frontend/backend/exporter all use the same version
* penpot - updating label for simplified variable
Diffstat (limited to 'public')
| -rw-r--r-- | public/v4/apps/penpot.yml | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/public/v4/apps/penpot.yml b/public/v4/apps/penpot.yml index ac912b4..87c3109 100644 --- a/public/v4/apps/penpot.yml +++ b/public/v4/apps/penpot.yml @@ -24,7 +24,7 @@ services: # Exporter $$cap_appname-exporter: - image: penpotapp/exporter:$$cap_penpot_exporter_version + image: penpotapp/exporter:$$cap_penpot_version restart: always environment: PENPOT_PUBLIC_URI: $$cap_public_uri @@ -34,7 +34,7 @@ services: # Backend $$cap_appname-backend: - image: penpotapp/backend:$$cap_penpot_backend_version + image: penpotapp/backend:$$cap_penpot_version volumes: - $$cap_appname-assets-data:/opt/data environment: @@ -66,15 +66,13 @@ services: # Frontend $$cap_appname: + image: penpotapp/frontend:$$cap_penpot_version volumes: - $$cap_appname-assets-data:/opt/data environment: PENPOT_FLAGS: $$cap_flags - caproverExtra: - dockerfileLines: - - FROM penpotapp/frontend:$$cap_penpot_frontend_version - - RUN sed -i 's/penpot-backend/srv-captain--$$cap_appname-backend/g' /etc/nginx/nginx.conf - - RUN sed -i 's/penpot-exporter/srv-captain--$$cap_appname-exporter/g' /etc/nginx/nginx.conf + PENPOT_BACKEND_URI: http://srv-captain--$$cap_appname-backend:6060 + PENPOT_EXPORTER_URI: http://srv-captain--$$cap_appname-exporter:6061 depends_on: - $$cap_appname-backend - $$cap_appname-exporter @@ -83,29 +81,19 @@ caproverOneClickApp: variables: - id: $$cap_postgres_version label: Postgres Version - defaultValue: '13' + defaultValue: '15' description: Checkout their docker description page for the valid tags https://hub.docker.com/_/postgres?tab=tags validRegex: /^([^\s^\/])+$/ - id: $$cap_redis_version label: Redis Version - defaultValue: '6' + defaultValue: '7' description: Checkout their docker description page for the valid tags https://hub.docker.com/_/redis?tab=description validRegex: /^([^\s^\/])+$/ - - id: $$cap_penpot_frontend_version - label: Penpot Frontend Version - defaultValue: '1.15.2-beta' + - id: $$cap_penpot_version + label: Penpot version for frontend, backend and exporter + defaultValue: '1.18.4' description: Checkout their docker page for the valid tags https://hub.docker.com/r/penpotapp/frontend/tags validRegex: /^([^\s^\/])+$/ - - id: $$cap_penpot_backend_version - label: Penpot Backend Version - defaultValue: '1.15.2-beta' - description: Checkout their docker page for the valid tags https://hub.docker.com/r/penpotapp/backend/tags - validRegex: /^([^\s^\/])+$/ - - id: $$cap_penpot_exporter_version - label: Penpot Exporter Version - defaultValue: '1.15.2-beta' - description: Checkout their docker page for the valid tags https://hub.docker.com/r/penpotapp/exporter/tags - validRegex: /^([^\s^\/])+$/ - id: $$cap_flags label: Penpot Flags defaultValue: enable-registration enable-login |