Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use synced images #1068

Merged
merged 10 commits into from
Jul 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/operator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


# Build the operator binary
FROM golang:1.22.5 as builder
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.22.5-alpine as builder

WORKDIR /workdir

Expand All @@ -24,7 +24,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o operator ./components/o

# Replace main images in values.yaml
# Bumping serverless images in the values.yaml - used for building "local" and "dev" images
FROM alpine:3.20.1 as replacer
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/alpine:3.20.1 as replacer

WORKDIR /workdir

Expand Down
4 changes: 2 additions & 2 deletions components/runtimes/nodejs/nodejs18/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# alpine 3.20.1
FROM alpine@sha256:b89d9c93e9ed3597455c90a0b88a8bbb5cb7188438f70953fede212a0c4394e0
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/alpine:3.20.1

# https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.18&repo=main&arch=&maintainer=
ENV NODE_VERSION=18.20.1-r0

Expand Down
3 changes: 1 addition & 2 deletions components/runtimes/nodejs/nodejs20/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# alpine 3.20.1
FROM alpine@sha256:b89d9c93e9ed3597455c90a0b88a8bbb5cb7188438f70953fede212a0c4394e0
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/alpine:3.20.1

# https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.20&repo=main&arch=&maintainer=
ENV NODE_VERSION=20.15.1-r0
Expand Down
2 changes: 1 addition & 1 deletion components/runtimes/python/python312/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.12.3-alpine3.20
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/python:3.12.3-alpine3.20

# Serverless
LABEL source = [email protected]:kyma-project/serverless.git
Expand Down
2 changes: 1 addition & 1 deletion components/runtimes/python/python39/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.9.19-alpine3.20
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/python:3.9.19-alpine3.20

# Serverless
LABEL source = [email protected]:kyma-project/serverless.git
Expand Down
4 changes: 2 additions & 2 deletions components/serverless/deploy/jobinit/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22.5-alpine3.20 as builder
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.22.5-alpine as builder

ENV BASE_APP_DIR=/workspace/go/src/github.com/kyma-project/serverless \
CGO_ENABLED=1 \
Expand All @@ -20,7 +20,7 @@ RUN go build -ldflags "-s -w" -a -o jobinit ./components/serverless/cmd/jobinit/
&& mkdir /app \
&& mv ./jobinit /app/jobinit

FROM europe-docker.pkg.dev/kyma-project/prod/external/alpine:3.20.0
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/alpine:3.20.1
ENV LIBGIT2_VERSION=1.5.2-r0

LABEL source = [email protected]:kyma-project/serverless.git
Expand Down
6 changes: 3 additions & 3 deletions components/serverless/deploy/manager/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22.5-alpine3.20 as builder
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.22.5-alpine as builder

ENV BASE_APP_DIR=/workspace/go/src/github.com/kyma-project/serverless \
CGO_ENABLED=1 \
Expand All @@ -20,11 +20,11 @@ RUN go build -ldflags "-s -w" -a -o manager ./components/serverless/cmd/manager/
&& mkdir /app \
&& mv ./manager /app/manager

FROM europe-docker.pkg.dev/kyma-project/prod/external/alpine:3.20.0 as certs
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/alpine:3.20.1 as certs

RUN apk add --no-cache ca-certificates

FROM europe-docker.pkg.dev/kyma-project/prod/external/alpine:3.20.0
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/alpine:3.20.1

ENV LIBGIT2_VERSION=1.5.2-r0

Expand Down
5 changes: 2 additions & 3 deletions components/serverless/deploy/webhook/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# image builder base on golang:1.22.3-alpine3.20
FROM golang@sha256:e62cde42bd32f7b0435c997d4048ee7b76042e31bde380898e1df97eabdb01fd as builder
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.22.5-alpine as builder

ENV BASE_APP_DIR=/workspace/go/src/github.com/kyma-project/serverless \
CGO_ENABLED=0 \
Expand All @@ -17,7 +16,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o webhook-server ./compon
&& mv ./webhook-server /app/webhook-server

# get latest CA certs from alpine:3.17.4
FROM europe-docker.pkg.dev/kyma-project/prod/external/alpine:3.20.0 as certs
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/alpine:3.20.1 as certs
RUN apk add --no-cache ca-certificates

FROM scratch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
hostIPC: false # Optional. The default is false if the entry is not there.
initContainers:
- name: generate-htpasswd
image: "{{ include "imageurl" (dict "reg" .Values.global.tpiContainerRegistry "img" .Values.global.images.registry) }}"
image: "{{ include "imageurl" (dict "reg" .Values.global.tpiContainerRegistry "img" .Values.global.images.registry_init) }}"
{{- if .Values.initContainers.securityContext }}
securityContext:
{{- include "tplValue" ( dict "value" .Values.initContainers.securityContext "context" . ) | nindent 12 }}
Expand Down
16 changes: 10 additions & 6 deletions config/serverless/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ global:
name: "function-build-init"
version: "main"
directory: "prod"
registry_init: # https://github.com/kyma-project/docker-registry/tree/main/components/registry-init
name: "registry-init"
version: "v20240506-57d31b1d"
directory: "prod"
function_runtime_nodejs18:
name: "function-runtime-nodejs18"
version: "main"
Expand All @@ -99,13 +103,13 @@ global:
version: "main"
directory: "prod"
kaniko_executor:
name: "tpi/kaniko-executor"
version: "1.9.2-ea54c1c7"
directory: "prod"
name: "gcr.io/kaniko-project/executor"
version: "v1.23.2"
directory: "prod/external"
registry:
name: "tpi/registry"
version: "2.8.1-1ae4c190"
directory: "prod"
name: "registry"
version: "2.8.3"
directory: "prod/external"
serverlessPriorityClassValue: 2000000
serverlessPriorityClassName: "serverless-priority"
images:
Expand Down
5 changes: 3 additions & 2 deletions sec-scanners-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ protecode:
- europe-docker.pkg.dev/kyma-project/prod/function-runtime-nodejs20:main
- europe-docker.pkg.dev/kyma-project/prod/function-runtime-python39:main
- europe-docker.pkg.dev/kyma-project/prod/function-runtime-python312:main
- europe-docker.pkg.dev/kyma-project/prod/tpi/kaniko-executor:1.9.2-ea54c1c7
- europe-docker.pkg.dev/kyma-project/prod/tpi/registry:2.8.1-1ae4c190
- europe-docker.pkg.dev/kyma-project/prod/external/gcr.io/kaniko-project/executor:v1.23.2
- europe-docker.pkg.dev/kyma-project/prod/external/registry:2.8.3
- europe-docker.pkg.dev/kyma-project/prod/registry-init:v20240506-57d31b1d
whitesource:
language: golang-mod
subprojects: false
Expand Down
2 changes: 1 addition & 1 deletion tests/gitserver/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.20
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/alpine:3.20.1

RUN apk add --no-cache git-daemon && \
# apache2 and apache2-utils need to be in version smaller or equal to 2.4.58-r0
Expand Down
Loading