Skip to content
This repository has been archived by the owner on Jul 28, 2023. It is now read-only.

update default build to base off of UBI images #8

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ REPOSITORY=$(firstword $(subst :, ,${IMAGE}))
.PHONY: build build-image push-image

build:
./build/scripts/pull_devfile.sh $(TRAVIS_TAG)
./build/scripts/pull_devfile.sh 0.14.1

build-image:
./build.sh
./build.sh --rhel

push-image:
ifneq "$(IMAGE)" "kabanero/che-devfile-registry:nightly"
Expand Down
4 changes: 2 additions & 2 deletions build/dockerfiles/rhel.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

# Builder: check meta.yamls and create index.json
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal
FROM registry.access.redhat.com/ubi8-minimal:8.1-279 as builder
FROM registry.access.redhat.com/ubi8-minimal:8.3-201 as builder
USER 0

#################
Expand Down Expand Up @@ -69,7 +69,7 @@ RUN chmod -R g+rwX /build/devfiles
# Build registry, copying meta.yamls and index.json from builder
# UPSTREAM: use RHEL7/RHSCL/httpd image so we're not required to authenticate with registry.redhat.io
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/rhscl/httpd-24-rhel7
FROM registry.access.redhat.com/rhscl/httpd-24-rhel7:2.4-105 AS registry
FROM registry.access.redhat.com/rhscl/httpd-24-rhel7:2.4-122 AS registry

# DOWNSTREAM: use RHEL8/httpd
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/rhel8/httpd-24
Expand Down