diff options
author | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2018-01-08 10:48:42 +0800 |
---|---|---|
committer | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2018-01-08 10:55:30 +0800 |
commit | 0436f87ff05b0835e1ed75ee2955f5097e572224 (patch) | |
tree | df1ec4d5dc688e100a77c6326d98ba0b0d4d3990 | |
parent | ea7c2467b1c5d24ac56c41a2ab82355d01cf3cc2 (diff) |
Fix "qtip command not found" in Docker container
- updated dependency lock
- allow buidling docker image from local repository
- use pip to install local package
Change-Id: I9eecae54f278e57ec0ba4840b2d64abb0134d9b6
JIRA: QTIP-289
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
-rw-r--r-- | Pipfile | 1 | ||||
-rw-r--r-- | Pipfile.lock | 112 | ||||
-rw-r--r-- | docker/Dockerfile.local | 63 |
3 files changed, 116 insertions, 60 deletions
@@ -13,7 +13,6 @@ pytest = "*" pytest-cov = "*" pytest-faker = "*" pytest-mock = "*" -"e1839a8" = {path = ".", editable = true} [packages] diff --git a/Pipfile.lock b/Pipfile.lock index a3672ce6..c4dcf444 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "05d75ee7249402453796fd650e042b5a2c5c3328b05b48cddfd3b73891a230a5" + "sha256": "1bd8bf77bc0201b85bfdc4ffe8364bc18ba107caca8a954765e3e161f57dffd7" }, "host-environment-markers": { "implementation_name": "cpython", @@ -9,10 +9,10 @@ "os_name": "posix", "platform_machine": "x86_64", "platform_python_implementation": "CPython", - "platform_release": "17.2.0", + "platform_release": "17.3.0", "platform_system": "Darwin", - "platform_version": "Darwin Kernel Version 17.2.0: Fri Sep 29 18:27:05 PDT 2017; root:xnu-4570.20.62~3/RELEASE_X86_64", - "python_full_version": "2.7.14", + "platform_version": "Darwin Kernel Version 17.3.0: Thu Nov 9 18:09:22 PST 2017; root:xnu-4570.31.3~1/RELEASE_X86_64", + "python_full_version": "2.7.13", "python_version": "2.7", "sys_platform": "darwin" }, @@ -37,10 +37,10 @@ }, "asn1crypto": { "hashes": [ - "sha256:654b7db3b120e23474e9a1e5e38d268c77e58a9e17d2cb595456c37309846494", - "sha256:0874981329cfebb366d6584c3d16e913f2a0eb026c9463efcc4aaf42a9d94d70" + "sha256:2f1adbb7546ed199e3c90ef23ec95c5cf3585bac7d11fb7eb562a3fe89c64e87", + "sha256:9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49" ], - "version": "==0.23.0" + "version": "==0.24.0" }, "asq": { "hashes": [ @@ -124,7 +124,6 @@ "sha256:75e1de9ba7c155d89bcf67d149b1c741df553c8158536e8d27e63167403159af", "sha256:ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6" ], - "markers": "platform_python_implementation != 'PyPy'", "version": "==1.11.2" }, "chardet": { @@ -210,10 +209,10 @@ }, "humanfriendly": { "hashes": [ - "sha256:43a43575cc5c1506a50fb5a536757aa0c2ae94c0ec10572b368510c878fdc0b9", - "sha256:f1ebb406d37478228b92543c12c27c9a827782d8d241260b3a06512c7f7c3a5e" + "sha256:abe35f7096e2d27ef6059355a33386b089eecbcd5157201be05dc99e50fb2c28", + "sha256:928eff707f0682029f1968cefe108fd2870ead5a2f8d80875231a27ba2b20410" ], - "version": "==4.4.1" + "version": "==4.6" }, "idna": { "hashes": [ @@ -230,11 +229,10 @@ }, "ipaddress": { "hashes": [ - "sha256:d34cf15d95ce9a734560f7400a8bd2ac2606f378e2a1d0eadbf1c98707e7c74a", - "sha256:5d8534c8e185f2d8a1fda1ef73f2c8f4b23264e8e30063feeb9511d492a413e1" + "sha256:200d8686011d470b5e4de207d803445deee427455cd0cb7c982b68cf82524f81" ], "markers": "python_version < '3'", - "version": "==1.0.18" + "version": "==1.0.19" }, "itsdangerous": { "hashes": [ @@ -272,31 +270,31 @@ }, "numpy": { "hashes": [ - "sha256:910e7ae5eeee8d322775187692c5c66719cd58d230fbfd57245ea3cf75716910", - "sha256:f5c9ca457057cd5e12ddab36cded8b1f38bf1f45bf550d4ca2839b11ec57f597", - "sha256:d29e72413b66df23c75b9b469253c823698ea2e00f58e9e0df64b7a50696e8ac", - "sha256:539345898a4ae17421c159ae2a350901a5e6ce3da8f24168c6c67b3536e13de8", - "sha256:929928932f91082a168e36984179deddd58f8e98822ad2f33a2955d7c4eec596", - "sha256:62b09f3d1ea01d79c16a6642cb21599f53b9338c59971b2418a573155d2202ec", - "sha256:c4b1914d86c43399438518a2ac8bcba2fb64dd5a18efddded3783b9daae70933", - "sha256:6c6feb0647380db6e1d5d49ef9fb59c42240f25fb8df8b6e82ecb436c7e0621a", - "sha256:da2f47e46d7a93b73891d1981378717dc73c6ad5cc4fd23c934bfea7847fa958", - "sha256:4c767b6d9c9a071bb36ea34eb240ee5192fe0bc4c13be5e6c51e0350a30f7ac0", - "sha256:b2f98838f4bbc3bf23af7e97ffcad18a2dc6bbb0726796781e02b9347af6685f", - "sha256:11fcbed36c101a3b9c4636e791efccba82409ebbedaba938c97be8bdddd029cc", - "sha256:8969c8f987f8bcc3e30c014532cfc20e4a8f86a50c361596e086310853adacb7", - "sha256:2875e8055a1ea8d933b1c9d0f8714c0aa11c097bfadfcb8564c4d868fbf09a41", - "sha256:09b87d652c03508447d0f618e1d3ae57595acd3e0f0c11ac91bf68ed7bdb3a28", - "sha256:9cad35b911e150f00bb8080950c7e9f172714bbd0234f5ab74b4e3e2d9288b37", - "sha256:479863de17f66810db00bccf35289555365da45d3b053ccf539b95ab3b9c24f6", - "sha256:b162c6b044960b4ea0f42be049ce2af1d18c60f82748f0a27bd5ad182a731bf3", - "sha256:fa656dccfa9141774440575a6e7875d08b93f4a332eb5ae40877b26bed291c01", - "sha256:7dfa5b49fb2a080bd0d39bfbcff1177bacb14fcb28c857fd65fd0c18938935de", - "sha256:e8e0e75db757e41463888939d26c8058b4ecd25e563c597e9119f512dc0ee1da", - "sha256:c8dc6aa96882df6323bf9545934e37c6e05959bd789ae4b14d50509b093907aa", - "sha256:36ee86d5adbabc4fa2643a073f93d5504bdfed37a149a3a49f4dde259f35a750" - ], - "version": "==1.13.3" + "sha256:428cd3c0b197cf857671353d8c85833193921af9fafcc169a1f29c7185833d50", + "sha256:a476e437d73e5754aa66e1e75840d0163119c3911b7361f4cd06985212a3c3fb", + "sha256:289ff717138cd9aa133adcbd3c3e284458b9c8230db4d42b39083a3407370317", + "sha256:c5eccb4bf96dbb2436c61bb3c2658139e779679b6ae0d04c5e268e6608b58053", + "sha256:75471acf298d455b035226cc609a92aee42c4bb6aa71def85f77fa2c2b646b61", + "sha256:5c54fb98ecf42da59ed93736d1c071842482b18657eb16ba6e466bd873e1b923", + "sha256:9ddf384ac3aacb72e122a8207775cc29727cbd9c531ee1a4b95754f24f42f7f3", + "sha256:781d3197da49c421a07f250750de70a52c42af08ca02a2f7bdb571c0625ae7eb", + "sha256:93b26d6c06a22e64d56aaca32aaaffd27a4143db0ac2f21a048f0b571f2bfc55", + "sha256:b2547f57d05ba59df4289493254f29f4c9082d255f1f97b7e286f40f453e33a1", + "sha256:eef6af1c752eef538a96018ef9bdf8e37bbf28aab50a1436501a4aa47a6467df", + "sha256:ff8a4b2c3ac831964f529a2da506c28d002562b230261ae5c16885f5f53d2e75", + "sha256:194074058c22a4066e1b6a4ea432486ee468d24ab16f13630c1030409e6b8666", + "sha256:4e13f1a848fde960dea33702770265837c72b796a6a3eaac7528cfe75ddefadd", + "sha256:91101216d72749df63968d86611b549438fb18af2c63849c01f9a897516133c7", + "sha256:97507349abb7d1f6b76b877258defe8720833881dc7e7fd052bac90c88587387", + "sha256:1479b46b6040b5c689831496354c8859c456b152d37315673a0c18720b41223b", + "sha256:98b1ac79c160e36093d7914244e40ee1e7164223e795aa2c71dcce367554e646", + "sha256:24bbec9a199f938eab75de8390f410969bc33c218e5430fa1ae9401b00865255", + "sha256:7880f412543e96548374a4bb1d75e4cdb8cad80f3a101ed0f8d0e0428f719c1c", + "sha256:6112f152b76a28c450bbf665da11757078a724a90330112f5b7ea2d6b6cefd67", + "sha256:7c5276763646480143d5f3a6c2acb2885460c765051a1baf4d5070f63d05010f", + "sha256:3de643935b212307b420248018323a44ec51987a336d1d747c1322afc3c099fb" + ], + "version": "==1.14.0" }, "paramiko": { "hashes": [ @@ -412,6 +410,7 @@ }, "swagger-spec-validator": { "hashes": [ + "sha256:aedacb6c6b475026a1b5ac218fb590382d08064e227da254eb961d17cfd2b7c1", "sha256:dc9219c6572ce0def6e1c160ca253c0e7fcde75812628f0c0199334f85bd138e" ], "version": "==2.1.0" @@ -433,19 +432,19 @@ }, "werkzeug": { "hashes": [ - "sha256:e8549c143af3ce6559699a01e26fa4174f4c591dbee0a499f3cd4c3781cdec3d", - "sha256:903a7b87b74635244548b30d30db4c8947fe64c5198f58899ddcd3a13c23bb26" + "sha256:d5da73735293558eb1651ee2fddc4d0dedcfa06538b8813a2e20011583c9e49b", + "sha256:c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c" ], - "version": "==0.12.2" + "version": "==0.14.1" } }, "develop": { "attrs": { "hashes": [ - "sha256:e7d51b70f19a4da5fe6b3c9938983e0af3b91e230edc504bd73c443d98037063", - "sha256:c78f53e32d7cf36d8597c8a2c7e3c0ad210f97b9509e152e4c37fa80869f823c" + "sha256:a17a9573a6f475c99b551c0e0a812707ddda1ec9653bed04c13841404ed6f450", + "sha256:1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83b54ec9" ], - "version": "==17.3.0" + "version": "==17.4.0" }, "coverage": { "hashes": [ @@ -498,32 +497,27 @@ ], "version": "==0.6.2" }, - "e1839a8": { - "editable": true, - "path": "." - }, "faker": { "hashes": [ - "sha256:f5529ff519a4bed0c0c8ccbbf7ca0d918ed0a9826fe8adc60f58d5b052a946dc", - "sha256:bf7dabcd6807c8829da28a4de491adf7998af506b8571db6a6eb58161157248a" + "sha256:2f6ccc9da046d4cd20401734cf6a1ac73a4e4d8256e7b283496ee6827ad2eb60", + "sha256:e928cf853ef69d7471421f2a3716a1239e43de0fa9855f4016ee0c9f1057328a" ], - "version": "==0.8.7" + "version": "==0.8.8" }, "funcsigs": { "hashes": [ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.0'", + "markers": "python_version < '3.3'", "version": "==1.0.2" }, "ipaddress": { "hashes": [ - "sha256:d34cf15d95ce9a734560f7400a8bd2ac2606f378e2a1d0eadbf1c98707e7c74a", - "sha256:5d8534c8e185f2d8a1fda1ef73f2c8f4b23264e8e30063feeb9511d492a413e1" + "sha256:200d8686011d470b5e4de207d803445deee427455cd0cb7c982b68cf82524f81" ], "markers": "python_version == '2.7'", - "version": "==1.0.18" + "version": "==1.0.19" }, "mock": { "hashes": [ @@ -561,10 +555,10 @@ }, "pytest": { "hashes": [ - "sha256:ae4a2d0bae1098bbe938ecd6c20a526d5d47a94dc42ad7331c9ad06d0efe4962", - "sha256:cf8436dc59d8695346fcd3ab296de46425ecab00d64096cebe79fb51ecb2eb93" + "sha256:b84878865558194630c6147f44bdaef27222a9f153bbd4a08908b16bf285e0b1", + "sha256:53548280ede7818f4dc2ad96608b9f08ae2cc2ca3874f2ceb6f97e3583f25bc4" ], - "version": "==3.3.1" + "version": "==3.3.2" }, "pytest-cov": { "hashes": [ diff --git a/docker/Dockerfile.local b/docker/Dockerfile.local new file mode 100644 index 00000000..86e86dcd --- /dev/null +++ b/docker/Dockerfile.local @@ -0,0 +1,63 @@ +########################################## +#####Docker container for QTIP############ +########################################## + +FROM ubuntu:16.04 +MAINTAINER QTIP Team <https://wiki.opnfv.org/display/qtip> +LABEL version="0.1" description="OPNFV QTIP Docker container" + +ARG BRANCH=master + +ENV REPOS_DIR=/home/opnfv/repos \ + PYTHONPATH=/home/opnfv/repos/qtip \ + USER=root + +WORKDIR /home/opnfv + +RUN mkdir -p ${REPOS_DIR} \ + && mkdir -p /root/qtip/logs \ + && mkdir -p /root/.ssh \ + && chmod 700 /root/.ssh + +# Packaged Dependencies +RUN apt-get update && apt-get install -y \ + software-properties-common \ + git \ + gcc \ + build-essential\ + libssl-dev\ + libffi-dev\ + locales \ + supervisor \ + python-dev \ + python-pip \ + python-setuptools \ + rsync \ + iputils-ping \ + wget \ + curl \ + openssh-client \ + --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* + +RUN locale-gen en_US en_US.UTF-8 \ + && pip install -U pip \ + && pip install -U setuptools + +COPY . $REPOS_DIR/qtip + +RUN cd $REPOS_DIR/qtip \ + && pip install pipenv \ + && pip install -e . \ + && pipenv install --system + +RUN echo 'eval $(ssh-agent)' >> /root/.bashrc + +# Exposing ports +EXPOSE 5000 + +#Config supervisor +RUN mkdir -p /var/log/supervisor +COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf + +CMD ["/usr/bin/supervisord"] |