diff --git a/Dockerfile b/Dockerfile index 5b104af78d5..f2bc172ba71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,10 +30,7 @@ RUN make ci-go-generate build FROM alpine:3.15 -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ +RUN apk add --no-cache ca-certificates mailcap tree attr curl && \ echo 'hosts: files dns' >| /etc/nsswitch.conf LABEL maintainer="ownCloud GmbH " \ diff --git a/changelog/unreleased/add-curl-to-ocis-image.md b/changelog/unreleased/add-curl-to-ocis-image.md new file mode 100644 index 00000000000..d427a83d02e --- /dev/null +++ b/changelog/unreleased/add-curl-to-ocis-image.md @@ -0,0 +1,6 @@ +Enhancement: Add curl to the oCIS OCI image + +We've added curl to the oCIS OCI image published on Dockerhub. +This can be used for eg. healthchecks with the services' health endpoint. + +https://github.com/owncloud/ocis/pull/4751 diff --git a/ocis/docker/Dockerfile.linux.amd64 b/ocis/docker/Dockerfile.linux.amd64 index 8a0c6689413..dc5ea7fba10 100644 --- a/ocis/docker/Dockerfile.linux.amd64 +++ b/ocis/docker/Dockerfile.linux.amd64 @@ -3,10 +3,7 @@ FROM amd64/alpine:3.15 ARG VERSION="" ARG REVISION="" -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap tree attr && \ - rm -rf /var/cache/apk/* && \ +RUN apk add --no-cache ca-certificates mailcap tree attr curl && \ echo 'hosts: files dns' >| /etc/nsswitch.conf LABEL maintainer="ownCloud GmbH " \ diff --git a/ocis/docker/Dockerfile.linux.arm b/ocis/docker/Dockerfile.linux.arm index a0c93b406ec..ae70714f03f 100644 --- a/ocis/docker/Dockerfile.linux.arm +++ b/ocis/docker/Dockerfile.linux.arm @@ -3,10 +3,7 @@ FROM arm32v6/alpine:3.15 ARG VERSION="" ARG REVISION="" -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap tree attr && \ - rm -rf /var/cache/apk/* && \ +RUN apk add --no-cache ca-certificates mailcap tree attr curl && \ 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 09560427301..1b483010a94 100644 --- a/ocis/docker/Dockerfile.linux.arm64 +++ b/ocis/docker/Dockerfile.linux.arm64 @@ -3,10 +3,7 @@ FROM arm64v8/alpine:3.15 ARG VERSION="" ARG REVISION="" -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap tree attr && \ - rm -rf /var/cache/apk/* && \ +RUN apk add --no-cache ca-certificates mailcap tree attr curl && \ echo 'hosts: files dns' >| /etc/nsswitch.conf LABEL maintainer="ownCloud GmbH " \