From 3f852f9d867ecc130c420ebcb84f6f49782f12b3 Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Wed, 15 Jan 2025 11:55:24 +0100 Subject: [PATCH 1/2] rebranding dev images --- opencloud/docker/Dockerfile.linux.amd64 | 40 +++++++++---------- opencloud/docker/Dockerfile.linux.arm64 | 40 +++++++++---------- opencloud/docker/Dockerfile.linux.debug.amd64 | 40 +++++++++---------- .../filesForUpload/filesWithVirus/eicar.com | 1 - 4 files changed, 60 insertions(+), 61 deletions(-) delete mode 100644 tests/acceptance/filesForUpload/filesWithVirus/eicar.com diff --git a/opencloud/docker/Dockerfile.linux.amd64 b/opencloud/docker/Dockerfile.linux.amd64 index 0084e76600..f9f1f793e2 100644 --- a/opencloud/docker/Dockerfile.linux.amd64 +++ b/opencloud/docker/Dockerfile.linux.amd64 @@ -6,36 +6,36 @@ ARG REVISION="" RUN apk add --no-cache attr bash ca-certificates curl inotify-tools libc6-compat mailcap tree vips patch && \ echo 'hosts: files dns' >| /etc/nsswitch.conf -LABEL maintainer="ownCloud GmbH " \ - org.opencontainers.image.title="ownCloud Infinite Scale" \ - org.opencontainers.image.vendor="ownCloud GmbH" \ - org.opencontainers.image.authors="ownCloud GmbH" \ - org.opencontainers.image.description="oCIS - ownCloud Infinite Scale is a modern file-sync and share platform" \ +LABEL maintainer="openCloud GmbH " \ + org.opencontainers.image.title="OpenCloud Pulse" \ + org.opencontainers.image.vendor="OpenCloud GmbH" \ + org.opencontainers.image.authors="OpenCloud GmbH" \ + org.opencontainers.image.description="opencloud - OpenCloud Pulse is a modern file-sync and share platform" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.documentation="https://github.com/owncloud/ocis" \ - org.opencontainers.image.url="https://hub.docker.com/r/owncloud/ocis" \ - org.opencontainers.image.source="https://github.com/owncloud/ocis" \ + org.opencontainers.image.documentation="https://github.com/opencloud-eu/opencloud" \ + org.opencontainers.image.url="https://hub.docker.com/r/opencloud-eu/opencloud" \ + org.opencontainers.image.source="https://github.com/opencloud-eu/opencloud" \ org.opencontainers.image.version="${VERSION}" \ org.opencontainers.image.revision="${REVISION}" -RUN addgroup -g 1000 -S ocis-group && \ - adduser -S --ingroup ocis-group --uid 1000 ocis-user --home /var/lib/ocis +RUN addgroup -g 1000 -S opencloud-group && \ + adduser -S --ingroup opencloud-group --uid 1000 opencloud-user --home /var/lib/opencloud -RUN mkdir -p /var/lib/ocis && \ - chown -R ocis-user:ocis-group /var/lib/ocis && \ - chmod -R 751 /var/lib/ocis && \ - mkdir -p /etc/ocis && \ - chown -R ocis-user:ocis-group /etc/ocis && \ - chmod -R 751 /etc/ocis +RUN mkdir -p /var/lib/opencloud && \ + chown -R opencloud-user:opencloud-group /var/lib/opencloud && \ + chmod -R 751 /var/lib/opencloud && \ + mkdir -p /etc/opencloud && \ + chown -R opencloud-user:opencloud-group /etc/opencloud && \ + chmod -R 751 /etc/opencloud -VOLUME [ "/var/lib/ocis", "/etc/ocis" ] -WORKDIR /var/lib/ocis +VOLUME [ "/var/lib/opencloud", "/etc/opencloud" ] +WORKDIR /var/lib/opencloud USER 1000 EXPOSE 9200/tcp -ENTRYPOINT ["/usr/bin/ocis"] +ENTRYPOINT ["/usr/bin/opencloud"] CMD ["server"] -COPY dist/binaries/ocis-linux-amd64 /usr/bin/ocis +COPY dist/binaries/opencloud-linux-amd64 /usr/bin/opencloud diff --git a/opencloud/docker/Dockerfile.linux.arm64 b/opencloud/docker/Dockerfile.linux.arm64 index e7218978d4..3d0d4ce7be 100644 --- a/opencloud/docker/Dockerfile.linux.arm64 +++ b/opencloud/docker/Dockerfile.linux.arm64 @@ -6,36 +6,36 @@ ARG REVISION="" RUN apk add --no-cache attr bash ca-certificates curl inotify-tools libc6-compat mailcap tree vips patch && \ echo 'hosts: files dns' >| /etc/nsswitch.conf -LABEL maintainer="ownCloud GmbH " \ - org.opencontainers.image.title="ownCloud Infinite Scale" \ - org.opencontainers.image.vendor="ownCloud GmbH" \ - org.opencontainers.image.authors="ownCloud GmbH" \ - org.opencontainers.image.description="oCIS - ownCloud Infinite Scale is a modern file-sync and share platform" \ +LABEL maintainer="openCloud GmbH " \ + org.opencontainers.image.title="OpenCloud Pulse" \ + org.opencontainers.image.vendor="OpenCloud GmbH" \ + org.opencontainers.image.authors="OpenCloud GmbH" \ + org.opencontainers.image.description="OpenCloud - OpenCloud Pulse is a modern file-sync and share platform" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.documentation="https://github.com/owncloud/ocis" \ - org.opencontainers.image.url="https://hub.docker.com/r/owncloud/ocis" \ - org.opencontainers.image.source="https://github.com/owncloud/ocis" \ + org.opencontainers.image.documentation="https://github.com/opencloud-eu/opencloud" \ + org.opencontainers.image.url="https://hub.docker.com/r/opencloud-eu/opencloud" \ + org.opencontainers.image.source="https://github.com/opencloud-eu/opencloud" \ org.opencontainers.image.version="${VERSION}" \ org.opencontainers.image.revision="${REVISION}" -RUN addgroup -g 1000 -S ocis-group && \ - adduser -S --ingroup ocis-group --uid 1000 ocis-user --home /var/lib/ocis +RUN addgroup -g 1000 -S opencloud-group && \ + adduser -S --ingroup opencloud-group --uid 1000 opencloud-user --home /var/lib/opencloud -RUN mkdir -p /var/lib/ocis && \ - chown -R ocis-user:ocis-group /var/lib/ocis && \ - chmod -R 751 /var/lib/ocis && \ - mkdir -p /etc/ocis && \ - chown -R ocis-user:ocis-group /etc/ocis && \ - chmod -R 751 /etc/ocis +RUN mkdir -p /var/lib/opencloud && \ + chown -R opencloud-user:opencloud-group /var/lib/opencloud && \ + chmod -R 751 /var/lib/opencloud && \ + mkdir -p /etc/opencloud && \ + chown -R opencloud-user:opencloud-group /etc/opencloud && \ + chmod -R 751 /etc/opencloud -VOLUME [ "/var/lib/ocis", "/etc/ocis" ] -WORKDIR /var/lib/ocis +VOLUME [ "/var/lib/opencloud", "/etc/opencloud" ] +WORKDIR /var/lib/opencloud USER 1000 EXPOSE 9200/tcp -ENTRYPOINT ["/usr/bin/ocis"] +ENTRYPOINT ["/usr/bin/opencloud"] CMD ["server"] -COPY dist/binaries/ocis-linux-arm64 /usr/bin/ocis +COPY dist/binaries/opencloud-linux-arm64 /usr/bin/opencloud diff --git a/opencloud/docker/Dockerfile.linux.debug.amd64 b/opencloud/docker/Dockerfile.linux.debug.amd64 index 5565b9c7d1..5c0ff1e4ec 100644 --- a/opencloud/docker/Dockerfile.linux.debug.amd64 +++ b/opencloud/docker/Dockerfile.linux.debug.amd64 @@ -6,36 +6,36 @@ ARG REVISION="" RUN apk add --no-cache attr bash ca-certificates curl delve inotify-tools libc6-compat mailcap tree vips patch && \ echo 'hosts: files dns' >| /etc/nsswitch.conf -LABEL maintainer="ownCloud GmbH " \ - org.opencontainers.image.title="ownCloud Infinite Scale" \ - org.opencontainers.image.vendor="ownCloud GmbH" \ - org.opencontainers.image.authors="ownCloud GmbH" \ - org.opencontainers.image.description="oCIS - ownCloud Infinite Scale is a modern file-sync and share platform" \ +LABEL maintainer="OpenCloud GmbH " \ + org.opencontainers.image.title="OpenCloud Pulse" \ + org.opencontainers.image.vendor="OpenCloud GmbH" \ + org.opencontainers.image.authors="OpenCloud GmbH" \ + org.opencontainers.image.description="OpenCloud - OpenCloud Pulse is a modern file-sync and share platform" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.documentation="https://github.com/owncloud/ocis" \ - org.opencontainers.image.url="https://hub.docker.com/r/owncloud/ocis" \ - org.opencontainers.image.source="https://github.com/owncloud/ocis" \ + org.opencontainers.image.documentation="https://github.com/opencloud-eu/opencloud" \ + org.opencontainers.image.url="https://hub.docker.com/r/opencloud-eu/opencloud" \ + org.opencontainers.image.source="https://github.com/opencloud-eu/opencloud" \ org.opencontainers.image.version="${VERSION}" \ org.opencontainers.image.revision="${REVISION}" -RUN addgroup -g 1000 -S ocis-group && \ - adduser -S --ingroup ocis-group --uid 1000 ocis-user --home /var/lib/ocis +RUN addgroup -g 1000 -S opencloud-group && \ + adduser -S --ingroup opencloud-group --uid 1000 opencloud-user --home /var/lib/opencloud -RUN mkdir -p /var/lib/ocis && \ - chown -R ocis-user:ocis-group /var/lib/ocis && \ - chmod -R 751 /var/lib/ocis && \ - mkdir -p /etc/ocis && \ - chown -R ocis-user:ocis-group /etc/ocis && \ - chmod -R 751 /etc/ocis +RUN mkdir -p /var/lib/opencloud && \ + chown -R opencloud-user:opencloud-group /var/lib/opencloud && \ + chmod -R 751 /var/lib/opencloud && \ + mkdir -p /etc/opencloud && \ + chown -R opencloud-user:opencloud-group /etc/opencloud && \ + chmod -R 751 /etc/opencloud -VOLUME [ "/var/lib/ocis", "/etc/ocis" ] -WORKDIR /var/lib/ocis +VOLUME [ "/var/lib/opencloud", "/etc/opencloud" ] +WORKDIR /var/lib/opencloud USER 1000 EXPOSE 9200/tcp -ENTRYPOINT ["/usr/bin/ocis"] +ENTRYPOINT ["/usr/bin/opencloud"] CMD ["server"] -COPY dist/binaries/ocis-linux-amd64 /usr/bin/ocis +COPY dist/binaries/opencloud-linux-amd64 /usr/bin/opencloud diff --git a/tests/acceptance/filesForUpload/filesWithVirus/eicar.com b/tests/acceptance/filesForUpload/filesWithVirus/eicar.com deleted file mode 100644 index a2463df6d6..0000000000 --- a/tests/acceptance/filesForUpload/filesWithVirus/eicar.com +++ /dev/null @@ -1 +0,0 @@ -X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H* \ No newline at end of file From a9ffd35bbcf492223e3fe7329dd27cbb910ac12c Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Wed, 15 Jan 2025 12:35:44 +0100 Subject: [PATCH 2/2] fix --- opencloud/docker/Dockerfile.linux.amd64 | 2 +- opencloud/docker/Dockerfile.linux.debug.amd64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opencloud/docker/Dockerfile.linux.amd64 b/opencloud/docker/Dockerfile.linux.amd64 index f9f1f793e2..b7b18e34ff 100644 --- a/opencloud/docker/Dockerfile.linux.amd64 +++ b/opencloud/docker/Dockerfile.linux.amd64 @@ -6,7 +6,7 @@ ARG REVISION="" RUN apk add --no-cache attr bash ca-certificates curl inotify-tools libc6-compat mailcap tree vips patch && \ echo 'hosts: files dns' >| /etc/nsswitch.conf -LABEL maintainer="openCloud GmbH " \ +LABEL maintainer="openCloud GmbH " \ org.opencontainers.image.title="OpenCloud Pulse" \ org.opencontainers.image.vendor="OpenCloud GmbH" \ org.opencontainers.image.authors="OpenCloud GmbH" \ diff --git a/opencloud/docker/Dockerfile.linux.debug.amd64 b/opencloud/docker/Dockerfile.linux.debug.amd64 index 5c0ff1e4ec..d679c92d41 100644 --- a/opencloud/docker/Dockerfile.linux.debug.amd64 +++ b/opencloud/docker/Dockerfile.linux.debug.amd64 @@ -6,7 +6,7 @@ ARG REVISION="" RUN apk add --no-cache attr bash ca-certificates curl delve inotify-tools libc6-compat mailcap tree vips patch && \ echo 'hosts: files dns' >| /etc/nsswitch.conf -LABEL maintainer="OpenCloud GmbH " \ +LABEL maintainer="OpenCloud GmbH " \ org.opencontainers.image.title="OpenCloud Pulse" \ org.opencontainers.image.vendor="OpenCloud GmbH" \ org.opencontainers.image.authors="OpenCloud GmbH" \