1
0
mirror of https://github.com/tmaier/docker-compose synced 2024-11-22 16:01:59 +01:00
Commit Graph

54 Commits

Author SHA1 Message Date
Tobias L. Maier
18b74234c3
Add a small instruction on how to add a new docker version 2018-07-28 08:54:46 +02:00
Tobias L. Maier
d66dde5081
Add docker 18.06 with docker-compose 1.22.*
See https://github.com/docker/docker-ce/releases and https://github.com/docker/compose/releases
2018-07-28 08:50:10 +02:00
Tobias L. Maier
9de08fbd20
Add latest tag 2018-07-15 09:53:02 +02:00
Tobias L. Maier
4ea62c136a
Merge pull request #9 from p4km9y/master
docker v18.03 & compose v1.21.*
2018-07-12 06:37:29 +02:00
Patrik martinovský
c9afb80101 version update: docker v18.03 & compose v1.21.* 2018-07-11 10:57:52 +02:00
Tobias L. Maier
78cce2b1cb
Merge pull request #6 from BauCloud/master
Rework build process using Docker Hub hooks
2018-04-30 03:51:06 +10:00
Tobias L. Maier
821ba49d8a Fix loop of test 2018-04-29 19:35:40 +02:00
Tobias L. Maier
66499c954f compose_version not used in test and push hooks 2018-04-29 19:35:22 +02:00
Tobias L. Maier
548911cd35 Use set -ex in hooks 2018-04-29 18:44:46 +02:00
Tobias L. Maier
07035e327e Always attempt to pull a newer version of the image 2018-04-29 18:43:19 +02:00
Tobias L. Maier
66f17aa16b Revert "Prepare for debugging"
This reverts commit 02fe44c579ea3d5cce2fe79866bf106fec8a81d0.
2018-04-29 18:38:07 +02:00
Tobias L. Maier
f203228e70 Remove debug code 2018-04-29 18:34:14 +02:00
Tobias L. Maier
4792cc9f2d Fix docker-compose run command 2018-04-29 18:34:06 +02:00
Tobias L. Maier
04d5b013f3 Use DOCKER_AND_COMPOSE_VERSION_MATRIX also in push and test hooks 2018-04-29 18:12:01 +02:00
Tobias L. Maier
4b29dce360 Add more debug code 2018-04-29 18:03:24 +02:00
Tobias L. Maier
bdc358886a Fix order 2018-04-29 17:41:34 +02:00
Tobias L. Maier
02fe44c579 Prepare for debugging 2018-04-29 17:39:10 +02:00
Tobias L. Maier
646cb9ca88 Introduce image variable in build hook 2018-04-29 17:37:49 +02:00
Tobias L. Maier
9dc6c3ffc6 Add echos of different stages 2018-04-29 17:37:39 +02:00
Tobias L. Maier
d8736a5795 Improve shell syntax
ShellCheck syntax errors SC2006, SC2162, SC2086
2018-04-29 17:33:00 +02:00
Tobias L. Maier
e12ce4e9ed Add note in README
Document DOCKER_AND_COMPOSE_VERSION_MATRIX
2018-04-29 17:25:01 +02:00
Tobias L. Maier
3702ceb4b4 Add test hook 2018-04-29 07:28:01 +02:00
Tobias L. Maier
b3fc0e335f Add DOCKER_AND_COMPOSE_VERSION_MATRIX 2018-04-29 07:25:05 +02:00
Tobias L. Maier
7a59c5fad8 Add build and push scripts 2018-04-29 07:23:04 +02:00
Tobias L. Maier
8b6988d46d Remove individual build directories 2018-04-29 07:02:09 +02:00
Tobias L. Maier
319d4d511c Add test to each build directory
Tests are running automatically on Docker Hub
2018-04-29 06:52:07 +02:00
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
5a86bc3fc9 Add $BUILD_PATH env variable 2018-04-29 06:28:13 +02:00
Tobias L. Maier
957acd0406 Add simple test of successful installation of docker-compose
Based on https://docs.docker.com/docker-cloud/builds/advanced/#environment-variables-for-building-and-testing
2018-04-29 06:26:27 +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
Tobias L. Maier
c1c546273e
Merge pull request #5 from Novex/pin-compose-versions
Pin docker-compose versions to the time of release
2018-04-20 08:12:08 +10: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
Tobias L. Maier
757402d516 Add 18 2018-02-22 15:52:32 +01:00
Tobias L. Maier
1a4a68c30d Add 17.12 and 18.02 2018-02-22 15:20:16 +01:00
Tobias L. Maier
8bda7c2679 Add Docker 17.09 2017-10-08 12:43:19 +02:00
Tobias L. Maier
35647e9676 Add simple usage instructions for GitLab CI 2017-10-04 09:48:32 +02:00
Tobias L. Maier
eb0fb91b5c Update README
- update versions
- add hint to open Github issues or pull requests
2017-09-07 13:22:26 +02:00
Tobias L. Maier
bcdbeeaf53 Add support for Docker 17.06
This will fail as of today, as Docker 17.06 has not been released
2017-06-05 15:26:04 +02:00
Tobias L. Maier
1751621e73 Add support for Docker 17 2017-03-06 01:17:05 +01:00
Tobias L. Maier
0232b8d62b Merge pull request #1 from dzikismigol/master
Add dedicated 17.03 image
2017-03-06 01:14:19 +01:00
Michał Markiewicz
de03b6884e bump README.md 2017-03-05 21:46:18 +01:00
Michał Markiewicz
3bcf899aa6 add support for Docker 17.03 2017-03-05 21:45:06 +01:00
Tobias L. Maier
03d8d8fd5a Add badges to README 2017-01-29 14:15:32 +01:00
Tobias L. Maier
46eb98e290 Add versions based on different docker versions 2017-01-26 16:56:29 +01:00
Tobias L. Maier
671313da04 Use python version of docker-compose 2017-01-04 02:30:37 +01:00
Tobias L. Maier
6a85a508cf Use docker-compose container to run
- default install method does currently not work on alpine.
- pip option is not leightweight
- docker alias seems promising

https://docs.docker.com/compose/install/
2017-01-04 02:12:41 +01:00