1
0
mirror of https://github.com/tmaier/docker-compose synced 2024-11-26 05:47:50 +01:00
Commit Graph

8 Commits

Author SHA1 Message Date
Tobias L. Maier
ab9e84def9 Do not build image again for test
The image was built again, just for the test
2018-04-29 06:43:15 +02:00
Tobias L. Maier
c01c92e6f7 Move docker-compose.test.yml to build directory 2018-04-29 06:34:31 +02:00
Tobias L. Maier
57f5065db8 Add label with docker and compose version 2018-04-29 06:14:03 +02:00
Tobias L. Maier
f8edb88397 Replace MAINTAINER with LABEL
Based on OCI annotation spec

https://github.com/opencontainers/image-spec/blob/master/annotations.md
2018-04-29 06:06:00 +02:00
Tobias L. Maier
3f9dd85a73 Get image label from ARG 2018-04-29 05:22:04 +02:00
Tobias L. Maier
f007d880b0 Fix ARG COMPOSE_VERSION being defind outside build stage
See https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
2018-04-29 05:17:40 +02:00
Seb Patane
f7db8c7577 Pin docker-compose versions to the time of release
- Otherwise the docker-compose version is the latest available at time of build, which may not be compatible or expected
  - The latest `COMPOSE_VERSION` can be taken by setting the argument blank (or leaving it as is in the case of `latest`)
  - pip requires the `.*` to denote that we want the latest patch level, eg. just putting `docker-compose==1.11` installs `1.11.0` instead of `1.11.2`
- The extra `${COMPOSE_VERSION:+==}` is because pip errors out with `docker-compose==`

Fixes #4
2018-04-19 23:42:32 +10:00
Michał Markiewicz
3bcf899aa6 add support for Docker 17.03 2017-03-05 21:45:06 +01:00