External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-02 10:08:10 -03:30
Code Issues Packages Projects Releases Wiki Activity
26,414 Commits 55 Branches 102 Tags
4fca57dfd225285e598e084aed1eb8d97d286dca
Commit Graph

78 Commits

Author SHA1 Message Date
Ryan Petrello
31ab386591 move tmux to dev dependencies 2020-06-19 08:47:11 -04:00
Shane McDonald
51b0c51605 Remove local port binding for postgres in dev env 
I dont think we need to bind this port at the host level. This will allow us to
run the galaxy_ng dev tooling side-by-side with AWX.
 2020-06-17 13:34:55 -04:00
Shane McDonald
de82c613fc Make tests pass with current versions of things 2020-06-15 23:13:44 -04:00
Shane McDonald
91dbc2de30 Add queue / instance group registration to heartbeat for k8s installs 
There is some history here.

https://github.com/ansible/awx/pull/7190 <- This PR was an attempt at fixing a
bug notting ran into where some jobs on k8s installs would get stuck in Waiting
forever.

The PR mentioned above introduced a bug where there are no instance groups on a
fresh k8s-based install. This is because this process currently happens in the
launch scripts, before the database is up.

With this patch, queue / instance group registration happens in the heartbeat,
right after auto-registering the instance.
 2020-06-06 08:58:35 -04:00
softwarefactory-project-zuul[bot]
4a5edf7b88 Merge pull request #7184 from wenottingham/a-preview-of-whats-to-come 
Remove dev env futzing of supervisord.conf permissions

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-04 21:47:02 +00:00
Bill Nottingham
64e3135754 Only build one awx image instead of separate web and task images 2020-06-03 10:48:48 -04:00
Bill Nottingham
559d917184 Make supervisor more consistent 
Configs go in /etc, sockets in /var/run/supervisor for all invocations.
 2020-06-02 19:51:16 -04:00
Bill Nottingham
131f5ff018 Remove dev env futzing of supervisord.conf permissions 
If we just link it into the dev env, we don't need to copy it at
startup, and we don't need write permissions on it.
 2020-05-28 13:12:57 -04:00
Jake McDermott
17efb34c6a Retry chromium download in zuul 2020-05-19 10:19:38 -04:00
Ryan Petrello
54178a1982 stop pre-generating awx.egg-info 2020-05-15 11:47:53 -04:00
Shane McDonald
c370cb4d93 Get OpenShift / arbitrary user ids working again 2020-05-15 08:32:43 -04:00
Bill Nottingham
6924466c0b Also precreate /venv in /dev with modifiable permissions. 2020-05-14 15:33:21 -04:00
Bill Nottingham
1808bed2e8 Add nss for the chrome UI unit tests 2020-05-14 15:32:06 -04:00
Bill Nottingham
8b51e8eb82 Stage rsyslog.conf from existing version so we don't have two copies. 2020-05-14 15:02:32 -04:00
Bill Nottingham
66245d3094 Reorganize both dev and prod container builds 
Use only one (templated) docker file for both builds.

Move to two-stage container builds in order to save space in the
final image.
 2020-05-14 15:02:32 -04:00
Seth Foster
4da0e0dd80 Vendor collections for isolated jobs to work in ansible 2.10 
kubectl and synchronize are now part of community.kubernetes
and ansible.posix collections, respectively. This change installs
these collections to a local directory to be used in inventory and
isolated management playbooks.

awx issue #6930
 2020-05-13 10:41:01 -04:00
Yanis Guenane
541b9607f5 Collections: Adding a requirements.yml file 2020-04-16 20:55:59 -04:00
softwarefactory-project-zuul[bot]
e19194b883 Merge pull request #6721 from shanemcd/dockerfile-cleanup 
Dockerfile organization

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-16 14:48:58 +00:00
Shane McDonald
29a582f869 Dockerfile organization 2020-04-15 14:43:59 -04:00
Christian Adams
c8ceb62269 Rename awx rsyslog socket and PID dir 2020-04-15 14:11:15 -04:00
Ryan Petrello
9440785bdd properly set the group on the rsyslog config 2020-04-13 19:46:34 -04:00
Christian Adams
5d54877183 Add action to default rsyslog.conf so supervisor starts correctly the first time 2020-04-13 11:44:00 -04:00
Christian Adams
b942fde59a Ensure log messages have valid json 
- Fix messages getting contatenated at 8k
 - Fix rsyslog cutting off the opening brace of log messages
 - Make valid default conf and emit logs based on prescence of .sock and
 settings
 2020-04-13 11:44:00 -04:00
Christian Adams
2329c1b797 Add rsyslog config to container from file for consistency 2020-04-13 11:43:59 -04:00
Christian Adams
4d5507d344 Add default rsyslog.conf without including /etc/rsyslog.conf 2020-04-13 11:43:59 -04:00
Shane McDonald
c0af3c537b Configure rsyslog to listen over a unix domain socket instead of a port 
- Add a placeholder rsyslog.conf so it doesn't fail on start
 - Create access restricted directory for unix socket to be created in
 - Create RSyslogHandler to exit early when logging socket doesn't exist
 - Write updated logging settings when dispatcher comes up and restart rsyslog so they  take effect
 - Move rsyslogd to the web container and create rpc supervisor.sock
 - Add env var for supervisor.conf path
 2020-04-13 11:43:59 -04:00
Christian Adams
955d57bce6 Upstream rsyslog packaging changes 
- add rsyslog repo to Dockerfile for AWX installation
 - Update Library Notes for requests-futures removal
 2020-04-13 11:43:59 -04:00
Shane McDonald
bb319136e4 Merge pull request #6585 from shanemcd/cleanup-cleanup 
Tidy up the dev environment a bit
 2020-04-06 13:09:39 -04:00
Shane McDonald
6fc815937b Tidy up the dev environment a bit 2020-04-06 11:13:51 -04:00
chris meyers
37a715c680 use memcached unix domain socket rather than tcp 2020-04-06 08:35:12 -04:00
chris meyers
770b457430 redis socket support 2020-03-18 16:10:19 -04:00
chris meyers
e94bb44082 replace rabbitmq with redis 
* local awx docker-compose and image build only.
 2020-03-18 16:10:17 -04:00
chris meyers
0b3e2cc7e3 pin virtualenv < 20 for awx_web builds 2020-02-11 08:43:26 -05:00
Shane McDonald
3f57061509 Add packages missing from base images 
Related:

- https://github.com/ansible/awx/issues/5770
- https://github.com/ansible/awx/issues/5724
 2020-02-07 13:06:42 -05:00
AlanCoding
d2289fe9c6 add pycurl to container images 2020-02-04 14:41:51 -05:00
Sven-Hendrik Haase
4c32faa448 Use more modern version of OpenShift client 
3.9 is pretty old by now.
 2019-11-19 13:29:06 +01:00
Andrea Galbusera
1198c067b2 ensure "create_preload_data" is honored in docker-compose deployments 
Use a templated version of launch_awx_task.sh which conditionally preloads
sample data according to create_preload_data value.
 2019-11-12 10:44:27 -05:00
Shane McDonald
089bafa5d4 Set setuid bit on bwrap 
Related: https://github.com/ansible/awx/issues/5224
 2019-11-04 11:10:09 -05:00
Shane McDonald
69597c5654 Sync Dockerfiles 2019-11-01 08:38:37 -04:00
Shane McDonald
c019d873b9 Update AWX images to CentOS 8 2019-10-30 16:43:23 -04:00
Shane McDonald
28994d4b0b Install oc and kubectl in upstream task image 2019-10-30 12:15:51 -04:00
Raphaël COMBEAU
712b07c136 Improve usage of ssl_certificate in local_docker 
Remove nginx.conf from container

Move nginx outside ssl_certificate block
 2019-10-28 17:37:14 -04:00
Christian Adams
19a6c70858 remove cruft leftover from the postgresql upgrade 2019-10-03 14:43:56 -04:00
softwarefactory-project-zuul[bot]
778b306208 Merge pull request #4824 from rooftopcellist/scl_in_containers 
Add needed scl enables for community container installs

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-09-26 19:40:21 +00:00
Christian Adams
9f8d975a19 revert to get needed scl enables for community container installs 2019-09-26 13:24:26 -04:00
Ryan Petrello
955bb4a44c allow *.pendo.io as an img-src in our Content Security Policy 2019-09-26 13:12:54 -04:00
Ryan Petrello
d52aa11422 correct CSP header to allow all pendo.io traffic 2019-09-23 09:15:55 -04:00
Shane McDonald
3b89e894db Stop using PG SCL in dev env 2019-09-16 11:41:13 -04:00
Christian Adams
ec1e93cc69 Upgrade to postgres 10.6 
- use awx-python in shebang in dev env
  - scl enable where needed for rhel7 & container installs
  - use scram-sha-256 pg user hashing by default
  - ensure psycopg2 is using the correct PG_CONFIG at build time for the right libpq version
 2019-09-12 12:52:43 -04:00
Ryan Petrello
b82030b025 hide nginx server version headers 2019-08-20 14:34:04 -04:00