summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Sateler <fsateler@debian.org>2017-11-19 18:27:48 -0300
committerFelipe Sateler <fsateler@debian.org>2017-11-19 18:27:48 -0300
commitb2e61bcae8f6d07b177c5ad4eb095744766276d2 (patch)
treed4346b2fa4c0273c48dd1be2c673c1252c4491e8
parenta997ae5b1840f2878b16443bd8e3c784d23ba9ac (diff)
parent46773106d5e25680a8bfe13135fc90b387e2fe10 (diff)
docker-compose (1.17.1-1) unstable; urgency=medium
* New upstream release * Bump debhelper compat level to 10 [dgit import unpatched docker-compose 1.17.1-1]
-rw-r--r--debian/NEWS23
-rw-r--r--debian/changelog97
-rw-r--r--debian/compat1
-rw-r--r--debian/control35
-rw-r--r--debian/copyright28
-rw-r--r--debian/docker-compose.1195
-rw-r--r--debian/docker-compose.manpages1
-rw-r--r--debian/docs3
-rw-r--r--debian/gbp.conf11
-rw-r--r--debian/patches/Relax-dependencies.patch29
-rw-r--r--debian/patches/series1
-rw-r--r--debian/pydist-overrides3
-rwxr-xr-xdebian/rules19
-rw-r--r--debian/source/format1
-rw-r--r--debian/watch11
15 files changed, 458 insertions, 0 deletions
diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 00000000..0fa1afcd
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,23 @@
+docker-compose (1.5.1-1) unstable; urgency=medium
+
+ With the introduction of variable substitution support in the Compose file,
+ any Compose file that uses an environment variable ($VAR or ${VAR}) in the
+ command or entrypoint fields will break.
+ Please see the 1.5.0 version section of
+ /usr/share/doc/docker-compose/changelog.gz for details
+
+ -- Felipe Sateler <fsateler@debian.org> Sat, 14 Nov 2015 15:15:38 -0300
+
+docker-compose (1.3.1-1) unstable; urgency=medium
+
+ Compose since version 1.3.0 now uses labels to identify containers. This
+ means that containers created by older versions are incompatible with newer
+ ones, and that the daemon has to be at least version 1.6.0.
+
+ Compose will refuse to start containers where it detects that they were
+ created with older versions.
+
+ Please see the Upgrading section of /usr/share/doc/docker-compose/install.md
+ for instructions on upgrading your containers.
+
+ -- Felipe Sateler <fsateler@debian.org> Sun, 28 Jun 2015 00:24:29 -0300
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 00000000..91c3e4e9
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,97 @@
+docker-compose (1.17.1-1) unstable; urgency=medium
+
+ * New upstream release
+ * Bump debhelper compat level to 10
+
+ -- Felipe Sateler <fsateler@debian.org> Sun, 19 Nov 2017 18:27:48 -0300
+
+docker-compose (1.17.0-1) unstable; urgency=medium
+
+ * New upstream version. (Closes: #860454)
+ * Bump build-dependencies
+ * Refresh patches
+ * Run tests directly through pytest
+ * Bump standards version
+
+ -- Felipe Sateler <fsateler@debian.org> Sat, 04 Nov 2017 11:17:44 -0300
+
+docker-compose (1.8.0-2) unstable; urgency=medium
+
+ * Also Bump runtime dependencies of python-docker and python-dockerpty
+ Closes: #841307
+
+ -- Felipe Sateler <fsateler@debian.org> Wed, 19 Oct 2016 11:26:05 -0300
+
+docker-compose (1.8.0-1) unstable; urgency=medium
+
+ * New upstream release
+ - Bump python-docker dependency
+ - Bump docker.io recommends version
+ - Refresh patches
+ * Update Vcs urls to https
+
+ -- Felipe Sateler <fsateler@debian.org> Mon, 17 Oct 2016 20:29:18 -0300
+
+docker-compose (1.5.2-1) unstable; urgency=medium
+
+ * New upstream version
+ * Refresh patches
+
+ -- Felipe Sateler <fsateler@debian.org> Thu, 10 Dec 2015 21:29:48 -0300
+
+docker-compose (1.5.1-1) unstable; urgency=medium
+
+ * New upstream release
+ * Refresh patches.
+ * Add SWARM docs
+ * Note upstream breaking changes in NEWS.Debian
+
+ -- Felipe Sateler <fsateler@debian.org> Sat, 14 Nov 2015 15:26:30 -0300
+
+docker-compose (1.3.3-1) unstable; urgency=medium
+
+ * New upstream release
+ - Refresh patches
+ - Bump python-docker dependency
+ * Add manpage for docker-compose. Thanks Dariusz Dwornikowski.
+ Closes: #792518
+
+ -- Felipe Sateler <fsateler@debian.org> Sun, 19 Jul 2015 15:32:46 -0300
+
+docker-compose (1.3.1-1) unstable; urgency=medium
+
+ * New upstream version
+ - Add news file documenting breaking changes in 1.3.0
+ * Backport zsh completion fixes from upstream
+ * Install bash and zsh completions
+ * Update dependencies
+ * Recommend the daemon
+ * Tighten runtime dependencies on python-requests, dockerpty and docker-py
+ (Closes: #790734)
+
+ -- Felipe Sateler <fsateler@debian.org> Sat, 04 Jul 2015 14:51:23 -0300
+
+docker-compose (1.2.0-1) unstable; urgency=medium
+
+ [ Felipe Sateler ]
+ * New upstream version
+ - Refresh patches. Relax python-docker depenency
+ - Update dependency versions
+ - Drop bootstrap bundle
+ * debian/watch: Fix version mangle, allow upstream -rc without -
+ * Update copyright file
+
+ -- Felipe Sateler <fsateler@debian.org> Wed, 20 May 2015 21:28:56 -0300
+
+fig (1.0.0-2) unstable; urgency=medium
+
+ * Relax dependency on docker-py
+
+ -- Felipe Sateler <fsateler@debian.org> Fri, 15 May 2015 11:16:42 -0300
+
+fig (1.0.0-1) unstable; urgency=low
+
+ * Initial packaging. Closes: #7674440
+ - Bundle bootstrap less source
+
+ -- Felipe Sateler <fsateler@debian.org> Tue, 11 Nov 2014 15:19:49 -0300
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 00000000..f599e28b
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/debian/control b/debian/control
new file mode 100644
index 00000000..26a0ad25
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,35 @@
+Source: docker-compose
+Maintainer: Felipe Sateler <fsateler@debian.org>
+Section: admin
+Priority: optional
+Build-Depends:
+ debhelper (>= 10),
+ python (>= 2.6.6-3),
+ dh-python,
+ python-cached-property (>= 1.2.0),
+ python-setuptools (>= 0.6b3),
+ python-docker (>= 2.4.0),
+ python-dockerpty (>= 0.4.1),
+ python-docopt (>= 0.6.1),
+ python-yaml (>= 3.10),
+ python-requests (>= 2.6.1),
+ python-six (>= 1.7.3),
+ python-texttable (>= 0.9.0),
+ python-websocket (>= 0.32.0),
+ python-mock (>= 1.0.1),
+ python-nose,
+ python-flake8,
+Standards-Version: 4.1.1
+X-Python-Version: >= 2.5
+Homepage: http://docs.docker.com/compose/
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/docker-compose.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/docker-compose.git/
+
+Package: docker-compose
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}
+Recommends: docker.io (>= 1.9.0)
+Description: Punctual, lightweight development environments using Docker
+ docker-compose is a service management software built on top of docker. Define
+ your services and their relationships in a simple YAML file, and let compose
+ handle the rest.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 00000000..22026149
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,28 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: docker-compose
+Source: https://github.com/docker/compose/
+
+Files: *
+Copyright: 2014-2015 Docker Inc
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2014 Felipe Sateler <fsateler@debian.org>
+License: Apache-2.0
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache version 2.0 license
+ can be found in "/usr/share/common-licenses/Apache-2.0".
+
diff --git a/debian/docker-compose.1 b/debian/docker-compose.1
new file mode 100644
index 00000000..b13fa60d
--- /dev/null
+++ b/debian/docker-compose.1
@@ -0,0 +1,195 @@
+.TH DOCKER-COMPOSE "1" "July 2015" "docker-compose" "User Commands"
+.SH NAME
+docker-compose \- Define and run multi\-container applications with Docker.
+.SH SYNOPSIS
+.B docker\-compose
+[\fIOPTIONS\fR] [\fICOMMAND\fR] [\fIARGS\fR]...
+.SH DESCRIPTION
+.PP
+docker-compose allows you to define a multi-container application with all of its dependencies in a
+single file, then spin the application up in a single command. The application’s structure and configuration are held in a single place, which makes spinning up applications simple and repeatable everywhere.
+.SH OPTIONS
+.TP
+\fB\-f\fR, \fB\-\-file\fR FILE
+Specify an alternate compose file (default: docker\-compose.yml)
+.TP
+\fB\-p\fR, \fB\-\-project\-name\fR NAME
+Specify an alternate project name (default: directory name)
+.TP
+\fB\-\-verbose\fR
+Show more output
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Print version and exit
+.SH COMMANDS
+.SS
+build
+Build or rebuild services
+.TP
+\fB\-\-no\-cache\fR
+Do not use cache when building the image.
+.SS
+help
+Displays help and usage information on a command.
+.SS
+kill
+Forces running containers to stop by sending a SIGKILL signal.
+.TP
+\fB\-s\fR SIGNAL
+SIGNAL to send to the container. Default signal is SIGKILL.
+.SS
+logs
+View output from containers.
+.TP
+\fB\-\-no\-color\fR
+Produce a monochrome output.
+.SS
+port
+Print the public port for a port binding
+.TP
+\fB\-\-protocol=proto\fR
+Choose the 4th layer protocol, tcp or udp. Default is tcp.
+.TP
+\fB\-\-index=index\fR
+Index of the container if there are multiple instances of a service. Default is 1.
+.SS
+ps
+List containers.
+.TP
+\fB\-q\fR
+Only display IDs.
+.SS
+pull
+Pulls service images from Docker registry.
+.TP
+\fB\-\-allow\-insecure\-ssl\fR
+Allow insecure connections to the Docker registry.
+.SS
+restart
+Restart running containers.
+.TP
+\fB\-t\fR, \fB\-\-timeout\fR \fITIMEOUT\fR
+Specify a shutdown timeout in seconds. Default is 10.
+.SS
+rm
+Remove stopped service containers
+.TP
+\fB\-f\fR, \fB\-\-force\fR
+Do not ask to confirm removal.
+.TP
+\fB\-v\fR
+Remove volumes associated with containers.
+.SS
+run
+Run a one\-off command on a service. By default linked services will be started, unless they are
+already running.
+.TP
+\fB\-\-allow\-insecure\-ssl\fR
+Allow insecure connections to the Docker registry.
+.TP
+\fB\-d\fR
+Detached mode. Run container in the background, print new container name.
+.TP
+\fB\-\-entrypoint\fR \fICMD\fR
+Override the entrypoint of the image with \fICMD\fR.
+.TP
+\fB\-e\fR KEY=VAL
+Set an environment variable. Can be used multiple times.
+.TP
+\fB\-u\fR, \fB\-\-user=\fR\fIUSER\fR
+Run as a specific \fIUSER\fR, a username or uid.
+.TP
+\fB\-\-no\-deps\fR
+Do not start linked services.
+.TP
+\fB\-\-rm\fR
+Remove container after run. This option is ignored in the detached mode.
+.TP
+\fB\-\-service\-ports\fR
+Run command with the service's ports enabled and mapped to the host.
+.TP
+\fB\-T\fR
+Disable pseudo tty allocation. By default a tty is allocated.
+.SS
+scale
+Set number of containers to run for a service. Numbers are specified in the form \fBservice=num\fR
+as arguments.
+.PP
+.RS
+.nf
+# docker\-compose scale web=2 worker=3
+.SS
+start
+Start existing containers.
+.SS
+stop
+Stop running containers without removing them.
+.TP
+\fB\-t\fR, \fB\-\-timeout\fR \fITIMEOUT\fR
+Specify a shutdown timeout in seconds. Default is 10.
+.SS
+up
+Build, (re)create, start and attach to containers. If there are existing containers for a service, `docker-compose up` will stop and recreate them (preserving mounted volumes with volumes-from), so that changes in `docker-compose.yml` are picked up. If you do not want existing
+containers to be recreated, `docker-compose up --no-recreate` will re-use existing containers.
+.TP
+\fB\-\-allow\-insecure\-ssl\fR
+Allow insecure connections to the Docker registry.
+.TP
+\fB\-d\fR
+Detached mode. Run container in the background, print new container name.
+.TP
+\fB\-\-no\-color\fR
+Produce a monochrome output.
+.TP
+\fB\-\-no\-deps\fR
+Do not start linked services.
+.TP
+\fB\-\-x\-smart\-recreate\fR
+Only recreate containers whose configuration or image needs to be updated. This feature is
+experimental.
+.TP
+\fB\-\-no\-recreate\fR
+If containers already exist, do not recreate them.
+.TP
+\fB\-\-no\-build\fR
+Do not build an image even if it is missing.
+.TP
+\fB\-t\fR, \fB\-\-timeout\fR \fITIMEOUT\fR
+Specify a shutdown timeout in seconds. Default is 10.
+.SS
+migrate\-to\-labels
+Recreate containers to add labels. If docker-compose detects containers that were created without
+labels, it will refuse to run so that you don't end up with two sets of them.
+.SH ENVIRONMENTAL VARIABLES
+Several environmental variables are available to configure docker\-compose behavior.
+.PP
+Variables starting with \fIDOCKER_\fR are the same as those used to configure the
+Docker command\-line client. If you're using boot2docker, \fIeval "$(boot2docker shellinit)"\fR
+will set them to their correct values.
+
+.SS COMPOSE_PROJECT_NAME
+Sets the project name, which is prepended to the name of every container started by docker\-compose.
+Defaults to the \fIbasename\fR of the current working directory.
+.SS COMPOSE_FILE
+Specify what file to read configuration from. If not provided, docker\-compose will look
+for \fIdocker-compose.yml\fR in the current working directory, and then each parent
+directory successively, until found.
+.SS DOCKER_HOST
+Sets the URL of the docker daemon. As with the Docker client, defaults to
+\fIunix:///var/run/docker.sock\fR.
+.SS DOCKER_TLS_VERIFY
+When set to anything other than an empty string, enables TLS communication with
+the daemon.
+.SS DOCKER_CERT_PATH
+Configures the path to the \fIca.pem\fR, \fIcert.pem\fR, and \fIkey.pem\fR files used for TLS
+verification. Defaults to \fI~/.docker\fR.
+
+.SH "SEE ALSO"
+.PP
+Full documentation for docker-compose at: <http://docs.docker.com/compose/>
+.SH AUTHOR
+
+This manual page was written by Dariusz Dwornikowski <dariusz.dwornikowski@cs.put.poznan.pl> based
+on the official docker compose documentation.
+
+
diff --git a/debian/docker-compose.manpages b/debian/docker-compose.manpages
new file mode 100644
index 00000000..5bd0d664
--- /dev/null
+++ b/debian/docker-compose.manpages
@@ -0,0 +1 @@
+debian/docker-compose.1
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 00000000..d74eeb3e
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,3 @@
+README.md
+SWARM.md
+docs/*.md
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 00000000..59db498a
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,11 @@
+[DEFAULT]
+pristine-tar = True
+patch-numbers = False
+debian-branch = debian
+
+[import-orig]
+upstream-vcs-tag = %(version)s
+
+[dch]
+full = True
+multimaint-merge = True
diff --git a/debian/patches/Relax-dependencies.patch b/debian/patches/Relax-dependencies.patch
new file mode 100644
index 00000000..f20b8315
--- /dev/null
+++ b/debian/patches/Relax-dependencies.patch
@@ -0,0 +1,29 @@
+From: Felipe Sateler <fsateler@gmail.com>
+Date: Mon, 17 Oct 2016 10:35:03 -0300
+Subject: Relax dependencies
+
+docker-py, dockerpty and requests are too restrictive
+---
+ setup.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 192a0f6..085a338 100644
+--- a/setup.py
++++ b/setup.py
+@@ -33,11 +33,11 @@ install_requires = [
+ 'cached-property >= 1.2.0, < 2',
+ 'docopt >= 0.6.1, < 0.7',
+ 'PyYAML >= 3.10, < 4',
+- 'requests >= 2.6.1, != 2.11.0, < 2.12',
+- 'texttable >= 0.9.0, < 0.10',
++ 'requests >= 2.6.1',
++ 'texttable >= 0.9',
+ 'websocket-client >= 0.32.0, < 1.0',
+- 'docker >= 2.5.1, < 3.0',
+- 'dockerpty >= 0.4.1, < 0.5',
++ 'docker >= 2.4.0',
++ 'dockerpty >= 0.4.1',
+ 'six >= 1.3.0, < 2',
+ 'jsonschema >= 2.5.1, < 3',
+ ]
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 00000000..cb797975
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Relax-dependencies.patch
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
new file mode 100644
index 00000000..cdb35cc2
--- /dev/null
+++ b/debian/pydist-overrides
@@ -0,0 +1,3 @@
+requests python-requests (>= 2.6.1)
+docker-py python-docker (>= 1.9.0)
+dockerpty python-dockerpty (>= 0.4.1)
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 00000000..58f8afab
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,19 @@
+#!/usr/bin/make -f
+
+export PYBUILD_NAME=docker-compose
+%:
+ dh $@ --with python2 --buildsystem=pybuild
+
+DESTDIR = $(CURDIR)/debian/docker-compose
+override_dh_auto_install:
+ dh_auto_install --buildsystem=pybuild
+ mkdir -p $(DESTDIR)/usr/share/zsh/vendor-completions $(DESTDIR)/usr/share/bash-completion/completions
+ install -m644 contrib/completion/zsh/_docker-compose $(DESTDIR)/usr/share/zsh/vendor-completions
+ install -m644 contrib/completion/bash/docker-compose $(DESTDIR)/usr/share/bash-completion/completions
+
+override_dh_auto_test:
+ # tests disabled because they require networking
+
+test:
+ which pytest || (echo "pytest not found. install python-pytest" ; exit 1)
+ pytest tests
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 00000000..163aaf8d
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 00000000..56bc4a87
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,11 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+opts="filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/docker-compose-$1\.tar\.gz/,uversionmangle=s/-?rc/~rc/" \
+ https://github.com/docker/compose/tags .*/v?(\d\S*)\.tar\.gz
+