diff --git a/cli/binary/binary.spec b/cli/binary.spec similarity index 55% rename from cli/binary/binary.spec rename to cli/binary.spec index 5eb7e78..dd4f06e 100644 --- a/cli/binary/binary.spec +++ b/cli/binary.spec @@ -3,18 +3,16 @@ block_cipher = None -a = Analysis(['../dcoscli/main.py'], +a = Analysis(['dcoscli/main.py'], pathex=[os.path.dirname(os.getcwd()), os.getcwd(), 'env/lib/python3.4/site-packages', - '../env/lib/python3.4/site-packages', - ], + '../env/lib/python3.4/site-packages'], + datas=[('dcoscli/data/help/*','dcoscli/data/help'), + ('dcoscli/data/schemas/*', 'dcoscli/data/schemas'), + ('../dcos/data/config-schema/*', 'dcos/data/config-schema'), + ('../dcos/data/marathon/*', 'dcos/data/marathon')], binaries=None, - datas=[('../dcoscli/data/help/*', 'dcoscli/data/help'), - ('../dcoscli/data/schemas/*', 'dcoscli/data/schemas'), - ('../../dcos/data/config-schema/*', 'dcos/data/config-schema'), - ('../../dcos/data/marathon/*', 'dcos/data/marathon') - ], hiddenimports=['_cffi_backend'], hookspath=[], runtime_hooks=[], @@ -22,8 +20,13 @@ a = Analysis(['../dcoscli/main.py'], win_no_prefer_redirects=False, win_private_assemblies=False, cipher=block_cipher) -pyz = PYZ(a.pure, a.zipped_data, - cipher=block_cipher) + + +pyz = PYZ(a.pure, + a.zipped_data, + cipher=block_cipher) + + exe = EXE(pyz, a.scripts, a.binaries, @@ -33,4 +36,4 @@ exe = EXE(pyz, debug=False, strip=False, upx=True, - console=True ) + console=True) diff --git a/cli/binary/Dockerfile.linux-binary b/cli/binary/Dockerfile.linux-binary deleted file mode 100644 index 93eb392..0000000 --- a/cli/binary/Dockerfile.linux-binary +++ /dev/null @@ -1,32 +0,0 @@ -# This image runs the dcos-cli test suite. - -FROM ubuntu:16.04 -MAINTAINER support@mesosphere.com - -RUN apt-get update && apt-get install -y \ - httpie \ - jq \ - make \ - python3-venv \ - openssh-client \ - git \ - sudo \ - language-pack-en \ -&& sudo apt-get update --fix-missing \ -&& sudo apt-get install -y build-essential libssl-dev libffi-dev python-dev python3-pip python3-venv \ -&& pip3 install pip --upgrade \ -&& python3 -m pip install pyinstaller==3.1.1 - -ENV LC_CTYPE en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US -ENV LC_ALL "" - -ADD . /dcos-cli -WORKDIR /dcos-cli -RUN make clean env packages - -WORKDIR /dcos-cli/cli -RUN make clean env packages - -RUN make binary && PATH=/dcos-cli/cli/dist:$PATH