From 510b90f26bad143e99bd15b4f0f5fe8d296d4a74 Mon Sep 17 00:00:00 2001 From: vitalii-codefresh Date: Thu, 4 Jul 2024 14:04:26 +0300 Subject: [PATCH 1/8] transfer to alpine image, upgaded compose-bin --- .gitignore | 1 + Dockerfile | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000000..485dee64bcf --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea diff --git a/Dockerfile b/Dockerfile index b02217b5059..e361f382603 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,12 @@ # syntax=docker/dockerfile:1 -ARG COMPOSE_VERSION=v2.20.3 +ARG COMPOSE_VERSION=v2.28.1 FROM docker/compose-bin:${COMPOSE_VERSION} AS compose -FROM debian:bullseye-slim AS compose-plugin +FROM alpine:3.20.1 AS compose-plugin + +RUN apk -U upgrade openssl COPY --from=compose /docker-compose /usr/local/bin/docker-compose ENV COMPOSE_COMPATIBILITY true From eadc8800286d638dc4dfcc24e1f72eb967f38058 Mon Sep 17 00:00:00 2001 From: vitalii-codefresh Date: Thu, 4 Jul 2024 15:26:35 +0300 Subject: [PATCH 2/8] upgraded version --- service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.yaml b/service.yaml index 84b2e834c0f..ef64beee07e 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 1.4.0 +version: 1.5.0 From 89c5e778d72a68357682c06caa766897264400be Mon Sep 17 00:00:00 2001 From: vitalii-codefresh Date: Thu, 4 Jul 2024 15:42:31 +0300 Subject: [PATCH 3/8] returned --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e361f382603..424ef660016 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,9 +4,9 @@ ARG COMPOSE_VERSION=v2.28.1 FROM docker/compose-bin:${COMPOSE_VERSION} AS compose -FROM alpine:3.20.1 AS compose-plugin +FROM debian:bullseye-slim AS compose-plugin + -RUN apk -U upgrade openssl COPY --from=compose /docker-compose /usr/local/bin/docker-compose ENV COMPOSE_COMPATIBILITY true From 57b74a48e87b6666050b99b3e9122bf33803d45d Mon Sep 17 00:00:00 2001 From: vitalii-codefresh Date: Thu, 4 Jul 2024 17:09:30 +0300 Subject: [PATCH 4/8] attempt 2 --- Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 424ef660016..0693b7e83d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,12 +4,10 @@ ARG COMPOSE_VERSION=v2.28.1 FROM docker/compose-bin:${COMPOSE_VERSION} AS compose -FROM debian:bullseye-slim AS compose-plugin - - +FROM alpine:3.20 AS compose-plugin COPY --from=compose /docker-compose /usr/local/bin/docker-compose -ENV COMPOSE_COMPATIBILITY true +ENV COMPOSE_COMPATIBILITY=true # add user RUN addgroup --gid 3000 compose && \ From 77c7eb11eb0f1ea351973d1474a5021276c0c78f Mon Sep 17 00:00:00 2001 From: vitalii-codefresh Date: Thu, 4 Jul 2024 17:16:27 +0300 Subject: [PATCH 5/8] upgraded packages --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0693b7e83d6..092fb9d92df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,8 @@ RUN addgroup --gid 3000 compose && \ adduser --uid 3000 --gecos "" --disabled-password \ --ingroup compose \ --home /home/compose \ - --shell /bin/bash compose + --shell /bin/bash compose && \ + apt -U upgrade WORKDIR /home/compose From 14ee2d3cf6237f484351cdb7cfde9f23883b456b Mon Sep 17 00:00:00 2001 From: vitalii-codefresh Date: Thu, 4 Jul 2024 17:53:01 +0300 Subject: [PATCH 6/8] upgraded packages | added layer --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 092fb9d92df..310974bfccb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,13 +9,13 @@ FROM alpine:3.20 AS compose-plugin COPY --from=compose /docker-compose /usr/local/bin/docker-compose ENV COMPOSE_COMPATIBILITY=true +RUN apt -U upgrade # add user RUN addgroup --gid 3000 compose && \ adduser --uid 3000 --gecos "" --disabled-password \ --ingroup compose \ --home /home/compose \ - --shell /bin/bash compose && \ - apt -U upgrade + --shell /bin/bash compose WORKDIR /home/compose From 3eee8b9d742fc3cc8102150aefc71277337f1453 Mon Sep 17 00:00:00 2001 From: vitalii-codefresh Date: Thu, 4 Jul 2024 17:58:35 +0300 Subject: [PATCH 7/8] trigger --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 310974bfccb..ea310a5d287 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ FROM alpine:3.20 AS compose-plugin COPY --from=compose /docker-compose /usr/local/bin/docker-compose ENV COMPOSE_COMPATIBILITY=true -RUN apt -U upgrade +RUN apk -U upgrade # add user RUN addgroup --gid 3000 compose && \ adduser --uid 3000 --gecos "" --disabled-password \ From 9362ad3506202c726e8b7c1b8c625abca0158eba Mon Sep 17 00:00:00 2001 From: vitalii-codefresh Date: Fri, 5 Jul 2024 14:30:32 +0300 Subject: [PATCH 8/8] transfer to bookwarm --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ea310a5d287..6b8a454bbf6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,12 +4,11 @@ ARG COMPOSE_VERSION=v2.28.1 FROM docker/compose-bin:${COMPOSE_VERSION} AS compose -FROM alpine:3.20 AS compose-plugin +FROM debian:bookworm-slim AS compose-plugin COPY --from=compose /docker-compose /usr/local/bin/docker-compose ENV COMPOSE_COMPATIBILITY=true -RUN apk -U upgrade # add user RUN addgroup --gid 3000 compose && \ adduser --uid 3000 --gecos "" --disabled-password \