From 1d672a288ae347a9f59a7660aeadfd85cfc3e8a7 Mon Sep 17 00:00:00 2001 From: Frikky Date: Mon, 27 Jan 2025 13:23:11 +0100 Subject: [PATCH] Attempted rebuilds docker --- backend/Dockerfile | 2 +- functions/onprem/orborus/Dockerfile | 7 ++++--- functions/onprem/worker/Dockerfile | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 79dc72f2..7cab5e27 100755 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -28,7 +28,7 @@ FROM alpine:latest as certs RUN apk add --update ca-certificates # Sets up the final image -FROM alpine:3.17.0 +FROM alpine:3.21.2 # FIXME: Install cgo because CGO_ENABLED=1 during build RUN apk add --no-cache libc6-compat diff --git a/functions/onprem/orborus/Dockerfile b/functions/onprem/orborus/Dockerfile index e5dfea8a..79245ae3 100644 --- a/functions/onprem/orborus/Dockerfile +++ b/functions/onprem/orborus/Dockerfile @@ -10,11 +10,12 @@ RUN go get # Enabled CGO January 2025 (?) #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 orborus . +RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /app/orborus . -FROM alpine:3.15.0 +FROM alpine:3.21.2 RUN apk add --no-cache bash tzdata -COPY --from=builder /app/orborus / +#COPY --from=builder /app/orborus orborus +COPY --from=builder /app/ / ENV ENVIRONMENT_NAME=Shuffle \ BASE_URL=http://shuffle-backend:5001 \ DOCKER_API_VERSION=1.40 \ diff --git a/functions/onprem/worker/Dockerfile b/functions/onprem/worker/Dockerfile index da8b8da8..019e0fc7 100755 --- a/functions/onprem/worker/Dockerfile +++ b/functions/onprem/worker/Dockerfile @@ -27,7 +27,7 @@ RUN go get RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o worker . ## ALPINE IMAGE -FROM alpine:3.15.0 +FROM alpine:3.21.2 ENV SHUFFLE_BASE_IMAGE_REGISTRY=docker.io ENV SHUFFLE_BASE_IMAGE_NAME=frikky/shuffle