Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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: 2 additions & 7 deletions ix-dev/community/reactive-resume/app.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
app_version: v5.0.20
app_version: v5.1.0
capabilities: []
categories:
- productivity
Expand All @@ -21,11 +21,6 @@ maintainers:
url: https://www.truenas.com/
name: reactive-resume
run_as_context:
- description: Container [chromedp] can run as any non-root user and group.
gid: 568
group_name: Host group is [apps]
uid: 568
user_name: Host user is [apps]
- description: Container [postgres] runs as non-root user and group.
gid: 999
group_name: Host group is [docker]
Expand All @@ -41,4 +36,4 @@ sources:
- https://github.com/amruthpillai/reactive-resume
title: Reactive Resume
train: community
version: 1.0.19
version: 1.0.20
6 changes: 1 addition & 5 deletions ix-dev/community/reactive-resume/ix_values.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
images:
image:
repository: ghcr.io/amruthpillai/reactive-resume
tag: v5.0.20
chromedp_image:
repository: chromedp/headless-shell
tag: 149.0.7808.0
tag: v5.1.0
container_utils_image:
repository: ixsystems/container-utils
tag: 1.0.2
Expand All @@ -17,7 +14,6 @@ images:

consts:
reactive_resume_container_name: reactive-resume
chromedp_container_name: chromedp
postgres_container_name: postgres
perms_container_name: permissions
db_user: reactive_resume
Expand Down
4 changes: 0 additions & 4 deletions ix-dev/community/reactive-resume/questions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,6 @@ questions:
enum:
- value: reactive-resume
description: reactive-resume
- value: chromedp
description: chromedp
- value: postgres
description: postgres
- variable: config
Expand Down Expand Up @@ -622,8 +620,6 @@ questions:
enum:
- value: reactive-resume
description: reactive-resume
- value: chromedp
description: chromedp
- value: postgres
description: postgres

Expand Down
21 changes: 4 additions & 17 deletions ix-dev/community/reactive-resume/templates/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
{% set rr_net = tpl.networks.create_internal("reactive-resume-net") %}

{% set resume = tpl.add_container(values.consts.reactive_resume_container_name, "image") %}
{% set chromedp = tpl.add_container(values.consts.chromedp_container_name, "chromedp_image") %}
{% set perm_container = tpl.deps.perms(values.consts.perms_container_name) %}
{% set perms_config = {"uid": values.run_as.user, "gid": values.run_as.group, "mode": "check"} %}

Expand All @@ -16,25 +15,13 @@
{% set postgres = tpl.deps.postgres(values.consts.postgres_container_name, values.reactive_resume.postgres_image_selector, pg_config, perm_container) %}
{% do postgres.container.add_network(rr_net) %}

{% set containers = [resume, chromedp] %}
{% for c in containers %}
{% do c.set_user(values.run_as.user, values.run_as.group) %}
{% do c.add_network(rr_net) %}
{% do c.depends.add_dependency(values.consts.postgres_container_name, "service_healthy") %}
{% endfor %}

{% do chromedp.healthcheck.set_test("tcp", {"port": values.consts.chromedp_port}) %}
{% do chromedp.environment.add_env("HOME", "/cache/chrome") %}
{% set tmp_config = {"type": "temporary", "volume_config": {"volume_name": "chrome-cache"}} %}
{% do chromedp.add_storage("/cache/chrome", tmp_config) %}
{% do perm_container.add_or_skip_action("chrome-cache", tmp_config, perms_config) %}
{% do resume.set_user(values.run_as.user, values.run_as.group) %}
{% do resume.add_network(rr_net) %}
{% do resume.depends.add_dependency(values.consts.postgres_container_name, "service_healthy") %}
Comment thread
stavros-k marked this conversation as resolved.

{% do resume.healthcheck.set_test("curl", {"port": values.network.web_port.port_number, "path": "/api/health"}) %}
{% do resume.depends.add_dependency(values.consts.chromedp_container_name, "service_healthy") %}
{% do resume.healthcheck.set_test("http", {"port": values.network.web_port.port_number, "path": "/api/health"}) %}
{% do resume.environment.add_env("PORT", values.network.web_port.port_number) %}
{% do resume.environment.add_env("APP_URL", values.reactive_resume.base_url.rstrip("/")) %}
{% do resume.environment.add_env("PRINTER_APP_URL", "http://%s:%d" | format(values.consts.reactive_resume_container_name, values.network.web_port.port_number)) %}
{% do resume.environment.add_env("PRINTER_ENDPOINT", "http://%s:%d" | format(values.consts.chromedp_container_name, values.consts.chromedp_port)) %}
{% do resume.environment.add_env("AUTH_SECRET", values.reactive_resume.secret_key) %}
{% do resume.environment.add_env("DATABASE_URL", postgres.get_url("postgres")) %}

Expand Down
Loading