From 11a4038182dc66bc56c868b5c73f9950aff87954 Mon Sep 17 00:00:00 2001 From: Damian Badura Date: Thu, 5 Sep 2024 15:22:52 +0200 Subject: [PATCH 1/2] use one node image --- Dockerfile | 4 ++-- Dockerfile.kyma | 6 +++--- Dockerfile.local | 4 ++-- Dockerfile.local.kyma | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0c25ccd403..2577505161 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ # ---- Base Alpine with Node ---- -FROM alpine:3.20.2 AS builder +FROM node:20.17-alpine3.20 AS builder ARG default_tag # Install global dependencies RUN apk update && \ apk upgrade && \ - apk add --no-cache make nodejs npm yq + apk add --no-cache make yq WORKDIR /app diff --git a/Dockerfile.kyma b/Dockerfile.kyma index 09446226b6..3439af9c67 100644 --- a/Dockerfile.kyma +++ b/Dockerfile.kyma @@ -1,11 +1,11 @@ # ---- Base Alpine with Node ---- -FROM alpine:3.20.2 AS builder +FROM node:20.17-alpine3.20 AS builder ARG default_tag # Install global dependencies RUN apk update && \ apk upgrade && \ - apk add --no-cache make nodejs npm yq + apk add --no-cache make yq WORKDIR /app @@ -21,7 +21,7 @@ RUN yq -i '.version = "'${default_tag}'"' public/version.yaml && \ RUN npm run build:docker # ---- Environments Configuration ---- -FROM node:22.7.0-alpine3.19 as configuration +FROM node:20.17-alpine3.20 as configuration #RUN apk add make WORKDIR /kyma diff --git a/Dockerfile.local b/Dockerfile.local index 7d29e4f184..1345c71352 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -1,12 +1,12 @@ # this is a Dockerfile for single deployment app - both backend and frontends # ---- Base Alpine with Node ---- -FROM alpine:3.20.2 AS builder +FROM node:20.17-alpine3.20 AS builder ARG default_tag RUN apk update && \ apk upgrade && \ - apk add --no-cache --update make nodejs npm yq + apk add --no-cache make yq WORKDIR /app diff --git a/Dockerfile.local.kyma b/Dockerfile.local.kyma index 05d81440ab..963cb523fa 100644 --- a/Dockerfile.local.kyma +++ b/Dockerfile.local.kyma @@ -1,12 +1,12 @@ # this is a Dockerfile for single deployment app - both backend and frontends # ---- Base Alpine with Node ---- -FROM alpine:3.20.2 AS builder +FROM node:20.17-alpine3.20 AS builder ARG default_tag RUN apk update && \ apk upgrade && \ - apk add --no-cache --update make nodejs npm yq + apk add --no-cache make yq WORKDIR /app @@ -25,7 +25,7 @@ RUN npm run build:docker RUN cd /app/backend && npm run build # ---- Environments Configuration ---- -FROM node:22.7.0-alpine3.19 as configuration +FROM node:20.17-alpine3.20 AS configuration #RUN apk add make WORKDIR /kyma From ecc906325ad58887e86a08f81eae0c55dcf7b041 Mon Sep 17 00:00:00 2001 From: Damian Badura Date: Thu, 5 Sep 2024 15:45:01 +0200 Subject: [PATCH 2/2] add local kyma image to paths --- .github/workflows/busola-kyma-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/busola-kyma-build.yml b/.github/workflows/busola-kyma-build.yml index f38aaedd80..e27cb22538 100644 --- a/.github/workflows/busola-kyma-build.yml +++ b/.github/workflows/busola-kyma-build.yml @@ -12,6 +12,8 @@ on: - "package.json" - "Makefile" - "Dockerfile.kyma" + - "Dockerfile.local.kyma" + pull_request_target: types: [opened, edited, synchronize, reopened, ready_for_review] paths: