From c708bb5816e4113350cb0dff4e52f66c699696c1 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Fri, 21 Jun 2024 17:20:39 +0200 Subject: [PATCH 1/3] Add inotify-tools and bash to work with posixFS The golang inotify package that is used uses bash to start inotifywait. That needs to be fixed, but until than we add bash to the docker container --- ocis/docker/Dockerfile.linux.amd64 | 2 +- ocis/docker/Dockerfile.linux.arm64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ocis/docker/Dockerfile.linux.amd64 b/ocis/docker/Dockerfile.linux.amd64 index 6b00eda1a..8915608d8 100644 --- a/ocis/docker/Dockerfile.linux.amd64 +++ b/ocis/docker/Dockerfile.linux.amd64 @@ -3,7 +3,7 @@ FROM amd64/alpine:3.18 ARG VERSION="" ARG REVISION="" -RUN apk add --no-cache ca-certificates mailcap tree attr curl && \ +RUN apk add --no-cache ca-certificates mailcap tree attr curl inotify-tools bash && \ echo 'hosts: files dns' >| /etc/nsswitch.conf LABEL maintainer="ownCloud GmbH " \ diff --git a/ocis/docker/Dockerfile.linux.arm64 b/ocis/docker/Dockerfile.linux.arm64 index 7483d0af5..aabf5110e 100644 --- a/ocis/docker/Dockerfile.linux.arm64 +++ b/ocis/docker/Dockerfile.linux.arm64 @@ -3,7 +3,7 @@ FROM arm64v8/alpine:3.18 ARG VERSION="" ARG REVISION="" -RUN apk add --no-cache ca-certificates mailcap tree attr curl && \ +RUN apk add --no-cache ca-certificates mailcap tree attr curl inotify-tools bash && \ echo 'hosts: files dns' >| /etc/nsswitch.conf LABEL maintainer="ownCloud GmbH " \ From 8f0eb23153d4082de807f154bde9c728ca33c183 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Fri, 21 Jun 2024 17:24:44 +0200 Subject: [PATCH 2/3] Add changelog --- changelog/unreleased/fix-dockerfile-for-posixfs.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/fix-dockerfile-for-posixfs.md diff --git a/changelog/unreleased/fix-dockerfile-for-posixfs.md b/changelog/unreleased/fix-dockerfile-for-posixfs.md new file mode 100644 index 000000000..273369588 --- /dev/null +++ b/changelog/unreleased/fix-dockerfile-for-posixfs.md @@ -0,0 +1,7 @@ +Bugfix: Add inotify-tools and bash packages to docker files + +We need both packages to make posixfs work. Later, once the golang +package is fixed to not depend on bash any more, bash can be removed +again. + +https://github.com/owncloud/ocis/pull/ From 73028f20d41f579dcc2c8d6d76dfd937789e7368 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Fri, 21 Jun 2024 19:45:45 +0200 Subject: [PATCH 3/3] Update changelog/unreleased/fix-dockerfile-for-posixfs.md --- changelog/unreleased/fix-dockerfile-for-posixfs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/unreleased/fix-dockerfile-for-posixfs.md b/changelog/unreleased/fix-dockerfile-for-posixfs.md index 273369588..a1f3ea9ec 100644 --- a/changelog/unreleased/fix-dockerfile-for-posixfs.md +++ b/changelog/unreleased/fix-dockerfile-for-posixfs.md @@ -4,4 +4,4 @@ We need both packages to make posixfs work. Later, once the golang package is fixed to not depend on bash any more, bash can be removed again. -https://github.com/owncloud/ocis/pull/ +https://github.com/owncloud/ocis/pull/9440