Merge branch 'master' of https://github.com/datacenter/acitoolkit

datacenter · Mar 8, 2017 · 985cb01 · 985cb01
2 parents 7dc56bb + a3cddfc
commit 985cb01
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,14 @@
 # VERSION 1.0
 FROM ubuntu
+
 MAINTAINER Kevin Corbin, kecorbin@cisco.com
-RUN apt-get update
-RUN apt-get -y install git python python-pip 
-RUN apt-get -y install graphviz graphviz-dev pkg-config
-WORKDIR /opt
-RUN git clone https://github.com/datacenter/acitoolkit
-WORKDIR acitoolkit
-RUN python setup.py install
+
+RUN apt-get update \
+ && apt-get -y install git graphviz-dev pkg-config python python-pip vim-tiny \
+ && cd /opt \
+ && git clone https://github.com/datacenter/acitoolkit \
+ && cd acitoolkit \
+ && python setup.py install \
+ && apt-get clean
+WORKDIR /opt/acitoolkit
+CMD ["/bin/bash"]
diff --git a/samples/aci_demo_contract_interface.py → samples/aci-demo-contract-interface.py b/samples/aci_demo_contract_interface.py → samples/aci-demo-contract-interface.py
diff --git a/samples/aci_demo_contract.py → samples/aci-demo-contract.py b/samples/aci_demo_contract.py → samples/aci-demo-contract.py
diff --git a/samples/aci_demo_portchannel.py → samples/aci-demo-portchannel.py b/samples/aci_demo_portchannel.py → samples/aci-demo-portchannel.py
diff --git a/samples/aci_demo_script.py → samples/aci-demo-script.py b/samples/aci_demo_script.py → samples/aci-demo-script.py
diff --git a/samples/aci-epg-reports-in-yaml.py b/samples/aci-epg-reports-in-yaml.py
diff --git a/samples/aci-find-ip.py b/samples/aci-find-ip.py
diff --git a/samples/aci-get-interface-stats-from-nodes.py b/samples/aci-get-interface-stats-from-nodes.py
diff --git a/samples/aci-get-tenantObject-from-json.py b/samples/aci-get-tenantObject-from-json.py
diff --git a/samples/aci-raw-class-query.py b/samples/aci-raw-class-query.py
diff --git a/samples/aci-show-cdp.py b/samples/aci-show-cdp.py
diff --git a/samples/aci-show-faults-by-domain.py b/samples/aci-show-faults-by-domain.py
diff --git a/samples/aci-show-lldp.py b/samples/aci-show-lldp.py
diff --git a/samples/aci-show-tenant-faults.py b/samples/aci-show-tenant-faults.py
diff --git a/samples/aci-show-tenant-health.py b/samples/aci-show-tenant-health.py
diff --git a/samples/credentials.py.sample b/samples/credentials.py.sample
@@ -0,0 +1,3 @@
+LOGIN    = "admin"
+PASSWORD = "password"
+URL      = "https://10.0.0.1"
diff --git a/samples/tutorial.py b/samples/tutorial.py