Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure alternate-tags is properly injected for git:from-image deploys #4493

Merged
merged 5 commits into from
Apr 16, 2021
Merged

Ensure alternate-tags is properly injected for git:from-image deploys #4493

merged 5 commits into from
Apr 16, 2021

Conversation

Cellane
Copy link
Contributor

@Cellane Cellane commented Mar 19, 2021

This PR will (hopefully) add a test that indicates a failure in image labeling using docker-image-labeler during git:from-image deployment.

@Cellane
Copy link
Contributor Author

Cellane commented Mar 21, 2021

Thank you! 🙇‍♂️

@josegonzalez
Copy link
Member

Okay I figured it out. For git:from-image, we add custom labels via --label on the docker build, so the image actually isn't the one you specify.

That said, we can add the LABEL for the docker-image-labeler, which I think is fine for our use case.

Cellane and others added 5 commits April 16, 2021 12:28
This label is otherwise missing, causing tooling that might want to know about it's pre-existing labels - specifically, docker-image-labeler - to fail to run as expected.
@josegonzalez josegonzalez changed the title ✅ Add failing test for image labeling Ensure alternate-tags is properly injected for git:from-image deploys Apr 16, 2021
@josegonzalez josegonzalez merged commit 7847c8b into dokku:master Apr 16, 2021
github-actions bot pushed a commit that referenced this pull request Apr 17, 2021
# History

## 0.24.6

Install/update via the bootstrap script:

```shell
wget https://raw.githubusercontent.com/dokku/dokku/v0.24.6/bootstrap.sh
sudo DOKKU_TAG=v0.24.6 bash bootstrap.sh
```

### Bug Fixes

- #4493: @Cellane Ensure alternate-tags is properly injected for git:from-image deploys
- #4563: @Akirtovskis Tough netrc file when setting git:auth entries
- #4566: @jasiek Normalize Dockerfile line terminators to handle issues in port extraction
- #4567: @josegonzalez Ensure plugin:update updates all plugins when no plugin is specified
- #4568: @josegonzalez Do not insert log max-size when log-driver is set at daemon-level
- #4554: @josegonzalez Ensure deployment task containers get associated to internal networks

### New Features

- #4557: @josegonzalez Add bash-completion to debian package recommends
- #4484: @lunswor Bumps vector image version to 0.12.x

### Other

- #4569: @dependabot-preview[bot] chore(deps-dev): bump heroku/heroku-buildpack-php from 190 to 191 in /tests/apps/php
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants