Merge branch 'main' into nightly

functions/onprem/orborus/Dockerfile

@@ -14,7 +14,7 @@ RUN go mod tidy
 #RUN CGO_ENABLED=1 GOOS=linux go build -a -installsuffix cgo -o orborus.
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /app/orborus .
 
-FROM alpine:3.21.2
+FROM alpine:3.22.1
 
 RUN apk add --no-cache bash tzdata
 #COPY --from=builder /app/orborus orborus

functions/onprem/orborus/Dockerfile.old

@@ -1,36 +0,0 @@
-FROM golang:1.22 as builder
-
-RUN mkdir /app
-WORKDIR /app
-
-COPY orborus.go /app/orborus.go
-#COPY go.mod /app/go.mod
-#COPY go.sum /app/go.sum
-RUN go mod init orborus 
-
-RUN go get github.com/docker/docker/api/types 
-RUN go get github.com/docker/docker/api/types/container 
-#RUN go get github.com/docker/docker/client 
-RUN go get github.com/mackerelio/go-osstat/cpu 
-RUN go get github.com/mackerelio/go-osstat/memory 
-RUN go get github.com/satori/go.uuid 
-RUN go get github.com/shuffle/shuffle-shared 
-RUN	go get github.com/shirou/gopsutil 
-# RUN go get k8s.io/client-go
-# RUN go get k8s.io/apimachinery
-
-RUN go get
-RUN go mod tidy 
-RUN go build
-RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o orborus .
-
-FROM alpine:3.15.0
-RUN apk add --no-cache bash tzdata
-COPY --from=builder /app/ /
-
-ENV ENVIRONMENT_NAME=Shuffle
-ENV BASE_URL=http://shuffle-backend:5001
-ENV DOCKER_API_VERSION=1.40
-ENV SHUFFLE_OPENSEARCH_URL=https://opensearch:9200
-
-CMD ["./orborus"]

functions/onprem/worker/Dockerfile

@@ -28,7 +28,7 @@ RUN go mod tidy
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o worker .
 
 ## ALPINE IMAGE
-FROM alpine:3.21.2
+FROM alpine:3.22.1
 
 ENV SHUFFLE_BASE_IMAGE_REGISTRY=docker.io
 ENV SHUFFLE_BASE_IMAGE_NAME=frikky/shuffle