From 9f53a25d672ac93187e37913d39961e965d0063c Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Mon, 20 Jan 2025 16:27:19 +0100 Subject: [PATCH] adjust top-level Dockerfile --- Dockerfile | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1f09dfa6c..7571d0f3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,30 +2,29 @@ # you want to build an image from source without # pnpm and Go installed on your dev machine. -# You can build oCIS using this Dockerfile +# You can build OpenCloud using this Dockerfile # by running following command: -# `docker build -t owncloud/ocis:custom .` +# `docker build -t opencloud/opencloud:custom .` # In most other cases you might want to run the # following command instead: -# `make -C ocis dev-docker` -# It will build a `owncloud/ocis:dev` image for you +# `make -C opencloud dev-docker` +# It will build a `opencloud/opencloud:dev` image for you # and use your local pnpm and Go caches and therefore # is a lot faster than the build steps below. FROM owncloudci/nodejs:18 AS generate -COPY ./ /ocis/ +COPY ./ /opencloud/ -WORKDIR /ocis/ocis -RUN make ci-node-generate +WORKDIR /opencloud/opencloud FROM owncloudci/golang:1.22 AS build -COPY --from=generate /ocis /ocis +COPY --from=generate /opencloud /opencloud -WORKDIR /ocis/ocis +WORKDIR /opencloud/opencloud RUN make ci-go-generate build ENABLE_VIPS=true FROM alpine:3.20 @@ -33,10 +32,14 @@ FROM alpine:3.20 RUN apk add --no-cache attr ca-certificates curl mailcap tree vips && \ echo 'hosts: files dns' >| /etc/nsswitch.conf -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="ownCloud Infinite Scale" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" +LABEL maintainer="OpenCloud GmbH " \ + org.opencontainers.image.title="OpenCloud" \ + org.opencontainers.image.vendor="OpenCloud GmbH" \ + org.opencontainers.image.authors="OpenCloud GmbH" \ + org.opencontainers.image.description="OpenCloud is a modern file-sync and share platform" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.documentation="https://github.com/opencloud-eu/opencloud" \ + org.opencontainers.image.source="https://github.com/opencloud-eu/opencloud" ENTRYPOINT ["/usr/bin/ocis"] CMD ["server"]