-
Notifications
You must be signed in to change notification settings - Fork 2
Fix fluentd build on arm64 #129
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,50 @@ | ||
| # Copyright (c) Microsoft Corporation | ||
| # All rights reserved. | ||
| # | ||
| # MIT License | ||
| # | ||
| # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated | ||
| # documentation files (the "Software"), to deal in the Software without restriction, including without limitation | ||
| # the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and | ||
| # to permit persons to whom the Software is furnished to do so, subject to the following conditions: | ||
| # The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. | ||
| # | ||
| # THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING | ||
| # BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, | ||
| # DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
|
|
||
| FROM fluent/fluentd:v1.17.1-1.0 | ||
| # Copyright (c) Microsoft Corporation. | ||
| # Licensed under the MIT License. | ||
|
|
||
| FROM fluent/fluentd:v1.17.1-debian-1.0 | ||
|
|
||
| USER root | ||
| RUN apk add --no-cache --update --virtual .build-deps \ | ||
| sudo build-base ruby-dev make gcc libc-dev postgresql-dev git \ | ||
| && apk add --no-cache libpq=16.10-r0 \ | ||
| && sudo gem install fluent-plugin-concat \ | ||
| && gem install fluent-plugin-parser-cri --no-document \ | ||
| && sudo gem install bundler -v 2.3.27 \ | ||
| && sudo gem install rake \ | ||
| && sudo gem install pg -v 1.5.9 \ | ||
| && sudo apk add ruby-bigdecimal | ||
|
|
||
| RUN sudo apk update && sudo apk upgrade | ||
|
|
||
| # workaround different system page sizes by disabling jemalloc | ||
| ENV LD_PRELOAD="" \ | ||
| DEBIAN_FRONTEND=noninteractive | ||
|
|
||
| RUN apt-get update && \ | ||
| apt-get install -y --no-install-recommends \ | ||
| build-essential \ | ||
| ruby-dev \ | ||
| make \ | ||
| gcc \ | ||
| libc6-dev \ | ||
| libpq-dev \ | ||
| libpq5 \ | ||
| postgresql-client \ | ||
| git \ | ||
| ca-certificates | ||
|
|
||
| RUN gem install fluent-plugin-concat && \ | ||
| gem install fluent-plugin-parser-cri --no-document && \ | ||
| gem install bundler -v 2.3.27 && \ | ||
| gem install rake && \ | ||
| gem install pg -v 1.5.9 && \ | ||
| gem install bigdecimal --no-document | ||
|
|
||
| # Build fluent-plugin-pgjson from scratch | ||
| # Original fluent-plugin-pgjson is from https://github.com/fluent-plugins-nursery/fluent-plugin-pgjson | ||
| # Original plugin cannot retry connecting when database connection is lost, | ||
| # Original plugin cannot retry connecting when database connection is lost, | ||
| # and is not thread-safe. These two problems are fixed by modifying codes. | ||
| COPY src/fluent-plugin-pgjson /fluent-plugin-pgjson | ||
| RUN cd /fluent-plugin-pgjson && \ | ||
| git init && \ | ||
| git add . && \ | ||
| rake build && \ | ||
| gem install --local ./pkg/fluent-plugin-pgjson-1.0.0.gem && \ | ||
| rm -rf /fluent-plugin-pgjson | ||
| git init && \ | ||
| git add . && \ | ||
| rake build && \ | ||
| gem install --local ./pkg/fluent-plugin-pgjson-1.0.0.gem && \ | ||
| rm -rf /fluent-plugin-pgjson | ||
|
|
||
| # cleanup | ||
| RUN sudo gem sources --clear-all \ | ||
| && apk del .build-deps \ | ||
| && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem | ||
| RUN gem sources --clear-all && \ | ||
| rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem && \ | ||
| apt-get purge -y --auto-remove build-essential make gcc libc6-dev libpq-dev && \ | ||
| apt-get upgrade -y && rm -rf /var/lib/apt/lists/* | ||
|
|
||
| COPY build/fluent.conf /fluentd/etc/ | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.