Skip to content

Commit

Permalink
ubi9: update the reference as done with the ironbank (#11927)
Browse files Browse the repository at this point in the history
  • Loading branch information
v1v authored Oct 24, 2023
1 parent 5584a8a commit cde4794
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions packaging.mk
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ DOCKER_BUILD_ARGS := \
DOCKER_IMAGES := \
build/docker/apm-server-$(APM_SERVER_VERSION).txt \
build/docker/apm-server-$(APM_SERVER_VERSION)-SNAPSHOT.txt \
build/docker/apm-server-ubi8-$(APM_SERVER_VERSION).txt \
build/docker/apm-server-ubi8-$(APM_SERVER_VERSION)-SNAPSHOT.txt
build/docker/apm-server-ubi9-$(APM_SERVER_VERSION).txt \
build/docker/apm-server-ubi9-$(APM_SERVER_VERSION)-SNAPSHOT.txt

build/docker/%.txt: DOCKER_IMAGE_TAG := docker.elastic.co/apm/apm-server:%
build/docker/%.txt: VERSION := $(APM_SERVER_VERSION)
build/docker/%-SNAPSHOT.txt: VERSION := $(APM_SERVER_VERSION)-SNAPSHOT
build/docker/apm-server-ubi8-%.txt: DOCKER_BUILD_ARGS+=--build-arg BASE_IMAGE=docker.elastic.co/ubi8/ubi-minimal
build/docker/apm-server-ubi9-%.txt: DOCKER_BUILD_ARGS+=--build-arg BASE_IMAGE=docker.elastic.co/ubi9/ubi-minimal

.PHONY: $(DOCKER_IMAGES)
$(DOCKER_IMAGES):
Expand All @@ -43,7 +43,7 @@ $(DOCKER_IMAGES):

# Docker image tarballs. We distribute UBI8 Docker images only for AMD64.
DOCKER_IMAGE_SUFFIX := docker-image$(if $(findstring arm64,$(GOARCH)),-arm64).tar.gz
DOCKER_IMAGE_PREFIXES := apm-server $(if $(findstring amd64,$(GOARCH)), apm-server-ubi8)
DOCKER_IMAGE_PREFIXES := apm-server $(if $(findstring amd64,$(GOARCH)), apm-server-ubi9)
DOCKER_IMAGE_RELEASE_TARBALLS := $(patsubst %, $(DISTDIR)/%-$(APM_SERVER_VERSION)-$(DOCKER_IMAGE_SUFFIX), $(DOCKER_IMAGE_PREFIXES))
DOCKER_IMAGE_SNAPSHOT_TARBALLS := $(patsubst %, $(DISTDIR)/%-$(APM_SERVER_VERSION)-SNAPSHOT-$(DOCKER_IMAGE_SUFFIX), $(DOCKER_IMAGE_PREFIXES))

Expand Down
2 changes: 1 addition & 1 deletion tools/notice/dependencies.csv.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
{{- end -}}

name,url,version,revision,license,sourceURL{{ template "depInfo" .Direct }}{{ template "depInfo" .Indirect }}
Red Hat Universal Base Image minimal,https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,8,,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz
Red Hat Universal Base Image minimal,https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5,9,,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz

0 comments on commit cde4794

Please sign in to comment.