Skip to content

Commit

Permalink
Update instructions for new container image
Browse files Browse the repository at this point in the history
  • Loading branch information
AlanCoding committed Dec 9, 2019
1 parent 42c2909 commit de51f67
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 16 deletions.
6 changes: 1 addition & 5 deletions requirements/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The `requirements.txt` and `requirements_ansible.txt` files are generated from `

Commands should from inside `./requirements` directory of the awx repository.

Make sure you have `patch, awk, python3, python2, python3-venv, python2-virtualenv, pip2, pip3` installed.
Make sure you have `patch, awk, python3, python2, python3-venv, python2-virtualenv, pip2, pip3` installed. The development container image should have all these.

### Upgrading or Adding Select Libraries

Expand All @@ -31,10 +31,6 @@ You can upgrade (`pip-compile --upgrade`) the dependencies by running

`./updater.sh upgrade`.

If you are using the development container image, you need to run `dnf -y install libpq-devel libcurl-devel`.
These packages are removed in the Dockerfile.
Depending on the libraries involved, you may also need `dnf -y install gcc redhat-rpm-config python3-devel`.

## What The Script Does

This script will:
Expand Down
14 changes: 7 additions & 7 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ billiard==3.6.1.0 # via celery
boto==2.49.0
cachetools==3.1.1 # via google-auth
celery==4.3.0
certifi==2019.9.11 # via kubernetes, msrest, requests
certifi==2019.11.28 # via kubernetes, msrest, requests
cffi==1.13.2 # via cryptography
channels==1.1.8
chardet==3.0.4 # via requests
Expand All @@ -23,7 +23,7 @@ cryptography==2.8 # via adal, autobahn, azure-keyvault
daphne==1.4.2
defusedxml==0.6.0 # via python3-openid, python3-saml, social-auth-core
dictdiffer==0.8.0 # via openshift
django-auth-ldap==2.0.0
django-auth-ldap==2.1.0
django-cors-headers==3.2.0
django-crum==0.7.4
django-extensions==2.2.5
Expand All @@ -35,7 +35,7 @@ django-qsstats-magic==1.1.0
django-radius==1.3.3
django-solo==1.1.3
django-split-settings==1.0.0
django-taggit==1.1.0
django-taggit==1.2.0
django==2.2.7
djangorestframework-yaml==1.0.3
djangorestframework==3.10.3
Expand All @@ -46,7 +46,7 @@ gitpython==3.0.5
google-auth==1.7.1 # via kubernetes
hyperlink==19.0.0 # via twisted
idna==2.8 # via hyperlink, requests
importlib-metadata==0.23 # via inflect, irc, jsonschema, kombu
importlib-metadata==1.1.0 # via inflect, irc, jsonschema, kombu
importlib-resources==1.0.2 # via jaraco.text
incremental==17.5.0 # via twisted
inflect==3.0.2 # via jaraco.itertools
Expand All @@ -58,7 +58,7 @@ jaraco.functools==2.0 # via irc, jaraco.text, tempora
jaraco.itertools==4.4.2 # via irc
jaraco.logging==2.0 # via irc
jaraco.stream==2.0 # via irc
jaraco.text==3.1 # via irc, jaraco.collections
jaraco.text==3.2.0 # via irc, jaraco.collections
jinja2==2.10.3
jsonpickle==1.2 # via asgi-amqp
jsonschema==3.2.0
Expand All @@ -68,7 +68,7 @@ lockfile==0.12.2 # via python-daemon
lxml==4.4.2 # via xmlsec
markdown==3.1.1
markupsafe==1.1.1 # via jinja2
more-itertools==7.2.0 # via irc, jaraco.functools, jaraco.itertools, zipp
more-itertools==8.0.0 # via irc, jaraco.functools, jaraco.itertools, zipp
msgpack-python==0.5.6 # via asgi-amqp
msrest==0.6.10 # via azure-keyvault, msrestazure
msrestazure==0.6.2 # via azure-keyvault
Expand Down Expand Up @@ -99,7 +99,7 @@ python-string-utils==0.6.0 # via openshift
python3-openid==3.1.0 # via social-auth-core
python3-saml==1.9.0
pytz==2019.3 # via celery, django, irc, tempora, twilio
pyyaml==5.1.2 # via ansible-runner, djangorestframework-yaml, kubernetes
pyyaml==5.2 # via ansible-runner, djangorestframework-yaml, kubernetes
requests-futures==1.0.0
requests-oauthlib==1.3.0 # via kubernetes, msrest, social-auth-core
requests==2.22.0
Expand Down
8 changes: 4 additions & 4 deletions requirements/requirements_ansible.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ boto3==1.9.223
boto==2.47.0
botocore==1.12.253 # via boto3, s3transfer
cachetools==3.1.1 # via google-auth
certifi==2019.9.11 # via msrest, requests
certifi==2019.11.28 # via msrest, requests
cffi==1.13.2 # via bcrypt, cryptography, pynacl
chardet==3.0.4 # via requests
colorama==0.4.1 # via azure-cli-core, knack
Expand Down Expand Up @@ -80,14 +80,14 @@ openstacksdk==0.31.1
os-service-types==1.7.0 # via keystoneauth1, openstacksdk
ovirt-engine-sdk-python==4.3.0
packaging==19.2
paramiko==2.6.0 # via azure-cli-core, ncclient
paramiko==2.7.0 # via azure-cli-core, ncclient
pbr==5.4.4 # via keystoneauth1, openstacksdk, os-service-types, stevedore
psutil==5.4.3
pyasn1-modules==0.2.7 # via google-auth
pyasn1==0.4.8 # via pyasn1-modules, requests-credssp, rsa
pycparser==2.19 # via cffi
pycurl==7.43.0.1
pygments==2.5.1 # via azure-cli-core, knack
pygments==2.5.2 # via azure-cli-core, knack
pyjwt==1.7.1 # via adal, azure-cli-core
pykerberos==1.2.1 # via requests-kerberos
pynacl==1.3.0 # via paramiko
Expand All @@ -96,7 +96,7 @@ pyparsing==2.4.5 # via packaging
python-dateutil==2.8.1 # via adal, azure-storage, botocore
pyvmomi==6.7.3
pywinrm[kerberos]==0.3.0
pyyaml==5.1.2 # via azure-cli-core, knack, openstacksdk
pyyaml==5.2 # via azure-cli-core, knack, openstacksdk
requests-credssp==1.0.2
requests-kerberos==0.12.0 # via pywinrm
requests-ntlm==1.1.0 # via pywinrm
Expand Down

0 comments on commit de51f67

Please sign in to comment.