Skip to content

Commit 27ba56b

Browse files
authored
[Hold] Consistency fixes to -dev compose file for aap-dev (#1058)
1 parent ba13524 commit 27ba56b

File tree

5 files changed

+13
-11
lines changed

5 files changed

+13
-11
lines changed

tools/deploy/eda-api/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ spec:
2222
- -c
2323
- >-
2424
aap-eda-manage migrate
25-
&& aap-eda-manage create_initial_data
26-
&& scripts/create_superuser.sh
25+
&& ANSIBLE_REVERSE_RESOURCE_SYNC=false aap-eda-manage create_initial_data
26+
&& ANSIBLE_REVERSE_RESOURCE_SYNC=false scripts/create_superuser.sh
2727
&& aap-eda-manage runserver 0.0.0.0:8000
2828
env:
2929
- name: EDA_DATABASE_URL

tools/docker/docker-compose-dev-redis-tls.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ services:
156156
- -c
157157
- >-
158158
aap-eda-manage migrate
159-
&& aap-eda-manage create_initial_data
160-
&& scripts/create_superuser.sh
159+
&& ANSIBLE_REVERSE_RESOURCE_SYNC=false aap-eda-manage create_initial_data
160+
&& ANSIBLE_REVERSE_RESOURCE_SYNC=false scripts/create_superuser.sh
161161
&& aap-eda-manage runserver 0.0.0.0:8000
162162
ports:
163163
- "${EDA_API_PORT:-8000}:8000"

tools/docker/docker-compose-dev.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ services:
137137
- -c
138138
- >-
139139
aap-eda-manage migrate
140-
&& aap-eda-manage create_initial_data
141-
&& scripts/create_superuser.sh
140+
&& ANSIBLE_REVERSE_RESOURCE_SYNC=false aap-eda-manage create_initial_data
141+
&& ANSIBLE_REVERSE_RESOURCE_SYNC=false scripts/create_superuser.sh
142142
&& aap-eda-manage runserver 0.0.0.0:8000
143143
ports:
144144
- "${EDA_API_PORT:-8000}:8000"
@@ -252,7 +252,7 @@ services:
252252
restart: always
253253

254254
eda-webhook-api:
255-
image: "${EDA_IMAGE:-quay.io/ansible/eda-server:main}"
255+
image: ${EDA_IMAGE:-localhost/aap-eda}
256256
environment: *common-env
257257
command:
258258
- /bin/bash
@@ -269,6 +269,8 @@ services:
269269
interval: 30s
270270
timeout: 5s
271271
retries: 10
272+
volumes:
273+
- '../../:/app/src:z'
272274

273275
squid:
274276
image: ${EDA_SQUID_IMAGE:-quay.io/openshifttest/squid-proxy}:${EDA_SQUID_VERSION:-1.2.0}

tools/docker/docker-compose-mac.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ services:
8989
- -c
9090
- >-
9191
aap-eda-manage migrate
92-
&& aap-eda-manage create_initial_data
93-
&& scripts/create_superuser.sh
92+
&& ANSIBLE_REVERSE_RESOURCE_SYNC=false aap-eda-manage create_initial_data
93+
&& ANSIBLE_REVERSE_RESOURCE_SYNC=false scripts/create_superuser.sh
9494
&& aap-eda-manage runserver 0.0.0.0:8000
9595
ports:
9696
- '${EDA_API_PORT:-8000}:8000'

tools/docker/docker-compose-stage.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ services:
104104
- -c
105105
- >-
106106
aap-eda-manage migrate
107-
&& aap-eda-manage create_initial_data
108-
&& scripts/create_superuser.sh
107+
&& ANSIBLE_REVERSE_RESOURCE_SYNC=false aap-eda-manage create_initial_data
108+
&& ANSIBLE_REVERSE_RESOURCE_SYNC=false scripts/create_superuser.sh
109109
&& gunicorn -b 0.0.0.0:8000
110110
-w ${EDA_API_WORKERS:-4} aap_eda.wsgi
111111
--access-logfile -

0 commit comments

Comments
 (0)