Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
1 change: 1 addition & 0 deletions ansible/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ ARG JAVA_VERSION=21

RUN apt-get update && apt-get install --no-install-recommends -y \
bash \
vim \
git \
curl \
unzip \
Expand Down
2 changes: 1 addition & 1 deletion ansible/playbooks/saas/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

- name: Get software variables
ansible.builtin.set_fact:
software: "{{ lookup('simple-stack-ui', type='software', key=domain, subkey='', missing='warn') }}"
software: "{{ lookup('simple-stack-ui', type='software', key=domain, subkey='', missing='warn') | from_json }}"

- name: Debug software
ansible.builtin.debug:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,15 @@ job "{{ domain }}" {
SIMPLE_STACK_UI_USER = "{{ lookup('simple-stack-ui', type='secret', key=domain, subkey='user', missing='error') }}"
SIMPLE_STACK_UI_PASSWORD = "{{ lookup('simple-stack-ui', type='secret', key=domain, subkey='password', missing='error') }}"
SIMPLE_STACK_UI_URL = "{{ lookup('simple-stack-ui', type='secret', key=domain, subkey='url', missing='error') }}"
GITHUB_API_TOKEN = "{{ lookup('simple-stack-ui', type='secret', key=domain, subkey='github_api_token', missing='error') }}"
}

config {
image = "ghcr.io/wiseflat/simple-stack-ansible:v{{ softwares.simplestack_ui.version }}"
ports = ["http"]
volumes = [
"/root/.ssh:/root/.ssh:ro"
]
work_dir = "/ansible"
command = "ansible-rulebook"
args = ["-r", "rulebook.yml", "-i", "inventory.py", "-vvv"]
Expand Down
2 changes: 1 addition & 1 deletion ui/schemas/softwares.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ NEWSCHEMA('Softwares', function (schema) {
.promise($);

const settings = await DATA.read('nosql/variables')
.where('key', 'catalogs')
.where('key', 'softwares')
.where('type', 'settings')
.promise($);

Expand Down