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

Revert the Ubuntu version update #42144

Merged
merged 1 commit into from
Dec 30, 2024
Merged

Revert the Ubuntu version update #42144

merged 1 commit into from
Dec 30, 2024

Conversation

rdner
Copy link
Member

@rdner rdner commented Dec 22, 2024 •
edited
Loading

Due to ECE compatibility issues we have to switch back to 20.04.

How to test this PR locally

PLATFORMS=linux/arm64 PACKAGES=docker mage package

Before the change

docker.elastic.co/beats/filebeat 8.17.1 19e23b0fa142 356MB
docker history 
IMAGE          CREATED              CREATED BY                                      SIZE      COMMENT
19e23b0fa142   About a minute ago   CMD ["-environment" "container"]                0B        buildkit.dockerfile.v0
<missing>      About a minute ago   ENTRYPOINT ["/usr/bin/tini" "--" "/usr/local…   0B        buildkit.dockerfile.v0
<missing>      About a minute ago   WORKDIR /usr/share/filebeat                     0B        buildkit.dockerfile.v0
<missing>      About a minute ago   ENV LIBBEAT_MONITORING_CGROUPS_HIERARCHY_OVE…   0B        buildkit.dockerfile.v0
<missing>      About a minute ago   USER 1000                                       0B        buildkit.dockerfile.v0
<missing>      About a minute ago   RUN /bin/sh -c useradd -M --uid 1000 --gid 1…   4.42kB    buildkit.dockerfile.v0
<missing>      About a minute ago   RUN /bin/sh -c groupadd --gid 1000 filebeat …   1.63kB    buildkit.dockerfile.v0
<missing>      About a minute ago   COPY /usr/share/filebeat/NOTICE.txt /license…   3.28MB    buildkit.dockerfile.v0
<missing>      About a minute ago   COPY /usr/share/filebeat/LICENSE.txt /licens…   13.7kB    buildkit.dockerfile.v0
<missing>      About a minute ago   RUN /bin/sh -c mkdir /licenses # buildkit       0B        buildkit.dockerfile.v0
<missing>      About a minute ago   COPY /usr/share/filebeat /usr/share/filebeat…   196MB     buildkit.dockerfile.v0
<missing>      About a minute ago   RUN /bin/sh -c chmod 755 /usr/local/bin/dock…   716B      buildkit.dockerfile.v0
<missing>      About a minute ago   COPY docker-entrypoint /usr/local/bin/docker…   716B      buildkit.dockerfile.v0
<missing>      About a minute ago   RUN /bin/sh -c set -e ;   TINI_BIN="";   TIN…   23.9kB    buildkit.dockerfile.v0
<missing>      About a minute ago   ENV GODEBUG=madvdontneed=1                      0B        buildkit.dockerfile.v0
<missing>      About a minute ago   ENV PATH=/usr/share/filebeat:/usr/local/sbin…   0B        buildkit.dockerfile.v0
<missing>      About a minute ago   ENV ELASTIC_CONTAINER=true                      0B        buildkit.dockerfile.v0
<missing>      About a minute ago   LABEL org.label-schema.build-date=2024-12-22…   0B        buildkit.dockerfile.v0
<missing>      About a minute ago   RUN /bin/sh -c for iter in {1..10}; do      …   56.6MB    buildkit.dockerfile.v0
<missing>      About a minute ago   RUN /bin/sh -c touch /var/mail/ubuntu && cho…   4.47kB    buildkit.dockerfile.v0
<missing>      4 weeks ago          /bin/sh -c #(nop)  CMD ["/bin/bash"]            0B        
<missing>      4 weeks ago          /bin/sh -c #(nop) ADD file:765dfd09ec2ac4870…   101MB     
<missing>      4 weeks ago          /bin/sh -c #(nop)  LABEL org.opencontainers.…   0B        
<missing>      4 weeks ago          /bin/sh -c #(nop)  LABEL org.opencontainers.…   0B        
<missing>      4 weeks ago          /bin/sh -c #(nop)  ARG LAUNCHPAD_BUILD_ARCH     0B        
<missing>      4 weeks ago          /bin/sh -c #(nop)  ARG RELEASE                  0B

After the change

docker.elastic.co/beats/filebeat 8.17.1 5931ccc2e70c 319MB
docker history 
IMAGE          CREATED          CREATED BY                                      SIZE      COMMENT
5931ccc2e70c   52 seconds ago   CMD ["-environment" "container"]                0B        buildkit.dockerfile.v0
<missing>      52 seconds ago   ENTRYPOINT ["/usr/bin/tini" "--" "/usr/local…   0B        buildkit.dockerfile.v0
<missing>      52 seconds ago   WORKDIR /usr/share/filebeat                     0B        buildkit.dockerfile.v0
<missing>      52 seconds ago   ENV LIBBEAT_MONITORING_CGROUPS_HIERARCHY_OVE…   0B        buildkit.dockerfile.v0
<missing>      52 seconds ago   USER 1000                                       0B        buildkit.dockerfile.v0
<missing>      52 seconds ago   RUN /bin/sh -c useradd -M --uid 1000 --gid 1…   333kB     buildkit.dockerfile.v0
<missing>      52 seconds ago   RUN /bin/sh -c groupadd --gid 1000 filebeat …   1.67kB    buildkit.dockerfile.v0
<missing>      52 seconds ago   COPY /usr/share/filebeat/NOTICE.txt /license…   3.28MB    buildkit.dockerfile.v0
<missing>      52 seconds ago   COPY /usr/share/filebeat/LICENSE.txt /licens…   13.7kB    buildkit.dockerfile.v0
<missing>      52 seconds ago   RUN /bin/sh -c mkdir /licenses # buildkit       0B        buildkit.dockerfile.v0
<missing>      52 seconds ago   COPY /usr/share/filebeat /usr/share/filebeat…   196MB     buildkit.dockerfile.v0
<missing>      52 seconds ago   RUN /bin/sh -c chmod 755 /usr/local/bin/dock…   716B      buildkit.dockerfile.v0
<missing>      52 seconds ago   COPY docker-entrypoint /usr/local/bin/docker…   716B      buildkit.dockerfile.v0
<missing>      52 seconds ago   RUN /bin/sh -c set -e ;   TINI_BIN="";   TIN…   23.9kB    buildkit.dockerfile.v0
<missing>      52 seconds ago   ENV GODEBUG=madvdontneed=1                      0B        buildkit.dockerfile.v0
<missing>      52 seconds ago   ENV PATH=/usr/share/filebeat:/usr/local/sbin…   0B        buildkit.dockerfile.v0
<missing>      52 seconds ago   ENV ELASTIC_CONTAINER=true                      0B        buildkit.dockerfile.v0
<missing>      52 seconds ago   LABEL org.label-schema.build-date=2024-12-22…   0B        buildkit.dockerfile.v0
<missing>      53 seconds ago   RUN /bin/sh -c for iter in {1..10}; do      …   53.6MB    buildkit.dockerfile.v0
<missing>      2 months ago     /bin/sh -c #(nop)  CMD ["/bin/bash"]            0B        
<missing>      2 months ago     /bin/sh -c #(nop) ADD file:8537b4db344382b39…   65.7MB    
<missing>      2 months ago     /bin/sh -c #(nop)  LABEL org.opencontainers.…   0B        
<missing>      2 months ago     /bin/sh -c #(nop)  LABEL org.opencontainers.…   0B        
<missing>      2 months ago     /bin/sh -c #(nop)  ARG LAUNCHPAD_BUILD_ARCH     0B        
<missing>      2 months ago     /bin/sh -c #(nop)  ARG RELEASE                  0B

@rdner rdner added Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team backport-8.16 Automated backport with mergify labels Dec 22, 2024
@rdner rdner self-assigned this Dec 22, 2024
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Dec 22, 2024
@rdner
Revert the Ubuntu version update
fe2ec0e 
Due to ECE compatibility issues we have to switch back to 20.04.
@rdner rdner force-pushed the revert-ubuntu-version-upgrade branch from c0a3a17 to fe2ec0e Compare December 22, 2024 21:07
rdner
rdner commented Dec 22, 2024
View reviewed changes
dev-tools/packaging/templates/docker/Dockerfile.tmpl
@@ -57,7 +57,6 @@ RUN for iter in {1..10}; do \
{{- end }}

{{- if contains .from "ubuntu" }}
RUN touch /var/mail/ubuntu && chown ubuntu /var/mail/ubuntu && userdel -r ubuntu
Copy link
Member Author

Choose a reason for hiding this comment

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

Was also introduced by the upgrade #40942
The older Ubuntu image does not build with this.

@rdner rdner requested review from cmacknz and jlind23 December 22, 2024 21:17
@rdner rdner marked this pull request as ready for review December 22, 2024 21:17
@rdner rdner requested a review from a team as a code owner December 22, 2024 21:17
@elasticmachine
Copy link
Collaborator

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

@jlind23 jlind23 merged commit e9a6565 into elastic:8.17 Dec 30, 2024
143 checks passed
mergify bot pushed a commit that referenced this pull request Dec 30, 2024
@rdner @mergify
Revert the Ubuntu version update (#42144)
5a34bbc 
Due to ECE compatibility issues we have to switch back to 20.04.

(cherry picked from commit e9a6565)
@mergify mergify bot mentioned this pull request Dec 30, 2024
Merged
jlind23 pushed a commit that referenced this pull request Dec 30, 2024
@mergify @rdner
Revert the Ubuntu version update (#42144) (#42176)
8dd2b88 
Due to ECE compatibility issues we have to switch back to 20.04.

(cherry picked from commit e9a6565)

Co-authored-by: Denis <[email protected]>
@rdner rdner deleted the revert-ubuntu-version-upgrade branch January 6, 2025 07:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jlind23 jlind23 jlind23 approved these changes

@cmacknz cmacknz Awaiting requested review from cmacknz

Assignees

@rdner rdner

Labels
backport-8.16 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 @jlind23