Skip to content

Commit

Permalink
Switch from pipenv back to pip
Browse files Browse the repository at this point in the history
  • Loading branch information
0xdabbad00 committed May 8, 2020
1 parent 43efa5a commit b37ba74
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 50 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ assignees: ''

Please mention the following:
- What command was run?
- Are you working out of a pipenv environment, Docker, or something else?
- Are you working out of a virtualenv environment, Docker, or something else?
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,5 @@ matrix:
- python: 3.7
dist: xenial
sudo: true
env:
global:
- PIPENV_VENV_IN_PROJECT=1
- PIPENV_IGNORE_VIRTUALENVS=1
install: make setup
script: make test
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ RUN apt-get install -y build-essential autoconf automake libtool python3.7-dev p
RUN apt-get install -y bash

COPY . /opt/cloudmapper
RUN pip install pipenv
RUN pipenv install --skip-lock
#RUN pipenv shell
RUN pip install -r requirements.txt

RUN bash
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
setup:
pip install pipenv
pipenv install --dev --skip-lock
pip install -r requirements.txt
test:
pipenv run -- bash tests/scripts/unit_tests.sh
bash tests/scripts/unit_tests.sh
30 changes: 0 additions & 30 deletions Pipfile

This file was deleted.

13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ On macOS:
# clone the repo
git clone https://github.com/duo-labs/cloudmapper.git
# Install pre-reqs for pyjq
brew install autoconf automake libtool jq awscli python3 pipenv
brew install autoconf automake libtool jq awscli python3
cd cloudmapper/
pipenv install --skip-lock
pipenv shell
python3 -m venv ./venv && source venv/bin/activate
pip install -r requirements.txt
```

On Linux:
Expand All @@ -71,8 +71,8 @@ git clone https://github.com/duo-labs/cloudmapper.git
# You may additionally need "build-essential"
sudo apt-get install autoconf automake libtool python3.7-dev python3-tk jq awscli
cd cloudmapper/
pipenv install --skip-lock
pipenv shell
python3 -m venv ./venv && source venv/bin/activate
pip install -r requirements.txt
```


Expand Down Expand Up @@ -160,10 +160,11 @@ aws-vault exec YOUR_PROFILE --server --
docker run -p 8000:8000 -it cloudmapper /bin/bash
```

Ensure you have aws-vault at least v5.4.4 to prevent a DNS rebinding attack when --server is used.

You should replace `YOUR_PROFILE` with the profile you've configured for aws-vault. Inside the container run `aws sts get-caller-identity` to confirm this was setup correctly.

```
pipenv shell
python cloudmapper.py report --accout demo
python cloudmapper.py webserver --public
```
Expand Down
5 changes: 2 additions & 3 deletions auditor/resources/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ COPY entrypoint.sh /opt/cloudmapper/entrypoint.sh
RUN rm -rf /opt/cloudmapper/account-data/demo

# Install the python libraries needed for CloudMapper
RUN pip install pipenv
RUN cd /opt/cloudmapper && pipenv install --skip-lock
RUN cd /opt/cloudmapper && pip install -r requirements.txt

ENTRYPOINT pipenv run /opt/cloudmapper/entrypoint.sh
ENTRYPOINT /opt/cloudmapper/entrypoint.sh
34 changes: 34 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
astroid==2.4.1
autoflake==1.3.1
autopep8==1.5.2
boto3==1.9.145
botocore==1.12.253
certifi==2020.4.5.1
chardet==3.0.4
coverage==5.1
docutils==0.15.2
idna==2.8
isort==4.3.21
Jinja2==2.10.1
jmespath==0.9.5
lazy-object-proxy==1.4.3
MarkupSafe==1.1.1
mccabe==0.6.1
mock==4.0.2
netaddr==0.7.19
nose==1.3.7
parliament==0.3.6
policyuniverse==1.1.0.1
pycodestyle==2.5.0
pyflakes==2.2.0
pyjq==2.3.1
pylint==2.5.2
python-dateutil==2.8.1
PyYAML==4.2b4
requests==2.22.0
s3transfer==0.2.1
six==1.14.0
toml==0.10.0
typed-ast==1.4.1
urllib3==1.25.9
wrapt==1.12.1

0 comments on commit b37ba74

Please sign in to comment.