Skip to content
Merged
Show file tree
Hide file tree
Changes from 39 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
f0d8cf0
wip
mrnicegyu11 Sep 19, 2024
e906b41
Merge remote-tracking branch 'upstream/main' into main
mrnicegyu11 Oct 23, 2024
14c751d
Merge remote-tracking branch 'upstream/main' into main
mrnicegyu11 Oct 23, 2024
293f63c
Add csi-s3 and have portainer use it
mrnicegyu11 Oct 24, 2024
f7f72ec
Change request @hrytsuk 1GB max portainer volume size
mrnicegyu11 Oct 25, 2024
94cfb76
t push
mrnicegyu11 Oct 28, 2024
509c717
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Oct 29, 2024
1a65ecf
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Nov 13, 2024
77ee45e
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Nov 25, 2024
c9c70d6
Arch Linux Certificates Customization
mrnicegyu11 Dec 3, 2024
7b8be53
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Dec 5, 2024
bcd61cd
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Dec 12, 2024
58e1030
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Dec 13, 2024
ed8d479
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Jan 10, 2025
dda6e01
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Feb 4, 2025
f6f4f36
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Feb 25, 2025
5dca5c3
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Mar 13, 2025
4a653ef
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Mar 20, 2025
3a21f0f
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Mar 28, 2025
48fbbca
Fix pgsql exporter failure
mrnicegyu11 Apr 24, 2025
08c57db
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 May 6, 2025
5ecbfec
[Kubernetes] Introduce on-prem persistent Storage (Longhorn) :tada: …
YuryHrytsuk May 6, 2025
3ea41b5
Experimental: Try to add tracing to simcore-traefik on master
mrnicegyu11 May 9, 2025
29f2f2e
Fixes https://github.com/ITISFoundation/osparc-simcore/issues/7363
mrnicegyu11 May 14, 2025
cdef57f
Merge branch 'ITISFoundation:main' into main
mrnicegyu11 May 21, 2025
c0f393e
t push
mrnicegyu11 May 23, 2025
34a86fd
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Jul 2, 2025
df3f5df
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Jul 3, 2025
ac44663
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Jul 8, 2025
4100b87
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Jul 21, 2025
759f657
Merge branch 'ITISFoundation:main' into main
mrnicegyu11 Jul 21, 2025
d60fd0c
t checkout -b 2025/redactoMerge remote-tracking branch 'upstream/main'
mrnicegyu11 Jul 25, 2025
a1e36c7
Merge branch 'ITISFoundation:main' into main
mrnicegyu11 Jul 30, 2025
b856eb0
Arch Linux Certificates Customization - 2
mrnicegyu11 Jul 30, 2025
81ce9fb
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Aug 7, 2025
0e32699
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Aug 19, 2025
a5b9950
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Aug 25, 2025
f39071b
Make fluentd build on arm
mrnicegyu11 Aug 25, 2025
6d1c401
Make fluentd build on arm - 2
mrnicegyu11 Aug 26, 2025
579fa7c
Merge branch 'main' into 2025/add/fluentdArm
mrnicegyu11 Aug 27, 2025
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
22 changes: 12 additions & 10 deletions services/logging/fluentd/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
FROM fluent/fluentd:v1.16.9-1.0
FROM fluent/fluentd:v1.16.9-debian-1.0

USER root

# Install dependencies and plugins
RUN apk add --no-cache --update --virtual .build-deps \
sudo build-base ruby-dev curl \
&& sudo gem install fluent-plugin-grafana-loki \
&& sudo gem install fluent-plugin-gelf-best \
&& sudo gem install fluent-plugin-prometheus \
&& apk del .build-deps \
&& apk add --no-cache curl jq \
&& rm -rf /var/cache/apk/* \
# Install dependencies and plugins using apt instead of apk
RUN apt-get update && apt-get install -y --no-install-recommends \
build-essential \
ruby-dev \
curl \
jq \
&& gem install fluent-plugin-grafana-loki \
&& gem install fluent-plugin-gelf-best \
&& gem install fluent-plugin-prometheus \
&& apt-get purge -y --auto-remove build-essential ruby-dev \
&& rm -rf /var/lib/apt/lists/* \
&& rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

# Create directories with appropriate permissions
Expand Down
3 changes: 2 additions & 1 deletion services/logging/fluentd/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
There is currently no CD for building the fluentd image.
It has to be built and pushed manually:

Run e.g. `docker build -t itisfoundation/fluentd:v1.16.9-1.0 .` in this folder, then push the image to dockerhub.
Run e.g. `docker buildx build --platform linux/amd64,linux/arm64 --push -t itisfoundation/fluentd:v1.16.9-1.0 .` in this folder, then push the image to dockerhub.
Keep in mind that some ops machines run on ARM, so we need an ARM image as well.
Loading