Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 247404ea262b0d13d25a8ea41c9828272af76cb1..adafda00a0ce68bdca1f6c3884e84e50393748cd 100644 (file)
--- a/cscript
+++ b/cscript
@@ -120,6 +120,8 @@ deb_depends['8'].extend(['libboost-filesystem1.55.0',
                          'libmagick++-6.q16-5',
                          'libxml++2.6-2',
                          'libzip2',
+                         'libcairomm-1.0-1',
+                         'libpangomm-1.4-1',
                          'libwxgtk3.0-0',
                          'libxcb-xfixes0',
                          'libxcb-shape0',
@@ -266,8 +268,8 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', 'c7df8d5', ffmpeg_options),
-            ('libdcp', '028a6d7'),
-            ('libsub', 'v1.2.4'))
+            ('libdcp', '839bc2d'),
+            ('libsub', 'd557f39'))
 
 def configure_options(target):
     opt = ''
@@ -398,6 +400,21 @@ def package(target, version):
     elif target.platform == 'osx':
         target.command('bash platform/osx/make_dmg.sh %s' % target.directory)
         return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')]
+    elif target.platform == 'docker':
+        shutil.copyfile(target.deb, 'build/platform/docker')
+        f = open('build/platform/docker/Dockerfile', 'w')
+        print('FROM debian:jessie', file=f)
+        print('MAINTAINER carl@dcpomatic.com', file=f)
+        print('ADD build/platform/docker/dcpomatic_%s-1_amd64.deb /tmp' % (version, version), file=f)
+        print('RUN apt-get -o Acquire:http::Timeout="5" update; exit 0', file=f)
+        print('RUN dpkg -i /tmp/dcpomatic_*.deb; exit 0', file=f)
+        print('RUN apt-get -y -f install', file=f)
+        print('RUN apt-get clean', file=f)
+        print('EXPOSE 6192', file=f)
+        print('CMD ["/usr/bin/dcpomatic2_server_cli", "--verbose"]', file=f)
+        f.close()
+        target.command('docker build build/platform/docker -t dcpomatic-server:%s' % version)
+        target.command('docker save dcpomatic-server:%s -o dcpomatic-server-%s-docker.tar' % (version, version))
 
 def make_pot(target):
     target.command('./waf pot')