Skip to content
Open
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
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.49.0-SNAPSHOT
7.50.0
4 changes: 2 additions & 2 deletions build/dockerfiles/rhel.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

# Builder: check meta.yamls and create index.json
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/nodejs-16-minimal
FROM registry.access.redhat.com/ubi8/nodejs-16-minimal:1-43 as builder
FROM registry.access.redhat.com/ubi8/nodejs-16-minimal:1-43.1655287181 as builder
USER 0

#################
Expand Down Expand Up @@ -59,7 +59,7 @@ RUN chmod -R g+rwX /build/devfiles

# Build registry, copying meta.yamls and index.json from builder
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/httpd-24
FROM registry.access.redhat.com/ubi8/httpd-24:1-193 AS registry
FROM registry.access.redhat.com/ubi8/httpd-24:1-193.1655143355 AS registry
USER 0

# latest httpd container doesn't include ssl cert, so generate one
Expand Down
21 changes: 19 additions & 2 deletions deploy/kubernetes/che-devfile-registry/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@
# SPDX-License-Identifier: EPL-2.0
#

{{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: che-devfile-registry
Expand All @@ -25,9 +31,20 @@ spec:
http:
paths:
- path: /
{{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: ImplementationSpecific
{{- else -}}
{{- end }}
backend:
serviceName: che-devfile-registry
servicePort: 8080
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
name: che-devfile-registry
port:
number: 8080
{{- else }}
serviceName: che-devfile-registry
servicePort: 8080
{{- end }}
{{- if .Values.cheDevfileRegistryIngressSecretName }}
tls:
- hosts:
Expand Down
2 changes: 1 addition & 1 deletion devfiles/go/devfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ components:
-
type: dockerimage
# this version is used in the plugin
image: quay.io/eclipse/che-golang-1.17:e2a12fe
image: quay.io/eclipse/che-golang-1.17:f052ee4
alias: go-cli
env:
- name: GOPATH
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/golang-1.17/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

ARG BASE_IMAGE="docker.io/golang:1.17-stretch"

FROM docker.io/golang@sha256:2401153d4efc3dd9dad5649564216520e32cd7a5648aac703e8091c5a7140300
FROM docker.io/golang@sha256:9a127d78ef8b3c51ca438ade0840a6af891a3cc502bebf11a7bf432bcda5cefa

#{INCLUDE:../base.dockerfile}