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.

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

Sync with recent upstream image #372

Merged
merged 3 commits into from
Jan 16, 2024
Merged

Sync with recent upstream image #372

merged 3 commits into from
Jan 16, 2024

Conversation

kenhys
Copy link
Contributor

@kenhys kenhys commented Jan 11, 2024

Change base image because:

  • Use stable image instead of old-stable one because
    there is a bit delay to be shipped updates from upstream.
    (EOL of bullseye is around July, 2024)
  • fluent-package LTS adopts Ruby 3.2 by default.
  • Use alpine:3.19 to use Ruby 3.2.

Closes: #371

NOTE: Update linux containers at first.

@kenhys
Copy link
Contributor Author

kenhys commented Jan 12, 2024

checking test...

@kenhys
Copy link
Contributor Author

kenhys commented Jan 12, 2024

I've forgot to fix test.

@kenhys
Copy link
Contributor Author

kenhys commented Jan 12, 2024

Now it should pass.

@kenhys
Copy link
Contributor Author

kenhys commented Jan 12, 2024

locally checked, it passed.

make test
DOCKERFILE=v1.16/alpine IMAGE=fluent/fluentd:v1.16.3-1.1 \
        ./test/bats/bats test/suite.bats
 ✓ post_push hook is up-to-date
 ✓ ruby version is 3.2
 ✓ fluentd is installed
 ✓ fluentd runs ok
 ✓ fluentd has correct version
 ✓ gem 'oj' is installed 
 ✓ gem 'json' is installed 

7 tests, 0 failures

@kenhys
Copy link
Contributor Author

kenhys commented Jan 12, 2024

Oops, I've forgot to commit local change.

Makefile Outdated Show resolved Hide resolved
@kenhys kenhys force-pushed the rebuild branch 2 times, most recently from 8336c58 to 2b1b9b5 Compare January 15, 2024 02:58
Change base image because:

* Use stable image instead of old-stable one because
  there is a bit delay to be shipped updates from upstream.
  (EOL of bullseye is around July, 2024)
* fluent-package LTS adopts Ruby 3.2 by default.
* Use alpine:3.19 to use Ruby 3.2.

Closes: #371

NOTE: Update linux containers at first.

Signed-off-by: Kentaro Hayashi <[email protected]>
These packages are not needed for runtime.

Before:

  dpkg -l | grep 'dev:amd64'
  ii  libc6-dev:amd64         2.36-9+deb12u3
  ii  libcrypt-dev:amd64      1:4.4.33-2
  ii  libffi-dev:amd64        3.4.4-1
  ii  libgmp-dev:amd64        2:6.2.1+dfsg1-1.1
  ii  libnsl-dev:amd64        1.3.0-2
  ii  libssl-dev:amd64        3.0.11-1~deb12u2
  ii  libtirpc-dev:amd64      1.3.3+ds-1
  ii  libyaml-dev:amd64       0.2.5-1
  ii  linux-libc-dev:amd64    6.1.69-1
  ii  zlib1g-dev:amd64        1:1.2.13.dfsg-1

After:

  dpkg -l | grep dev
  ii  libblkid1:amd64         2.38.1-5+b1
  ii  libgpg-error0:amd64     1.46-1
  ii  libmount1:amd64         2.38.1-5+b1
  ii  libudev1:amd64          252.19-1~deb12u1

Signed-off-by: Kentaro Hayashi <[email protected]>
Signed-off-by: Kentaro Hayashi <[email protected]>
Copy link
Member

@ashie ashie left a comment

Choose a reason for hiding this comment

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

LGTM

@kenhys kenhys merged commit 16b8a68 into master Jan 16, 2024
9 checks passed
@kenhys kenhys deleted the rebuild branch January 16, 2024 04:40
@kenhys
Copy link
Contributor Author

kenhys commented Jan 16, 2024

kicked build trigger now.

@ashie
Copy link
Member

ashie commented Jan 16, 2024

BTW Ruby 3.2 for Windows doesn't exist in Chocolatey repository:
https://community.chocolatey.org/packages/ruby#versionhistory

@kenhys
Copy link
Contributor Author

kenhys commented Jan 16, 2024

Oops, failed build armhf and arm64 unexpectedly.

https://hub.docker.com/repository/docker/fluent/fluentd/builds

@kenhys
Copy link
Contributor Author

kenhys commented Jan 16, 2024

It seems that --platform is required.

kenhys added a commit to kenhys/fluentd-docker-image that referenced this pull request Jul 10, 2024
fluent#372
Above pull request introduces "apt-get purge '*-dev'",
it is intended to remove only needless development packages, but
actually --auto-remove removes also runtime packages.

This behavior is not intended at all, so drop --auto-remove option.

Signed-off-by: Kentaro Hayashi <[email protected]>
kenhys added a commit to kenhys/fluentd-docker-image that referenced this pull request Jul 10, 2024
fluent#372
Above pull request introduces "apt-get purge '*-dev'",
it is intended to remove only needless development packages, but
actually --auto-remove removes also runtime packages.

This behavior is not intended at all, so drop --auto-remove option.

Signed-off-by: Kentaro Hayashi <[email protected]>
kenhys added a commit to kenhys/fluentd-docker-image that referenced this pull request Jul 10, 2024
fluent#372
Above pull request introduces "apt-get purge '*-dev'",
it is intended to remove only needless development packages, but
actually --auto-remove removes also runtime packages.

This behavior is not intended at all, so do not apply
--auto-remove when purging '*-dev'.

Signed-off-by: Kentaro Hayashi <[email protected]>
kenhys added a commit to kenhys/fluentd-docker-image that referenced this pull request Jul 10, 2024
fluent#372

Above pull request introduces "apt-get purge '*-dev'",
it is intended to remove only needless development packages, but
actually --auto-remove removes also runtime packages.

This behavior is not intended at all, so do not apply
--auto-remove when purging '*-dev'.

Signed-off-by: Kentaro Hayashi <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Switch base image to 3.x-slim-bookworm
2 participants