Merge pull request #1952 from aanand/bundle-schema-json

Bundle schema.json in binary

.dockerignore

@@ -5,6 +5,5 @@
 build
 coverage-html
 dist
-docker-compose.spec
 docs/_site
 venv

.gitignore

@@ -5,6 +5,5 @@
 /build
 /coverage-html
 /dist
-/docker-compose.spec
 /docs/_site
 /venv

docker-compose.spec

@@ -0,0 +1,26 @@
+# -*- mode: python -*-
+
+block_cipher = None
+
+a = Analysis(['bin/docker-compose'],
+             pathex=['.'],
+             hiddenimports=[],
+             hookspath=None,
+             runtime_hooks=None,
+             cipher=block_cipher)
+
+pyz = PYZ(a.pure,
+             cipher=block_cipher)
+
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          [('compose/config/fields_schema.json', 'compose/config/fields_schema.json', 'DATA')],
+          [('compose/config/service_schema.json', 'compose/config/service_schema.json', 'DATA')],
+          name='docker-compose',
+          debug=False,
+          strip=None,
+          upx=True,
+          console=True )

script/build-linux-inner

@@ -8,6 +8,6 @@ mkdir -p `pwd`/dist
 chmod 777 `pwd`/dist
 
 pip install -r requirements-build.txt
-su -c "pyinstaller -F bin/docker-compose" user
+su -c "pyinstaller docker-compose.spec" user
 mv dist/docker-compose $TARGET
 $TARGET version

script/build-osx

@@ -8,6 +8,6 @@ virtualenv -p /usr/local/bin/python venv
 venv/bin/pip install -r requirements.txt
 venv/bin/pip install -r requirements-build.txt
 venv/bin/pip install .
-venv/bin/pyinstaller -F bin/docker-compose
+venv/bin/pyinstaller docker-compose.spec
 mv dist/docker-compose dist/docker-compose-Darwin-x86_64
 dist/docker-compose-Darwin-x86_64 version