Skip to content

Commit 2c2a336

Browse files
authored
Merge pull request #67 from wiseflat/dev/mgarcia/simple-stack-development-environment-1
simple stack development environment fix
2 parents 42da9ec + 2ee6b7a commit 2c2a336

4 files changed

Lines changed: 7 additions & 2 deletions

File tree

ansible/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ ARG JAVA_VERSION=21
44

55
RUN apt-get update && apt-get install --no-install-recommends -y \
66
bash \
7+
vim \
78
git \
89
curl \
910
unzip \

ansible/playbooks/saas/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

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

3232
- name: Debug software
3333
ansible.builtin.debug:

ansible/playbooks/saas/roles/simplestack_ansible/templates/nomad.hcl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,15 @@ job "{{ domain }}" {
4242
SIMPLE_STACK_UI_USER = "{{ lookup('simple-stack-ui', type='secret', key=domain, subkey='user', missing='error') }}"
4343
SIMPLE_STACK_UI_PASSWORD = "{{ lookup('simple-stack-ui', type='secret', key=domain, subkey='password', missing='error') }}"
4444
SIMPLE_STACK_UI_URL = "{{ lookup('simple-stack-ui', type='secret', key=domain, subkey='url', missing='error') }}"
45+
GITHUB_API_TOKEN = "{{ lookup('simple-stack-ui', type='secret', key=domain, subkey='github_api_token', missing='error') }}"
4546
}
4647

4748
config {
4849
image = "ghcr.io/wiseflat/simple-stack-ansible:v{{ softwares.simplestack_ui.version }}"
4950
ports = ["http"]
51+
volumes = [
52+
"/root/.ssh:/root/.ssh:ro"
53+
]
5054
work_dir = "/ansible"
5155
command = "ansible-rulebook"
5256
args = ["-r", "rulebook.yml", "-i", "inventory.py", "-vvv"]

ui/schemas/softwares.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ NEWSCHEMA('Softwares', function (schema) {
7171
.promise($);
7272

7373
const settings = await DATA.read('nosql/variables')
74-
.where('key', 'catalogs')
74+
.where('key', 'softwares')
7575
.where('type', 'settings')
7676
.promise($);
7777

0 commit comments

Comments
 (0)