diff --git a/Dockerfile b/Dockerfile index ec23f79894a..1f09dfa6c68 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 b9f321edd40..7f625cac8ad 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 581de2d4713..f715765603d 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 f154bda5155..3903e467136 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 8ee01193ea2..c3ff60e2495 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 4ec85b5e4f7..00000000000 --- 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 de3d947c705..00000000000 --- 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 a64d435b4aa..00000000000 --- 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 825a001484b..00000000000 --- 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 3c592b1c71c..00000000000 --- 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 4ec85b5e4f7..00000000000 --- 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 00c20b21dc7..00000000000 --- 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 d7615591364..00000000000 --- 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 3ef84b55d15..00000000000 --- 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 6367d18ade9..00000000000 --- 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 4ec85b5e4f7..00000000000 --- 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 bc843071bc5..00000000000 --- 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 812f8d584ff..00000000000 --- 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 d9c673fd663..00000000000 --- 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 cdeae810b47..00000000000 --- 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 4ec85b5e4f7..00000000000 --- 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 4b76f0fa16e..00000000000 --- 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 9da1cd74b09..00000000000 --- 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 a54529af5db..00000000000 --- 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 17a758689fd..00000000000 --- 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 4ec85b5e4f7..00000000000 --- 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 507164f1d17..00000000000 --- 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 fea0e5b64a4..00000000000 --- 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 e59767d5215..00000000000 --- 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 7e445a39176..00000000000 --- 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 cdf70eb0dac..00000000000 --- 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 33a3aebe94d..00000000000 --- 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 5fb0c5b2424..00000000000 --- 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 cddd65a91f0..00000000000 --- 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 4ec85b5e4f7..00000000000 --- 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 b5f81e80cd7..00000000000 --- 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 25e213810d8..00000000000 --- 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 c5dd037a7f0..00000000000 --- 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 631d6c21c0e..00000000000 --- 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 4ec85b5e4f7..00000000000 --- 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 6655e6dc200..00000000000 --- 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 037bf5fe246..00000000000 --- 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 eb5f6a48d68..00000000000 --- 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 63942c97ecd..00000000000 --- 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 4ec85b5e4f7..00000000000 --- a/services/webfinger/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!bin/