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

Jump to bottom

Make Wolfi a part of Docker packaging #40524

Merged
merged 1 commit into from
Sep 9, 2024
Merged

Make Wolfi a part of Docker packaging #40524

merged 1 commit into from
Sep 9, 2024

Conversation

rdner
Copy link
Member

@rdner rdner commented Aug 14, 2024 •
edited
Loading

Proposed commit message

  • New images with -wolfi suffix get created
  • Wolfi is used for preparing the file structure for Docker images

How to test this PR locally

Script I use to build all the images:

#!/bin/bash

set -e

docker rmi -f $(docker images -a -q) || true

BEATS="auditbeat filebeat functionbeat heartbeat metricbeat packetbeat winlogbeat osquerybeat"
ROOT=$PWD

start_date=$(date)
for beat in $BEATS
do
		path="$ROOT/$beat"
		cd $path || echo "$path not found"
		mage clean
		(PLATFORMS=linux/arm64 PACKAGES=docker mage package) || (echo "failed to buid Docker image in $path" && exit 1)

		path="$ROOT/x-pack/$beat"
		cd $path || (echo "$path not found" && continue)
		mage clean
		(PLATFORMS=linux/arm64 PACKAGES=docker mage package) || (echo "failed to buid Docker image in $path" && exit 1)
done
cd $ROOT
end_date=$(date)
echo "started at $start_date and finished at $end_date"

List of images before the change:

REPOSITORY                                      TAG          IMAGE ID       CREATED          SIZE
docker.elastic.co/beats/auditbeat               8.16.0       47d631028605   33 minutes ago   253MB
docker.elastic.co/beats/auditbeat-oss           8.16.0       8f02578ac6fc   34 minutes ago   243MB
docker.elastic.co/beats/auditbeat-ubi           8.16.0       ed1d4b40ecd4   33 minutes ago   315MB
docker.elastic.co/beats/filebeat                8.16.0       81fc7f34f320   29 minutes ago   313MB
docker.elastic.co/beats/filebeat-oss            8.16.0       ddd6e8a553b4   31 minutes ago   243MB
docker.elastic.co/beats/filebeat-ubi            8.16.0       1ca6dc84362f   29 minutes ago   375MB
docker.elastic.co/beats/heartbeat               8.16.0       e840b42193f7   21 minutes ago   2.09GB
docker.elastic.co/beats/heartbeat-oss           8.16.0       9fe88a922414   25 minutes ago   2.07GB
docker.elastic.co/beats/heartbeat-ubi           8.16.0       ad974323e865   22 minutes ago   434MB
docker.elastic.co/beats/metricbeat              8.16.0       91ebb8e01fc1   16 minutes ago   340MB
docker.elastic.co/beats/metricbeat-oss          8.16.0       4dcdfedcae8d   17 minutes ago   273MB
docker.elastic.co/beats/metricbeat-ubi          8.16.0       79c288da30c4   16 minutes ago   402MB
docker.elastic.co/beats/packetbeat              8.16.0       dcddd3cc7436   13 minutes ago   382MB
docker.elastic.co/beats/packetbeat-oss          8.16.0       79fe32473cbd   14 minutes ago   363MB
docker.elastic.co/beats/packetbeat-ubi          8.16.0       3c0c0f84d3f8   13 minutes ago   444MB

List of images after the change:

REPOSITORY                                      TAG          IMAGE ID       CREATED          SIZE
docker.elastic.co/beats/auditbeat               8.16.0       cdd7ffd402ed   49 minutes ago   254MB
docker.elastic.co/beats/auditbeat-oss           8.16.0       d56fe6992533   50 minutes ago   243MB
docker.elastic.co/beats/auditbeat-ubi           8.16.0       7359220ecf21   49 minutes ago   249MB
docker.elastic.co/beats/auditbeat-wolfi         8.16.0       9a71ed55c01e   49 minutes ago   173MB
docker.elastic.co/beats/auditbeat-wolfi-oss     8.16.0       94243cbae7ea   50 minutes ago   163MB
docker.elastic.co/beats/filebeat                8.16.0       f2fef76dc249   45 minutes ago   314MB
docker.elastic.co/beats/filebeat-oss            8.16.0       e402f8404540   47 minutes ago   243MB
docker.elastic.co/beats/filebeat-ubi            8.16.0       952633d4345d   45 minutes ago   310MB
docker.elastic.co/beats/filebeat-wolfi          8.16.0       41657e24dbb6   45 minutes ago   234MB
docker.elastic.co/beats/filebeat-wolfi-oss      8.16.0       19cf32e6cab3   47 minutes ago   163MB
docker.elastic.co/beats/heartbeat               8.16.0       1054af2dc45e   38 minutes ago   1.97GB
docker.elastic.co/beats/heartbeat-oss           8.16.0       67f7108b24c6   42 minutes ago   1.96GB
docker.elastic.co/beats/heartbeat-ubi           8.16.0       cce02c244215   39 minutes ago   245MB
docker.elastic.co/beats/heartbeat-wolfi         8.16.0       cfabbd223126   38 minutes ago   1.56GB
docker.elastic.co/beats/heartbeat-wolfi-oss     8.16.0       1ac3fe4fd709   42 minutes ago   1.55GB
docker.elastic.co/beats/metricbeat              8.16.0       c76c12d6be58   34 minutes ago   344MB
docker.elastic.co/beats/metricbeat-oss          8.16.0       ee2bf310f6c4   35 minutes ago   277MB
docker.elastic.co/beats/metricbeat-ubi          8.16.0       355c5d4d8d6b   34 minutes ago   340MB
docker.elastic.co/beats/metricbeat-wolfi        8.16.0       0838b11505ab   34 minutes ago   264MB
docker.elastic.co/beats/metricbeat-wolfi-oss    8.16.0       c7b448a13179   35 minutes ago   197MB
docker.elastic.co/beats/packetbeat              8.16.0       02165d69c245   31 minutes ago   255MB
docker.elastic.co/beats/packetbeat-oss          8.16.0       63fc5f238efa   32 minutes ago   245MB
docker.elastic.co/beats/packetbeat-ubi          8.16.0       3053abbf83b4   31 minutes ago   250MB
docker.elastic.co/beats/packetbeat-wolfi        8.16.0       fe7595f1f10c   31 minutes ago   174MB
docker.elastic.co/beats/packetbeat-wolfi-oss    8.16.0       d77cd6ea972e   32 minutes ago   165MB

I made sure that containers are running normally by using this command and observing output:

docker run -it docker.elastic.co/beats/filebeat-wolfi:8.16.0 -e

Related issues

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 14, 2024
@mergify mergify bot assigned rdner Aug 14, 2024
@rdner rdner added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Aug 14, 2024
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Aug 14, 2024
@rdner rdner added needs_team Indicates that the issue/PR needs a Team:* label backport-skip Skip notification from the automated backport with mergify labels Aug 14, 2024
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Aug 14, 2024
@elastic elastic deleted a comment from mergify bot Aug 14, 2024
@rdner rdner force-pushed the docker-wolfi branch 3 times, most recently from 4c5f10d to f3dac4d Compare August 15, 2024 11:59
This was referenced Aug 15, 2024
Merged
Closed
@rdner
Copy link
Member Author

rdner commented Aug 20, 2024

After some experimentation I could not find a way to install synthetics on Wolfi, it depends on Playwright which does not support installing its dependencies on Wolfi. So, I'm moving synthetics on Wolfi out of scope of this PR #40564

@rdner rdner force-pushed the docker-wolfi branch 3 times, most recently from 3a42582 to df355a7 Compare August 21, 2024 08:38
@emilioalvap emilioalvap mentioned this pull request Sep 4, 2024
Merged
5 tasks
@elastic elastic deleted a comment from mergify bot Sep 5, 2024
@rdner rdner force-pushed the docker-wolfi branch 5 times, most recently from 76527e1 to 4f2d7ff Compare September 6, 2024 16:01
@rdner
Make Wolfi a part of Docker packaging
8adda87 
* New images with `-wolfi` suffix get created
* Wolfi is used for preparing the file structure for Docker images
@rdner rdner marked this pull request as ready for review September 6, 2024 18:37
@rdner rdner requested a review from a team as a code owner September 6, 2024 18:37
@rdner rdner requested a review from belimawr September 6, 2024 18:37
@rdner rdner requested a review from faec September 6, 2024 18:37
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@rdner rdner requested review from leehinman and emilioalvap and removed request for faec September 6, 2024 18:37
@rdner rdner merged commit b06f7ce into elastic:main Sep 9, 2024
124 checks passed
@rdner rdner deleted the docker-wolfi branch September 9, 2024 07:24
@rdner rdner mentioned this pull request Sep 11, 2024
Merged
@mergify mergify bot mentioned this pull request Sep 11, 2024
Merged
v1v added a commit to v1v/beats that referenced this pull request Sep 12, 2024
@v1v
updatecli: ironbank images are not anymore in the package file
ef83b81 
see elastic#40524
@v1v v1v mentioned this pull request Sep 12, 2024
Merged
6 tasks
v1v added a commit that referenced this pull request Sep 12, 2024
@v1v
updatecli: ironbank images are not anymore in the package file (#40786)
df31948 
see #40524
@rdner rdner mentioned this pull request Sep 18, 2024
Merged
@mergify mergify bot mentioned this pull request Sep 19, 2024
Merged
@naemono naemono mentioned this pull request Oct 10, 2024
Merged
8 tasks
@rdner rdner mentioned this pull request Oct 14, 2024
Merged
This was referenced Oct 15, 2024
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@leehinman leehinman leehinman approved these changes

@belimawr belimawr Awaiting requested review from belimawr belimawr is a code owner automatically assigned from elastic/elastic-agent-data-plane

@emilioalvap emilioalvap Awaiting requested review from emilioalvap

Assignees

@rdner rdner

Labels
backport-skip Skip notification from the automated backport with mergify Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rdner @elasticmachine @leehinman