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.

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

feat: package aliases for snapshots #21960

Merged
merged 9 commits into from
Oct 21, 2020
Merged

feat: package aliases for snapshots #21960

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3cd405d
feat: push aliases for docker images
mdelapenya Oct 19, 2020
707e0d7
feat: build alias for snapshots
mdelapenya Oct 19, 2020
cff2cef
fix: only update alias on snapshots
mdelapenya Oct 19, 2020
843f472
fix: wrong image name for alias
mdelapenya Oct 19, 2020
64949ff
fix: reuse variable as groovy does not hide variables by scope
mdelapenya Oct 19, 2020
d2a3f39
chore: extract common logic to a method
mdelapenya Oct 19, 2020
4724960
Revert "fix: only update alias on snapshots"
mdelapenya Oct 19, 2020
7416af7
Revert "feat: build alias for snapshots"
mdelapenya Oct 19, 2020
e8ab32b
chore: do not push aliases for PRs
mdelapenya Oct 19, 2020
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
22 changes: 22 additions & 0 deletions .ci/packaging.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,12 @@ def pushCIDockerImages(){

def tagAndPush(name){
def libbetaVer = sh(label: 'Get libbeat version', script: 'grep defaultBeatVersion ${BASE_DIR}/libbeat/version/version.go|cut -d "=" -f 2|tr -d \\"', returnStdout: true)?.trim()
def aliasVersion = ""
if("${env.SNAPSHOT}" == "true"){
aliasVersion = libbetaVer.substring(0, libbetaVer.lastIndexOf(".")) // remove third number in version

libbetaVer += "-SNAPSHOT"
aliasVersion += "-SNAPSHOT"
}

def tagName = "${libbetaVer}"
Expand Down Expand Up @@ -227,6 +231,24 @@ def tagAndPush(name){
log(level: 'WARN', text: "${name} doesn't have ${variant} docker images. See https://github.com/elastic/beats/pull/21621")
}
}

if (aliasVersion != "") {
def aliasName = "${DOCKER_REGISTRY}/observability-ci/${name}${variant}:${aliasVersion}"
def iterations = 0
retryWithSleep(retries: 3, seconds: 5, backoff: true) {
iterations++
def status = sh(label:'Change tag and push', script: """
docker tag ${oldName} ${aliasName}
docker push ${newName}
""", returnStatus: true)

if ( status > 0 && iterations < 3) {
error('tag and push failed, retry')
} else if ( status > 0 ) {
log(level: 'WARN', text: "${name} doesn't have ${variant} docker images. See https://github.com/elastic/beats/pull/21621")
}
}
}
}
}

Expand Down
15 changes: 14 additions & 1 deletion dev-tools/mage/dockerbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,26 @@ func (b *dockerBuilder) expandDockerfile(templatesDir string, data map[string]in

func (b *dockerBuilder) dockerBuild() (string, error) {
tag := fmt.Sprintf("%s:%s", b.imageName, b.Version)
aliasTag := ""
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jsoriano I was not able to easily execute this locally (create the elastic-agent docker image) with one single command. Do you know the build steps?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mage package in the elastic-agent directory should generate all the packages, including the docker images. There is no command to generate only the docker images.
You may want to select the platforms with the PLATFORM environment variable, if not it will generate all the packages for all the platforms, what will probably take a while.

if b.Snapshot {
tag = tag + "-SNAPSHOT"
// remove third number in version
aliasTag = fmt.Sprintf("%s:%s-SNAPSHOT", b.imageName, b.Version[0:strings.LastIndex(b.Version, ".")])
}
if repository, _ := b.ExtraVars["repository"]; repository != "" {
tag = fmt.Sprintf("%s/%s", repository, tag)
aliasTag = fmt.Sprintf("%s/%s", repository, aliasTag)
}
return tag, sh.Run("docker", "build", "-t", tag, b.buildDir)

args := []string{
"build", "-t", tag,
}
if aliasTag != "" {
args = append(args, "-t", aliasTag)
}
args = append(args, b.buildDir)

return tag, sh.Run("docker", args...)
}

func (b *dockerBuilder) dockerSave(tag string) error {
Expand Down