1
0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 23:51:09 +03:00
Commit Graph

501 Commits

Author SHA1 Message Date
softwarefactory-project-zuul[bot]
815823adc0
Merge pull request #4363 from jomach/feature/updateGitVersion
[4362] git version is old and does not work with x509 certificates

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-07-30 21:07:24 +00:00
Jorge Machado
76933ed889 * upgrade from git on containers
* agreed with terms of DCO 1.1

Signed-off-by: Jorge Machado <jorge@jmachado.me>
2019-07-30 07:04:04 +02:00
chris meyers
9236fd2a53 fake it till you make it!
* The user awx is passed to the launch of our dev docker container. The
docker system automagically creates that user for us and sets the home
dir to /tmp in /etc/passwd. Many methods of detecting the user home dir
don't use that. Instead, they use the HOME env var. This is a half-way
solution that solves the problem of python expanding the ~ dir.
* If other things break because they determine the users home dir via
/etc/passwd entry then a more in-depth fix will be needed.
2019-07-29 09:58:47 -04:00
Ryan Petrello
b620d8505a
build and link a newer sqlite3 to make Django happy 2019-07-16 10:50:49 -04:00
Ryan Petrello
a4b2d6bf88
Revert "Change the devel containers to be based on Fedora instead of CentOS"
This reverts commit 7936dff188.
2019-07-16 09:18:24 -04:00
Jeff Bradberry
dd8ca5acc4 Ensure that the Postgres client is installed 2019-07-12 16:22:52 -04:00
Shane McDonald
7936dff188 Change the devel containers to be based on Fedora instead of CentOS
since we need a more recent version of sqlite.
2019-07-12 15:11:22 -04:00
Jeff Byrnes
987cfed649
Update Content Security Policy to allow websockets
Per #4167 a reasonable CSP was put in place, but unfortunately this
broke WebSockets support in Safari.

This is a quick fix to return support immediately. A more secure
implemetation would be beneficial in the longer term, however.
2019-07-05 16:12:27 -04:00
Ryan Petrello
75a72637dd
allow data: images in our Content Security Policy
support for custom login logos relies on data:image/*;base64
see: https://github.com/ansible/awx/issues/4253
2019-07-02 11:35:56 -04:00
Ryan Petrello
eacf819caf
add a reasonable default Content Security Policy
ideally we'd improve this over time to remove the `unsafe-inline` lines,
but we can't due that today because Angular1 makes use of a lot of
inline <script> and <style> tag generation

see: https://github.com/ansible/awx/issues/2056
2019-06-26 10:46:26 -04:00
Shane McDonald
f05bed6366 Use the source tree as the working directory for our dev env 2019-06-25 18:28:01 -04:00
Jake McDermott
90fb7c6769
unpin vault plugin development container image 2019-06-12 10:23:01 -04:00
Ryan Petrello
6da445f7c0
remove /api/v1 and deprecated credential fields 2019-06-06 12:23:00 -04:00
Shane McDonald
b00979792e Clean up related to isolated env
- Made  make target names consistent with our other commands
- Found some unnecessary code, deleted it
2019-06-06 10:15:11 -04:00
Shane McDonald
f18f9ec0ef Bring isolated dev env current
There was quite a bit of drift between the main Dockerfile and this one since we last touched it. It’s heavier than it needs to be, but by using the main development image as the base here, we have less duplicated and outdated code overall.
2019-06-03 16:48:45 -04:00
Shane McDonald
ef22986aa0 Install latest tini from RPM 2019-06-03 16:03:51 -04:00
Shane McDonald
49b54f2d60
Fix python3 fallout in translations management script 2019-05-30 14:41:03 -04:00
Kia Lam
15c699de7c
Update dockerfile to build using node v10.15.0. 2019-05-29 13:00:06 -04:00
Shane McDonald
2f77c67a62 Changes to enable tests in k8s 2019-05-28 13:22:15 -04:00
Shane McDonald
5ca0cdb124 Avoid DNS timeout in non-Docker for Mac installs
Shaves 20 seconds off of rebooting the dev environment on Linux.
2019-05-10 12:31:08 -04:00
softwarefactory-project-zuul[bot]
18c69fa391
Merge pull request #3870 from shanemcd/gimme-root
Ensure that a root user is always present in development environment

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-10 14:57:58 +00:00
Shane McDonald
7d8a910be7 Improve dev environment init process
This ensures that /etc/passwd is always written, regardless of how the container starts.
2019-05-10 10:14:51 -04:00
Shane McDonald
015234287c Ensure that a root user is always present in development environment
@AlanCoding was seeing errors in the development container when trying to run some commands as root. This fixes that.
2019-05-10 09:16:28 -04:00
AlanCoding
677a8b34ba
Fix bug in dev supervisor reparenting processes 2019-05-10 07:46:53 -04:00
Ryan Petrello
adfdfcdd0a
use make targets for dev supervisor commands 2019-05-09 13:45:49 -04:00
Shane McDonald
0be8fe521a Refactor Dockerfiles
This commit does a few things:

- Add the `--squash` option to the `awx-devel-build` make target. This reduces the resulting image size from 2.12 GB to 1.37 GB. I think we can get this down even more by inspecting the image contents.
- Reorganize commands so that the cache expires less often. Before this commit, any changes to the Makefile would essentially cause the entire image to rebuild.
- Break yum dependencies up into multiple lines. This makes it easier to see what changes in a diff.
- Use `n` to install our required version of node (rather `curl node | bash`). I’ve found this to be easier to maintain / more portable when working with other Dockerfiles.
- General organizational changes to make things easier to parse visually.
2019-05-08 20:36:41 -04:00
Ryan Petrello
766a5c0c3f
remove honcho in the dev environment (just use foregrounded supervisor)
using supervisor gives us the ability to restart entire processes on
code change (like the dispatcher and callback receiver)
2019-05-08 14:44:07 -04:00
softwarefactory-project-zuul[bot]
cf6a103207
Merge pull request #3818 from ryanpetrello/devel
merge in downstream changes

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-03 14:36:56 +00:00
softwarefactory-project-zuul[bot]
e5cf5be18d
Merge pull request #3815 from pmoravec/awx-pmoravec-tower-sos-plugin-improvements
sosreport plugin improvements

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-03 12:47:39 +00:00
Ryan Petrello
8d75fc5f56
Merge branch 'downstream' into devel 2019-05-03 07:58:25 -04:00
Pavel Moravec
8909a8a8e4 sosreport plugin to stick on sos >= 3.0 API only
As sosreport 3.0 was released 5 years ago, older sos versions can
be ignored / not further supported.

Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
2019-05-03 10:38:34 +02:00
Pavel Moravec
29822ee140 don't collect data from other sosreport plugins
Tower plugin shouldn't collect data that other sosreport plugins collect.

Further, few code optimizations in calling sos API are made.

Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
2019-05-02 21:45:09 +02:00
Ryan Petrello
50f9c70afd
remove references to the (now defunct) fact receiver 2019-05-01 23:48:05 -04:00
Bill Nottingham
5d1346b956 Use AWX python interpreter for failure-event-handler.
python3 isn't in the normal path when using SCLs.
2019-04-29 20:32:50 -04:00
softwarefactory-project-zuul[bot]
aaeb2d6fb9
Merge pull request #3740 from wenottingham/lets-re-compose-ourselves
Sync docker-compose dockerfile with the actual production image build.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-04-26 19:05:43 +00:00
Bill Nottingham
aa52e41c02 Kill the rabbitmq sos collection from our plugin.
It exists in upstream sosreport, and this can cause conflicts.
2019-04-24 14:15:17 -04:00
Bill Nottingham
0d18d46ccc Sync docker-compose dockerfile with image build dockerfile.
It was installing an IUS repo, rabbitmq-server, and other unneeded things.
2019-04-18 16:50:38 -04:00
Christian Adams
fb4495b1b5 add prometheus data to gitignore 2019-04-15 10:43:28 -04:00
softwarefactory-project-zuul[bot]
e8de7bc845
Merge pull request #3673 from rooftopcellist/metrics_uuids
add uuids to ping and metrics

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-04-13 11:45:47 +00:00
Christian Adams
40393e201f add uuids to ping and metrics 2019-04-12 18:37:40 -04:00
Ryan Petrello
17a803f49c
remove the old callback plugin import paths and callback-specific tests 2019-04-12 16:11:23 -04:00
Ryan Petrello
fc9da002d2
add an example config file and make target for starting a prometheus 2019-04-08 12:01:46 -04:00
Ryan Petrello
79d580d5b9
update periodic isolated cleanup to match the new paths post-runner 2019-04-05 09:43:27 -04:00
Ryan Petrello
ce2fc1a9dd
fix more py3 centos7 issues 2019-04-04 18:35:59 -04:00
Matthew Jones
fd3a423b07
The python 3.6 package seems to already make this symlink 2019-04-04 18:35:56 -04:00
Jake McDermott
3dee9f0512
add plugin for cyberark aim 2019-04-02 11:23:20 -04:00
Ryan Petrello
2824616ba6
add support for CyberArk Conjur (API v5) 2019-04-02 11:21:44 -04:00
Ryan Petrello
7a43f00a5d
add support for HashiCorp signed SSH certificates 2019-04-02 11:20:29 -04:00
Ryan Petrello
4ed5bca5e3
add credential plugin support for Azure Key Vault 2019-04-02 11:20:26 -04:00
Jake McDermott
c209955400
add credential plugin system and minimal working hashivault 2019-04-02 11:19:26 -04:00