Skip to content

fix(docker): Use consistent names in targetFormat #126

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.

Sign up for GitHub

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

Merged
BYK merged 1 commit into from
Oct 7, 2020
Merged

fix(docker): Use consistent names in targetFormat #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ non-idempotent targets, not for the Docker target.
| `source` | Path to the source Docker image to be pulled |
| `sourceFormat` | Format for the source image name. Default: `{{source}}:{{revision}}` |
| `target` | Path to the target Docker image to be pushed |
| `targetFormat` | Format for the target image name. Default: `{{target}}:{{release}}` |
| `targetFormat` | Format for the target image name. Default: `{{target}}:{{version}}` |

**Example**

Expand Down
10 changes: 5 additions & 5 deletions src/targets/docker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export interface DockerTargetOptions extends TargetConfig {
source: string;
/** Full name template for the source image path, defaults to `{{source}}:{{revision}}` */
sourceTemplate: string;
/** Full name template for the target image path, defaults to `{{target}}:{{release}}` */
/** Full name template for the target image path, defaults to `{{target}}:{{version}}` */
targetTemplate: string;
/** Target image path, like `getsentry/craft` */
target: string;
Expand Down Expand Up @@ -66,7 +66,7 @@ export class DockerTarget extends BaseTarget {
source: this.config.source,
target: this.config.target,
sourceTemplate: this.config.sourceFormat || '{{source}}:{{revision}}',
targetTemplate: this.config.targetFormat || '{{target}}:{{release}}',
targetTemplate: this.config.targetFormat || '{{target}}:{{version}}',
username: process.env.DOCKER_USERNAME,
};
}
Expand Down Expand Up @@ -106,16 +106,16 @@ export class DockerTarget extends BaseTarget {
/**
* Pushes the locally tagged source image to Docker Hub
* @param sourceRevision The tag/revision for the source image
* @param targetTag The target tag (release version) for the target image
* @param version The release version for the target image
*/
public async push(sourceRevision: string, targetTag: string): Promise<any> {
public async push(sourceRevision: string, version: string): Promise<any> {
const sourceImage = renderTemplateSafe(this.dockerConfig.sourceTemplate, {
...this.dockerConfig,
revision: sourceRevision,
});
const targetImage = renderTemplateSafe(this.dockerConfig.targetTemplate, {
...this.dockerConfig,
release: targetTag,
version,
});
logger.debug('Tagging target image...');
await spawnProcess(DOCKER_BIN, ['tag', sourceImage, targetImage]);
Expand Down