From 35578a0eccb1dca4bc4359b733506451553c44c2 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Mon, 21 Oct 2024 22:46:06 +0200 Subject: [PATCH] chore: remove unneeded stuff --- Dockerfile | 6 ++--- internal/testenv/test.go | 1 - ocis/docker/Dockerfile.linux.amd64 | 2 +- ocis/docker/Dockerfile.linux.arm64 | 2 +- ocis/docker/Dockerfile.linux.debug.amd64 | 2 +- services/graph/.dockerignore | 2 -- services/graph/docker/Dockerfile.linux.amd64 | 19 ---------------- services/graph/docker/Dockerfile.linux.arm | 19 ---------------- services/graph/docker/Dockerfile.linux.arm64 | 19 ---------------- services/graph/docker/manifest.tmpl | 22 ------------------- services/idp/.dockerignore | 2 -- services/idp/docker/Dockerfile.linux.amd64 | 19 ---------------- services/idp/docker/Dockerfile.linux.arm | 19 ---------------- services/idp/docker/Dockerfile.linux.arm64 | 19 ---------------- services/idp/docker/manifest.tmpl | 22 ------------------- services/ocs/.dockerignore | 2 -- services/ocs/docker/Dockerfile.linux.amd64 | 19 ---------------- services/ocs/docker/Dockerfile.linux.arm | 19 ---------------- services/ocs/docker/Dockerfile.linux.arm64 | 19 ---------------- services/ocs/docker/manifest.tmpl | 22 ------------------- services/proxy/.dockerignore | 2 -- services/proxy/docker/Dockerfile.linux.amd64 | 19 ---------------- services/proxy/docker/Dockerfile.linux.arm | 19 ---------------- services/proxy/docker/Dockerfile.linux.arm64 | 19 ---------------- services/proxy/docker/manifest.tmpl | 22 ------------------- services/settings/.dockerignore | 2 -- .../settings/docker/Dockerfile.linux.amd64 | 19 ---------------- services/settings/docker/Dockerfile.linux.arm | 19 ---------------- .../settings/docker/Dockerfile.linux.arm64 | 19 ---------------- services/settings/docker/manifest.tmpl | 22 ------------------- .../thumbnails/docker/Dockerfile.linux.amd64 | 19 ---------------- .../thumbnails/docker/Dockerfile.linux.arm | 19 ---------------- .../thumbnails/docker/Dockerfile.linux.arm64 | 19 ---------------- services/thumbnails/docker/manifest.tmpl | 22 ------------------- services/web/.dockerignore | 2 -- services/web/docker/Dockerfile.linux.amd64 | 19 ---------------- services/web/docker/Dockerfile.linux.arm | 19 ---------------- services/web/docker/Dockerfile.linux.arm64 | 19 ---------------- services/web/docker/manifest.tmpl | 22 ------------------- services/webdav/.dockerignore | 2 -- services/webdav/docker/Dockerfile.linux.amd64 | 19 ---------------- services/webdav/docker/Dockerfile.linux.arm | 19 ---------------- services/webdav/docker/Dockerfile.linux.arm64 | 19 ---------------- services/webdav/docker/manifest.tmpl | 22 ------------------- services/webfinger/.dockerignore | 2 -- 45 files changed, 6 insertions(+), 655 deletions(-) delete mode 100644 services/graph/.dockerignore delete mode 100644 services/graph/docker/Dockerfile.linux.amd64 delete mode 100644 services/graph/docker/Dockerfile.linux.arm delete mode 100644 services/graph/docker/Dockerfile.linux.arm64 delete mode 100644 services/graph/docker/manifest.tmpl delete mode 100644 services/idp/.dockerignore delete mode 100644 services/idp/docker/Dockerfile.linux.amd64 delete mode 100644 services/idp/docker/Dockerfile.linux.arm delete mode 100644 services/idp/docker/Dockerfile.linux.arm64 delete mode 100644 services/idp/docker/manifest.tmpl delete mode 100644 services/ocs/.dockerignore delete mode 100644 services/ocs/docker/Dockerfile.linux.amd64 delete mode 100644 services/ocs/docker/Dockerfile.linux.arm delete mode 100644 services/ocs/docker/Dockerfile.linux.arm64 delete mode 100644 services/ocs/docker/manifest.tmpl delete mode 100644 services/proxy/.dockerignore delete mode 100644 services/proxy/docker/Dockerfile.linux.amd64 delete mode 100644 services/proxy/docker/Dockerfile.linux.arm delete mode 100644 services/proxy/docker/Dockerfile.linux.arm64 delete mode 100644 services/proxy/docker/manifest.tmpl delete mode 100644 services/settings/.dockerignore delete mode 100644 services/settings/docker/Dockerfile.linux.amd64 delete mode 100644 services/settings/docker/Dockerfile.linux.arm delete mode 100644 services/settings/docker/Dockerfile.linux.arm64 delete mode 100644 services/settings/docker/manifest.tmpl delete mode 100644 services/thumbnails/docker/Dockerfile.linux.amd64 delete mode 100644 services/thumbnails/docker/Dockerfile.linux.arm delete mode 100644 services/thumbnails/docker/Dockerfile.linux.arm64 delete mode 100644 services/thumbnails/docker/manifest.tmpl delete mode 100644 services/web/.dockerignore delete mode 100644 services/web/docker/Dockerfile.linux.amd64 delete mode 100644 services/web/docker/Dockerfile.linux.arm delete mode 100644 services/web/docker/Dockerfile.linux.arm64 delete mode 100644 services/web/docker/manifest.tmpl delete mode 100644 services/webdav/.dockerignore delete mode 100644 services/webdav/docker/Dockerfile.linux.amd64 delete mode 100644 services/webdav/docker/Dockerfile.linux.arm delete mode 100644 services/webdav/docker/Dockerfile.linux.arm64 delete mode 100644 services/webdav/docker/manifest.tmpl delete mode 100644 services/webfinger/.dockerignore diff --git a/Dockerfile b/Dockerfile index ec23f79894..1f09dfa6c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,14 +14,14 @@ # is a lot faster than the build steps below. -FROM owncloudci/nodejs:18 as generate +FROM owncloudci/nodejs:18 AS generate COPY ./ /ocis/ WORKDIR /ocis/ocis RUN make ci-node-generate -FROM owncloudci/golang:1.22 as build +FROM owncloudci/golang:1.22 AS build COPY --from=generate /ocis /ocis @@ -30,7 +30,7 @@ RUN make ci-go-generate build ENABLE_VIPS=true FROM alpine:3.20 -RUN apk add --no-cache ca-certificates mailcap tree attr curl vips && \ +RUN apk add --no-cache attr ca-certificates curl mailcap tree vips && \ echo 'hosts: files dns' >| /etc/nsswitch.conf LABEL maintainer="ownCloud GmbH " \ diff --git a/internal/testenv/test.go b/internal/testenv/test.go index b9f321edd4..7f625cac8a 100644 --- a/internal/testenv/test.go +++ b/internal/testenv/test.go @@ -9,7 +9,6 @@ import ( // CMDTest spawns a new independent test environment type CMDTest struct { n string - f func() } // NewCMDTest creates a new CMDTest instance diff --git a/ocis/docker/Dockerfile.linux.amd64 b/ocis/docker/Dockerfile.linux.amd64 index 581de2d471..f715765603 100644 --- a/ocis/docker/Dockerfile.linux.amd64 +++ b/ocis/docker/Dockerfile.linux.amd64 @@ -3,7 +3,7 @@ FROM amd64/alpine:3.20 ARG VERSION="" ARG REVISION="" -RUN apk add --no-cache ca-certificates mailcap tree attr curl inotify-tools bash libc6-compat vips && \ +RUN apk add --no-cache attr bash ca-certificates curl inotify-tools libc6-compat mailcap tree vips && \ 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 f154bda515..3903e46713 100644 --- a/ocis/docker/Dockerfile.linux.arm64 +++ b/ocis/docker/Dockerfile.linux.arm64 @@ -3,7 +3,7 @@ FROM arm64v8/alpine:3.20 ARG VERSION="" ARG REVISION="" -RUN apk add --no-cache ca-certificates mailcap tree attr curl inotify-tools bash libc6-compat vips && \ +RUN apk add --no-cache attr bash ca-certificates curl inotify-tools libc6-compat mailcap tree vips && \ echo 'hosts: files dns' >| /etc/nsswitch.conf LABEL maintainer="ownCloud GmbH " \ diff --git a/ocis/docker/Dockerfile.linux.debug.amd64 b/ocis/docker/Dockerfile.linux.debug.amd64 index 8ee01193ea..c3ff60e249 100644 --- a/ocis/docker/Dockerfile.linux.debug.amd64 +++ b/ocis/docker/Dockerfile.linux.debug.amd64 @@ -3,7 +3,7 @@ FROM amd64/alpine:latest ARG VERSION="" ARG REVISION="" -RUN apk add --no-cache ca-certificates mailcap tree attr curl inotify-tools bash libc6-compat vips delve && \ +RUN apk add --no-cache attr bash ca-certificates curl delve inotify-tools libc6-compat mailcap tree vips && \ echo 'hosts: files dns' >| /etc/nsswitch.conf LABEL maintainer="ownCloud GmbH " \ diff --git a/services/graph/.dockerignore b/services/graph/.dockerignore deleted file mode 100644 index 4ec85b5e4f..0000000000 --- a/services/graph/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!bin/ diff --git a/services/graph/docker/Dockerfile.linux.amd64 b/services/graph/docker/Dockerfile.linux.amd64 deleted file mode 100644 index de3d947c70..0000000000 --- a/services/graph/docker/Dockerfile.linux.amd64 +++ /dev/null @@ -1,19 +0,0 @@ -FROM amd64/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS Graph" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9120 9124 - -ENTRYPOINT ["/usr/bin/ocis-graph"] -CMD ["server"] - -COPY bin/ocis-graph /usr/bin/ocis-graph diff --git a/services/graph/docker/Dockerfile.linux.arm b/services/graph/docker/Dockerfile.linux.arm deleted file mode 100644 index a64d435b4a..0000000000 --- a/services/graph/docker/Dockerfile.linux.arm +++ /dev/null @@ -1,19 +0,0 @@ -FROM arm32v6/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS Graph" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9120 9124 - -ENTRYPOINT ["/usr/bin/ocis-graph"] -CMD ["server"] - -COPY bin/ocis-graph /usr/bin/ocis-graph diff --git a/services/graph/docker/Dockerfile.linux.arm64 b/services/graph/docker/Dockerfile.linux.arm64 deleted file mode 100644 index 825a001484..0000000000 --- a/services/graph/docker/Dockerfile.linux.arm64 +++ /dev/null @@ -1,19 +0,0 @@ -FROM arm64v8/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS Graph" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9120 9124 - -ENTRYPOINT ["/usr/bin/ocis-graph"] -CMD ["server"] - -COPY bin/ocis-graph /usr/bin/ocis-graph diff --git a/services/graph/docker/manifest.tmpl b/services/graph/docker/manifest.tmpl deleted file mode 100644 index 3c592b1c71..0000000000 --- a/services/graph/docker/manifest.tmpl +++ /dev/null @@ -1,22 +0,0 @@ -image: owncloud/ocis-graph:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} -{{#if build.tags}} -tags: -{{#each build.tags}} - - {{this}} -{{/each}} -{{/if}} -manifests: - - image: owncloud/ocis-graph:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 - platform: - architecture: amd64 - os: linux - - image: owncloud/ocis-graph:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 - platform: - architecture: arm64 - variant: v8 - os: linux - - image: owncloud/ocis-graph:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm - platform: - architecture: arm - variant: v6 - os: linux diff --git a/services/idp/.dockerignore b/services/idp/.dockerignore deleted file mode 100644 index 4ec85b5e4f..0000000000 --- a/services/idp/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!bin/ diff --git a/services/idp/docker/Dockerfile.linux.amd64 b/services/idp/docker/Dockerfile.linux.amd64 deleted file mode 100644 index 00c20b21dc..0000000000 --- a/services/idp/docker/Dockerfile.linux.amd64 +++ /dev/null @@ -1,19 +0,0 @@ -FROM amd64/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS LibreGraph Connect" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9130 9134 - -ENTRYPOINT ["/usr/bin/ocis-idp"] -CMD ["server"] - -COPY bin/ocis-idp /usr/bin/ocis-idp diff --git a/services/idp/docker/Dockerfile.linux.arm b/services/idp/docker/Dockerfile.linux.arm deleted file mode 100644 index d761559136..0000000000 --- a/services/idp/docker/Dockerfile.linux.arm +++ /dev/null @@ -1,19 +0,0 @@ -FROM arm32v6/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS LibreGraph Connect" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9130 9134 - -ENTRYPOINT ["/usr/bin/ocis-idp"] -CMD ["server"] - -COPY bin/ocis-idp /usr/bin/ocis-idp diff --git a/services/idp/docker/Dockerfile.linux.arm64 b/services/idp/docker/Dockerfile.linux.arm64 deleted file mode 100644 index 3ef84b55d1..0000000000 --- a/services/idp/docker/Dockerfile.linux.arm64 +++ /dev/null @@ -1,19 +0,0 @@ -FROM arm64v8/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS LibreGraph Connect" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9130 9134 - -ENTRYPOINT ["/usr/bin/ocis-idp"] -CMD ["server"] - -COPY bin/ocis-idp /usr/bin/ocis-idp diff --git a/services/idp/docker/manifest.tmpl b/services/idp/docker/manifest.tmpl deleted file mode 100644 index 6367d18ade..0000000000 --- a/services/idp/docker/manifest.tmpl +++ /dev/null @@ -1,22 +0,0 @@ -image: owncloud/ocis-idp:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} -{{#if build.tags}} -tags: -{{#each build.tags}} - - {{this}} -{{/each}} -{{/if}} -manifests: - - image: owncloud/ocis-idp:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 - platform: - architecture: amd64 - os: linux - - image: owncloud/ocis-idp:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 - platform: - architecture: arm64 - variant: v8 - os: linux - - image: owncloud/ocis-idp:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm - platform: - architecture: arm - variant: v6 - os: linux diff --git a/services/ocs/.dockerignore b/services/ocs/.dockerignore deleted file mode 100644 index 4ec85b5e4f..0000000000 --- a/services/ocs/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!bin/ diff --git a/services/ocs/docker/Dockerfile.linux.amd64 b/services/ocs/docker/Dockerfile.linux.amd64 deleted file mode 100644 index bc843071bc..0000000000 --- a/services/ocs/docker/Dockerfile.linux.amd64 +++ /dev/null @@ -1,19 +0,0 @@ -FROM amd64/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS OCS" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9110 9114 - -ENTRYPOINT ["/usr/bin/ocis-ocs"] -CMD ["server"] - -COPY bin/ocis-ocs /usr/bin/ocis-ocs diff --git a/services/ocs/docker/Dockerfile.linux.arm b/services/ocs/docker/Dockerfile.linux.arm deleted file mode 100644 index 812f8d584f..0000000000 --- a/services/ocs/docker/Dockerfile.linux.arm +++ /dev/null @@ -1,19 +0,0 @@ -FROM arm32v6/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS OCS" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9110 9114 - -ENTRYPOINT ["/usr/bin/ocis-ocs"] -CMD ["server"] - -COPY bin/ocis-ocs /usr/bin/ocis-ocs diff --git a/services/ocs/docker/Dockerfile.linux.arm64 b/services/ocs/docker/Dockerfile.linux.arm64 deleted file mode 100644 index d9c673fd66..0000000000 --- a/services/ocs/docker/Dockerfile.linux.arm64 +++ /dev/null @@ -1,19 +0,0 @@ -FROM arm64v8/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS OCS" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9110 9114 - -ENTRYPOINT ["/usr/bin/ocis-ocs"] -CMD ["server"] - -COPY bin/ocis-ocs /usr/bin/ocis-ocs diff --git a/services/ocs/docker/manifest.tmpl b/services/ocs/docker/manifest.tmpl deleted file mode 100644 index cdeae810b4..0000000000 --- a/services/ocs/docker/manifest.tmpl +++ /dev/null @@ -1,22 +0,0 @@ -image: owncloud/ocis-ocs:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} -{{#if build.tags}} -tags: -{{#each build.tags}} - - {{this}} -{{/each}} -{{/if}} -manifests: - - image: owncloud/ocis-ocs:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 - platform: - architecture: amd64 - os: linux - - image: owncloud/ocis-ocs:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 - platform: - architecture: arm64 - variant: v8 - os: linux - - image: owncloud/ocis-ocs:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm - platform: - architecture: arm - variant: v6 - os: linux diff --git a/services/proxy/.dockerignore b/services/proxy/.dockerignore deleted file mode 100644 index 4ec85b5e4f..0000000000 --- a/services/proxy/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!bin/ diff --git a/services/proxy/docker/Dockerfile.linux.amd64 b/services/proxy/docker/Dockerfile.linux.amd64 deleted file mode 100644 index 4b76f0fa16..0000000000 --- a/services/proxy/docker/Dockerfile.linux.amd64 +++ /dev/null @@ -1,19 +0,0 @@ -FROM amd64/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS Proxy" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9180 - -ENTRYPOINT ["/usr/bin/ocis-proxy"] -CMD ["server"] - -COPY bin/ocis-proxy /usr/bin/ocis-proxy diff --git a/services/proxy/docker/Dockerfile.linux.arm b/services/proxy/docker/Dockerfile.linux.arm deleted file mode 100644 index 9da1cd74b0..0000000000 --- a/services/proxy/docker/Dockerfile.linux.arm +++ /dev/null @@ -1,19 +0,0 @@ -FROM arm32v6/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS Proxy" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9180 - -ENTRYPOINT ["/usr/bin/ocis-proxy"] -CMD ["server"] - -COPY bin/ocis-proxy /usr/bin/ocis-proxy diff --git a/services/proxy/docker/Dockerfile.linux.arm64 b/services/proxy/docker/Dockerfile.linux.arm64 deleted file mode 100644 index a54529af5d..0000000000 --- a/services/proxy/docker/Dockerfile.linux.arm64 +++ /dev/null @@ -1,19 +0,0 @@ -FROM arm64v8/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS Proxy" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9180 - -ENTRYPOINT ["/usr/bin/ocis-proxy"] -CMD ["server"] - -COPY bin/ocis-proxy /usr/bin/ocis-proxy diff --git a/services/proxy/docker/manifest.tmpl b/services/proxy/docker/manifest.tmpl deleted file mode 100644 index 17a758689f..0000000000 --- a/services/proxy/docker/manifest.tmpl +++ /dev/null @@ -1,22 +0,0 @@ -image: owncloud/ocis-proxy:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} -{{#if build.tags}} -tags: -{{#each build.tags}} - - {{this}} -{{/each}} -{{/if}} -manifests: - - image: owncloud/ocis-proxy:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 - platform: - architecture: amd64 - os: linux - - image: owncloud/ocis-proxy:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 - platform: - architecture: arm64 - variant: v8 - os: linux - - image: owncloud/ocis-proxy:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm - platform: - architecture: arm - variant: v6 - os: linux diff --git a/services/settings/.dockerignore b/services/settings/.dockerignore deleted file mode 100644 index 4ec85b5e4f..0000000000 --- a/services/settings/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!bin/ diff --git a/services/settings/docker/Dockerfile.linux.amd64 b/services/settings/docker/Dockerfile.linux.amd64 deleted file mode 100644 index 507164f1d1..0000000000 --- a/services/settings/docker/Dockerfile.linux.amd64 +++ /dev/null @@ -1,19 +0,0 @@ -FROM amd64/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS Settings" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9190 9194 - -ENTRYPOINT ["/usr/bin/ocis-settings"] -CMD ["server"] - -COPY bin/ocis-settings /usr/bin/ocis-settings diff --git a/services/settings/docker/Dockerfile.linux.arm b/services/settings/docker/Dockerfile.linux.arm deleted file mode 100644 index fea0e5b64a..0000000000 --- a/services/settings/docker/Dockerfile.linux.arm +++ /dev/null @@ -1,19 +0,0 @@ -FROM arm32v6/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS Settings" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9190 9194 - -ENTRYPOINT ["/usr/bin/ocis-settings"] -CMD ["server"] - -COPY bin/ocis-settings /usr/bin/ocis-settings diff --git a/services/settings/docker/Dockerfile.linux.arm64 b/services/settings/docker/Dockerfile.linux.arm64 deleted file mode 100644 index e59767d521..0000000000 --- a/services/settings/docker/Dockerfile.linux.arm64 +++ /dev/null @@ -1,19 +0,0 @@ -FROM arm64v8/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS Settings" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9190 9194 - -ENTRYPOINT ["/usr/bin/ocis-settings"] -CMD ["server"] - -COPY bin/ocis-settings /usr/bin/ocis-settings diff --git a/services/settings/docker/manifest.tmpl b/services/settings/docker/manifest.tmpl deleted file mode 100644 index 7e445a3917..0000000000 --- a/services/settings/docker/manifest.tmpl +++ /dev/null @@ -1,22 +0,0 @@ -image: owncloud/ocis-settings:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} -{{#if build.tags}} -tags: -{{#each build.tags}} - - {{this}} -{{/each}} -{{/if}} -manifests: - - image: owncloud/ocis-settings:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 - platform: - architecture: amd64 - os: linux - - image: owncloud/ocis-settings:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 - platform: - architecture: arm64 - variant: v8 - os: linux - - image: owncloud/ocis-settings:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm - platform: - architecture: arm - variant: v6 - os: linux diff --git a/services/thumbnails/docker/Dockerfile.linux.amd64 b/services/thumbnails/docker/Dockerfile.linux.amd64 deleted file mode 100644 index cdf70eb0da..0000000000 --- a/services/thumbnails/docker/Dockerfile.linux.amd64 +++ /dev/null @@ -1,19 +0,0 @@ -FROM amd64/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS Thumbnails" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9110 9114 - -ENTRYPOINT ["/usr/bin/ocis-thumbnails"] -CMD ["server"] - -COPY bin/ocis-thumbnails /usr/bin/ocis-thumbnails diff --git a/services/thumbnails/docker/Dockerfile.linux.arm b/services/thumbnails/docker/Dockerfile.linux.arm deleted file mode 100644 index 33a3aebe94..0000000000 --- a/services/thumbnails/docker/Dockerfile.linux.arm +++ /dev/null @@ -1,19 +0,0 @@ -FROM arm32v6/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS Thumbnails" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9110 9114 - -ENTRYPOINT ["/usr/bin/ocis-thumbnails"] -CMD ["server"] - -COPY bin/ocis-thumbnails /usr/bin/ocis-thumbnails diff --git a/services/thumbnails/docker/Dockerfile.linux.arm64 b/services/thumbnails/docker/Dockerfile.linux.arm64 deleted file mode 100644 index 5fb0c5b242..0000000000 --- a/services/thumbnails/docker/Dockerfile.linux.arm64 +++ /dev/null @@ -1,19 +0,0 @@ -FROM arm64v8/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS Thumbnails" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9110 9114 - -ENTRYPOINT ["/usr/bin/ocis-thumbnails"] -CMD ["server"] - -COPY bin/ocis-thumbnails /usr/bin/ocis-thumbnails diff --git a/services/thumbnails/docker/manifest.tmpl b/services/thumbnails/docker/manifest.tmpl deleted file mode 100644 index cddd65a91f..0000000000 --- a/services/thumbnails/docker/manifest.tmpl +++ /dev/null @@ -1,22 +0,0 @@ -image: owncloud/ocis-thumbnails:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} -{{#if build.tags}} -tags: -{{#each build.tags}} - - {{this}} -{{/each}} -{{/if}} -manifests: - - image: owncloud/ocis-thumbnails:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 - platform: - architecture: amd64 - os: linux - - image: owncloud/ocis-thumbnails:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 - platform: - architecture: arm64 - variant: v8 - os: linux - - image: owncloud/ocis-thumbnails:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm - platform: - architecture: arm - variant: v6 - os: linux diff --git a/services/web/.dockerignore b/services/web/.dockerignore deleted file mode 100644 index 4ec85b5e4f..0000000000 --- a/services/web/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!bin/ diff --git a/services/web/docker/Dockerfile.linux.amd64 b/services/web/docker/Dockerfile.linux.amd64 deleted file mode 100644 index b5f81e80cd..0000000000 --- a/services/web/docker/Dockerfile.linux.amd64 +++ /dev/null @@ -1,19 +0,0 @@ -FROM amd64/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS Web" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9100 9104 - -ENTRYPOINT ["/usr/bin/web"] -CMD ["server"] - -COPY bin/web /usr/bin/web diff --git a/services/web/docker/Dockerfile.linux.arm b/services/web/docker/Dockerfile.linux.arm deleted file mode 100644 index 25e213810d..0000000000 --- a/services/web/docker/Dockerfile.linux.arm +++ /dev/null @@ -1,19 +0,0 @@ -FROM arm32v6/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS Web" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9100 9104 - -ENTRYPOINT ["/usr/bin/web"] -CMD ["server"] - -COPY bin/web /usr/bin/web diff --git a/services/web/docker/Dockerfile.linux.arm64 b/services/web/docker/Dockerfile.linux.arm64 deleted file mode 100644 index c5dd037a7f..0000000000 --- a/services/web/docker/Dockerfile.linux.arm64 +++ /dev/null @@ -1,19 +0,0 @@ -FROM arm64v8/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS Web" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9100 9104 - -ENTRYPOINT ["/usr/bin/web"] -CMD ["server"] - -COPY bin/web /usr/bin/web diff --git a/services/web/docker/manifest.tmpl b/services/web/docker/manifest.tmpl deleted file mode 100644 index 631d6c21c0..0000000000 --- a/services/web/docker/manifest.tmpl +++ /dev/null @@ -1,22 +0,0 @@ -image: owncloud/ocis-web:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} -{{#if build.tags}} -tags: -{{#each build.tags}} - - {{this}} -{{/each}} -{{/if}} -manifests: - - image: owncloud/ocis-web:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 - platform: - architecture: amd64 - os: linux - - image: owncloud/ocis-web:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 - platform: - architecture: arm64 - variant: v8 - os: linux - - image: owncloud/ocis-web:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm - platform: - architecture: arm - variant: v6 - os: linux diff --git a/services/webdav/.dockerignore b/services/webdav/.dockerignore deleted file mode 100644 index 4ec85b5e4f..0000000000 --- a/services/webdav/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!bin/ diff --git a/services/webdav/docker/Dockerfile.linux.amd64 b/services/webdav/docker/Dockerfile.linux.amd64 deleted file mode 100644 index 6655e6dc20..0000000000 --- a/services/webdav/docker/Dockerfile.linux.amd64 +++ /dev/null @@ -1,19 +0,0 @@ -FROM amd64/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS WebDAV" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9115 9119 - -ENTRYPOINT ["/usr/bin/ocis-webdav"] -CMD ["server"] - -COPY bin/ocis-webdav /usr/bin/ocis-webdav diff --git a/services/webdav/docker/Dockerfile.linux.arm b/services/webdav/docker/Dockerfile.linux.arm deleted file mode 100644 index 037bf5fe24..0000000000 --- a/services/webdav/docker/Dockerfile.linux.arm +++ /dev/null @@ -1,19 +0,0 @@ -FROM arm32v6/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS WebDAV" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9115 9119 - -ENTRYPOINT ["/usr/bin/ocis-webdav"] -CMD ["server"] - -COPY bin/ocis-webdav /usr/bin/ocis-webdav diff --git a/services/webdav/docker/Dockerfile.linux.arm64 b/services/webdav/docker/Dockerfile.linux.arm64 deleted file mode 100644 index eb5f6a48d6..0000000000 --- a/services/webdav/docker/Dockerfile.linux.arm64 +++ /dev/null @@ -1,19 +0,0 @@ -FROM arm64v8/alpine:latest - -RUN apk update && \ - apk upgrade && \ - apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf - -LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="oCIS WebDAV" \ - org.label-schema.vendor="ownCloud GmbH" \ - org.label-schema.schema-version="1.0" - -EXPOSE 9115 9119 - -ENTRYPOINT ["/usr/bin/ocis-webdav"] -CMD ["server"] - -COPY bin/ocis-webdav /usr/bin/ocis-webdav diff --git a/services/webdav/docker/manifest.tmpl b/services/webdav/docker/manifest.tmpl deleted file mode 100644 index 63942c97ec..0000000000 --- a/services/webdav/docker/manifest.tmpl +++ /dev/null @@ -1,22 +0,0 @@ -image: owncloud/ocis-webdav:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} -{{#if build.tags}} -tags: -{{#each build.tags}} - - {{this}} -{{/each}} -{{/if}} -manifests: - - image: owncloud/ocis-webdav:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 - platform: - architecture: amd64 - os: linux - - image: owncloud/ocis-webdav:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 - platform: - architecture: arm64 - variant: v8 - os: linux - - image: owncloud/ocis-webdav:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm - platform: - architecture: arm - variant: v6 - os: linux diff --git a/services/webfinger/.dockerignore b/services/webfinger/.dockerignore deleted file mode 100644 index 4ec85b5e4f..0000000000 --- a/services/webfinger/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!bin/