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

fix: generate complete variant binaries properly #27609

Closed
wants to merge 10 commits into from
Closed

fix: generate complete variant binaries properly #27609

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
21754c9
fix: generate complete variant binaries properly
mdelapenya Aug 26, 2021
2337d09
Merge branch 'master' into 27608-fix-elastic-agent-build
mdelapenya Sep 1, 2021
16ae989
Merge branch 'master' into 27608-fix-elastic-agent-build
mdelapenya Sep 9, 2021
f695122
fix: pass agent dockerfile to complete spec
mdelapenya Sep 9, 2021
6a38889
fix: do not append variant to the artifact name
mdelapenya Sep 9, 2021
2cfdc9b
docs: update reference to complete variant
mdelapenya Sep 9, 2021
bbc386d
chore: reorder import
mdelapenya Sep 9, 2021
4dd6441
Merge branch 'master' into 27608-fix-elastic-agent-build
mdelapenya Sep 9, 2021
b086122
chore: remove unused param
mdelapenya Sep 13, 2021
4e341c0
Revert "chore: reorder import"
mdelapenya Sep 13, 2021
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
4 changes: 1 addition & 3 deletions dev-tools/mage/dockerbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,7 @@ func (b *dockerBuilder) expandDockerfile(templatesDir string, data map[string]in

func (b *dockerBuilder) dockerBuild(variant string) (string, error) {
imageName := b.imageName
if variant != "" {
imageName = fmt.Sprintf("%s-%s", imageName, variant)
}

taggedImageName := fmt.Sprintf("%s:%s", imageName, b.Version)
if b.Snapshot {
taggedImageName = taggedImageName + "-SNAPSHOT"
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/mage/pkgtypes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const (
packageStagingDir = "build/package"

// defaultBinaryName specifies the output file for zip and tar.gz.
defaultBinaryName = "{{.Name}}-{{if .Variant}}{{.Variant}}-{{end}}{{.Version}}{{if .Snapshot}}-SNAPSHOT{{end}}{{if .OS}}-{{.OS}}{{end}}{{if .Arch}}-{{.Arch}}{{end}}"
defaultBinaryName = "{{.Name}}-{{.Version}}{{if .Snapshot}}-SNAPSHOT{{end}}{{if .OS}}-{{.OS}}{{end}}{{if .Arch}}-{{.Arch}}{{end}}"
Copy link
Member

Choose a reason for hiding this comment

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

If Variant is not needed anymore here, I guess that the rest of #27621 can be reverted too?

)

// PackageType defines the file format of the package (e.g. zip, rpm, etc).
Expand Down
29 changes: 29 additions & 0 deletions dev-tools/packaging/packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,11 @@ shared:
from: 'arm64v8/centos:7'
buildFrom: 'arm64v8/centos:7'

- &agent_docker_complete_spec
extra_vars:
dockerfile: 'Dockerfile.elastic-agent.tmpl'
image_name: '{{.BeatName}}-complete'

# Deb/RPM spec for community beats.
- &deb_rpm_spec
<<: *common
Expand Down Expand Up @@ -1000,6 +1005,18 @@ specs:
<<: *agent_docker_spec
<<: *elastic_docker_spec
<<: *elastic_license_for_binaries
files:
'{{.BeatName}}{{.BinaryExt}}':
source: ./build/golang-crossbuild/{{.BeatName}}-{{.GOOS}}-{{.Platform.Arch}}{{.BinaryExt}}

- os: linux
arch: amd64
types: [docker]
spec:
<<: *agent_docker_spec
<<: *agent_docker_complete_spec
<<: *elastic_docker_spec
<<: *elastic_license_for_binaries
# This image gets a 'complete' variant for synthetics and other large
# packages too big to fit in the main image
variants: ["complete"]
Expand All @@ -1026,6 +1043,18 @@ specs:
<<: *agent_docker_arm_spec
<<: *elastic_docker_spec
<<: *elastic_license_for_binaries
files:
'{{.BeatName}}{{.BinaryExt}}':
source: ./build/golang-crossbuild/{{.BeatName}}-{{.GOOS}}-{{.Platform.Arch}}{{.BinaryExt}}

- os: linux
arch: arm64
types: [docker]
spec:
<<: *agent_docker_arm_spec
<<: *agent_docker_complete_spec
<<: *elastic_docker_spec
<<: *elastic_license_for_binaries
# This image gets a 'complete' variant for synthetics and other large
# packages too big to fit in the main image
variants: ["complete"]
Expand Down
4 changes: 2 additions & 2 deletions x-pack/elastic-agent/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ If you are in the 7.13 branch, this will create the `docker.elastic.co/beats/ela
elastic-package stack up --version=7.13.0-SNAPSHOT -v
```

Please note that the docker container is built in both standard and 'offline' variants.
The 'offline' variant contains extra files, like the chromium browser, that are too large
Please note that the docker container is built in both standard and 'complete' variants.
The 'complete' variant contains extra files, like the chromium browser, that are too large
for the standard variant.
3 changes: 1 addition & 2 deletions x-pack/osquerybeat/beater/config_plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@ import (
"strings"
"testing"

"github.com/google/go-cmp/cmp"

"github.com/elastic/beats/v7/libbeat/logp"
"github.com/elastic/beats/v7/x-pack/osquerybeat/internal/config"
"github.com/elastic/beats/v7/x-pack/osquerybeat/internal/ecs"
"github.com/elastic/beats/v7/x-pack/osquerybeat/internal/testutil"
"github.com/google/go-cmp/cmp"
)

func renderFullConfigJSON(inputs []config.InputConfig) (string, error) {
Expand Down