Merge pull request #6065 from docker/bump-1.22.0-rc2
Bump 1.22.0-rc2
Matthieu Nottale authored 5 years ago
GitHub committed 5 years ago
| 48 | 48 |
|
| 49 | 49 |
- Fixed an issue that prevented proper parsing of UTF-8 BOM encoded
|
| 50 | 50 |
Compose files on Windows
|
|
51 |
|
|
52 |
- Fixed an issue with handling of the double-wildcard (`**`) pattern in `.dockerignore` files when using `docker-compose build`
|
|
53 |
|
|
54 |
- Fixed a bug that caused auth values in legacy `.dockercfg` files to be ignored
|
|
55 |
- `docker-compose build` will no longer attempt to create image names starting with an invalid character
|
| 51 | 56 |
|
| 52 | 57 |
1.21.2 (2018-05-03)
|
| 53 | 58 |
-------------------
|
| 0 | 0 |
from __future__ import absolute_import
|
| 1 | 1 |
from __future__ import unicode_literals
|
| 2 | 2 |
|
| 3 | |
__version__ = '1.22.0-rc1'
|
|
3 |
__version__ = '1.22.0-rc2'
|
| 362 | 362 |
|
| 363 | 363 |
@property
|
| 364 | 364 |
def image_name(self):
|
| 365 | |
return self.options.get('image', '{s.project}_{s.name}'.format(s=self))
|
|
365 |
return self.options.get('image', '{project}_{s.name}'.format(
|
|
366 |
s=self, project=self.project.lstrip('_-')
|
|
367 |
))
|
| 366 | 368 |
|
| 367 | 369 |
@property
|
| 368 | 370 |
def platform(self):
|
| 1 | 1 |
cached-property==1.3.0
|
| 2 | 2 |
certifi==2017.4.17
|
| 3 | 3 |
chardet==3.0.4
|
| 4 | |
docker==3.4.0
|
|
4 |
docker==3.4.1
|
| 5 | 5 |
docker-pycreds==0.3.0
|
| 6 | 6 |
dockerpty==0.4.1
|
| 7 | 7 |
docopt==0.6.2
|
| 24 | 24 |
'desc': 'Automated release for {}: {}'.format(NAME, repo_name),
|
| 25 | 25 |
'labels': ['docker-compose', 'docker', 'release-bot'],
|
| 26 | 26 |
}
|
| 27 | |
result = self.post_json(url, data)
|
| 28 | |
result.raise_for_status()
|
| 29 | |
return result
|
| 30 | |
|
| 31 | |
def repository_exists(self, subject, repo_name):
|
| 32 | |
url = '{base}/repos/{subject}/{repo_name}'.format(
|
| 33 | |
base=self.base_url, subject=subject, repo_name=repo_name,
|
| 34 | |
)
|
| 35 | |
result = self.get(url)
|
| 36 | |
if result.status_code == 404:
|
| 37 | |
return False
|
| 38 | |
result.raise_for_status()
|
| 39 | |
return True
|
|
27 |
return self.post_json(url, data)
|
| 40 | 28 |
|
| 41 | 29 |
def delete_repository(self, subject, repo_name):
|
| 42 | 30 |
url = '{base}/repos/{subject}/{repo_name}'.format(
|
| 57 | 57 |
repository.push_branch_to_remote(release_branch)
|
| 58 | 58 |
|
| 59 | 59 |
bintray_api = BintrayAPI(os.environ['BINTRAY_TOKEN'], bintray_user)
|
| 60 | |
if not bintray_api.repository_exists(bintray_org, release_branch.name):
|
| 61 | |
print('Creating data repository {} on bintray'.format(release_branch.name))
|
| 62 | |
bintray_api.create_repository(bintray_org, release_branch.name, 'generic')
|
| 63 | |
else:
|
| 64 | |
print('Bintray repository {} already exists. Skipping'.format(release_branch.name))
|
|
60 |
print('Creating data repository {} on bintray'.format(release_branch.name))
|
|
61 |
bintray_api.create_repository(bintray_org, release_branch.name, 'generic')
|
| 65 | 62 |
|
| 66 | 63 |
|
| 67 | 64 |
def monitor_pr_status(pr_data):
|
| 16 | 16 |
|
| 17 | 17 |
docker run -e GITHUB_TOKEN=$GITHUB_TOKEN -e BINTRAY_TOKEN=$BINTRAY_TOKEN -e SSH_AUTH_SOCK=$SSH_AUTH_SOCK -it \
|
| 18 | 18 |
--mount type=bind,source=$(pwd),target=/src \
|
|
19 |
--mount type=bind,source=$(pwd)/.git,target=/src/.git \
|
| 19 | 20 |
--mount type=bind,source=$HOME/.docker,target=/root/.docker \
|
| 20 | 21 |
--mount type=bind,source=$HOME/.gitconfig,target=/root/.gitconfig \
|
| 21 | 22 |
--mount type=bind,source=/var/run/docker.sock,target=/var/run/docker.sock \
|
| 35 | 35 |
'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.19',
|
| 36 | 36 |
'texttable >= 0.9.0, < 0.10',
|
| 37 | 37 |
'websocket-client >= 0.32.0, < 1.0',
|
| 38 | |
'docker >= 3.4.0, < 4.0',
|
|
38 |
'docker >= 3.4.1, < 4.0',
|
| 39 | 39 |
'dockerpty >= 0.4.1, < 0.5',
|
| 40 | 40 |
'six >= 1.3.0, < 2',
|
| 41 | 41 |
'jsonschema >= 2.5.1, < 3',
|
| 1136 | 1136 |
service.build()
|
| 1137 | 1137 |
assert service.image()
|
| 1138 | 1138 |
|
|
1139 |
def test_build_with_illegal_leading_chars(self):
|
|
1140 |
base_dir = tempfile.mkdtemp()
|
|
1141 |
self.addCleanup(shutil.rmtree, base_dir)
|
|
1142 |
with open(os.path.join(base_dir, 'Dockerfile'), 'w') as f:
|
|
1143 |
f.write('FROM busybox\nRUN echo "Embodiment of Scarlet Devil"\n')
|
|
1144 |
service = Service(
|
|
1145 |
'build_leading_slug', client=self.client,
|
|
1146 |
project='___-composetest', build={
|
|
1147 |
'context': text_type(base_dir)
|
|
1148 |
}
|
|
1149 |
)
|
|
1150 |
assert service.image_name == 'composetest_build_leading_slug'
|
|
1151 |
service.build()
|
|
1152 |
assert service.image()
|
|
1153 |
|
| 1139 | 1154 |
def test_start_container_stays_unprivileged(self):
|
| 1140 | 1155 |
service = self.create_service('web')
|
| 1141 | 1156 |
container = create_and_start_container(service).inspect()
|