Skip to content

Commit 6d1c401

Browse files
committed
Make fluentd build on arm - 2
1 parent f39071b commit 6d1c401

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

certificates/Makefile

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,16 @@ install-root-certificate: rootca.crt ## installs a certificate in the host syste
6666
echo "Is the DOCKER service ready? press when ready" && read -n 1; \
6767
fi;\
6868
echo "======================================";,\
69-
sudo cp $< /etc/ca-certificates/trust-source/anchors/osparc.crt; \
70-
sudo trust extract-compat && \
71-
echo "# restarting docker daemon" && \
69+
$(if $(IS_OSX), \
70+
sudo security add-trusted-cert -d -k /Library/Keychains/System.keychain $<; \
71+
echo "Please restart the DOCKER service now..." && read -n 1; \
72+
echo "Is the DOCKER service ready? press when ready" && read -n 1; \
73+
, \
74+
sudo cp $< /usr/local/share/ca-certificates/osparc.crt; \
75+
sudo update-ca-certificates -f; \
76+
echo "# restarting docker daemon"; \
7277
sudo systemctl restart docker \
78+
) \
7379
)
7480

7581

@@ -84,8 +90,7 @@ remove-root-certificate: ## removes the certificate from the host system
8490
$(if $(IS_OSX), \
8591
sudo security remove-trusted-cert -d rootca.crt; \
8692
, \
87-
sudo rm -f /etc/ca-certificates/trust-source/anchors/osparc.crt; \
88-
sudo trust extract-compat; \
89-
sudo systemctl restart docker; \
93+
sudo rm -f /usr/local/share/ca-certificates/osparc.crt; \
94+
sudo update-ca-certificates -f; \
9095
) \
9196
)

services/logging/fluentd/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
There is currently no CD for building the fluentd image.
22
It has to be built and pushed manually:
33

4-
Run e.g. `docker build -t itisfoundation/fluentd:v1.16.9-1.0 .` in this folder, then push the image to dockerhub.
4+
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.
5+
Keep in mind that some ops machines run on ARM, so we need an ARM image as well.

0 commit comments

Comments
 (0)