chore: remove unneeded stuff

owncloud · Oct 21, 2024 · 35578a0 · 35578a0
1 parent 9ac104f
commit 35578a0
Show file tree

Hide file tree

Showing 45 changed files with 6 additions and 655 deletions.
diff --git 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 <[email protected]>" \

diff --git 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
@@ -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 <[email protected]>" \

diff --git 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 <[email protected]>" \

diff --git 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 <[email protected]>" \

diff --git a/services/graph/.dockerignore b/services/graph/.dockerignore
diff --git a/services/graph/docker/Dockerfile.linux.amd64 b/services/graph/docker/Dockerfile.linux.amd64
diff --git a/services/graph/docker/Dockerfile.linux.arm b/services/graph/docker/Dockerfile.linux.arm
diff --git a/services/graph/docker/Dockerfile.linux.arm64 b/services/graph/docker/Dockerfile.linux.arm64
diff --git a/services/graph/docker/manifest.tmpl b/services/graph/docker/manifest.tmpl
diff --git a/services/idp/.dockerignore b/services/idp/.dockerignore
diff --git a/services/idp/docker/Dockerfile.linux.amd64 b/services/idp/docker/Dockerfile.linux.amd64
diff --git a/services/idp/docker/Dockerfile.linux.arm b/services/idp/docker/Dockerfile.linux.arm
diff --git a/services/idp/docker/Dockerfile.linux.arm64 b/services/idp/docker/Dockerfile.linux.arm64
diff --git a/services/idp/docker/manifest.tmpl b/services/idp/docker/manifest.tmpl
diff --git a/services/ocs/.dockerignore b/services/ocs/.dockerignore
diff --git a/services/ocs/docker/Dockerfile.linux.amd64 b/services/ocs/docker/Dockerfile.linux.amd64
diff --git a/services/ocs/docker/Dockerfile.linux.arm b/services/ocs/docker/Dockerfile.linux.arm
diff --git a/services/ocs/docker/Dockerfile.linux.arm64 b/services/ocs/docker/Dockerfile.linux.arm64
diff --git a/services/ocs/docker/manifest.tmpl b/services/ocs/docker/manifest.tmpl
diff --git a/services/proxy/.dockerignore b/services/proxy/.dockerignore
diff --git a/services/proxy/docker/Dockerfile.linux.amd64 b/services/proxy/docker/Dockerfile.linux.amd64
diff --git a/services/proxy/docker/Dockerfile.linux.arm b/services/proxy/docker/Dockerfile.linux.arm
diff --git a/services/proxy/docker/Dockerfile.linux.arm64 b/services/proxy/docker/Dockerfile.linux.arm64