Skip to content

Commit ff3038f

Browse files
xeniapexeniape
authored
chore: update to oci references (#989)
* chore: update to oci references * add changelog entry * Add organization to preflight inputs * update changelog
1 parent 53da3b0 commit ff3038f

18 files changed

+37
-26
lines changed

‎.github/ISSUE_TEMPLATE/update-base-java.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ pip install image-tools-stackabletech==0.0.13
6969
# Test a product image can build, eg: ZooKeeper
7070
bake --product zookeeper=x.y.z # where x.y.z is a valid product version using the newly added Java version
7171

72-
kind load docker-image docker.stackable.tech/stackable/zookeeper:x.y.z-stackable0.0.0-dev
72+
kind load docker-image oci.stackable.tech/sdp/zookeeper:x.y.z-stackable0.0.0-dev
7373

7474
# Change directory into one of the operator repositories (eg: zookeeper-operator) and update the
7575
# product version in tests/test-definition.yaml

‎.github/ISSUE_TEMPLATE/update-base-vector.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ pip install image-tools-stackabletech==0.0.13
7575

7676
bake --product vector=x.y.z # where x.y.z is the new version added in this PR
7777

78-
kind load docker-image docker.stackable.tech/stackable/vector:x.y.z-stackable0.0.0-dev
78+
kind load docker-image oci.stackable.tech/sdp/vector:x.y.z-stackable0.0.0-dev
7979

8080
# Change directory into one of the operator repositories and update the
8181
# product version in tests/test-definition.yaml

‎.github/ISSUE_TEMPLATE/update-product-airflow.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ pip install image-tools-stackabletech==0.0.13
6767

6868
bake --product airflow=x.y.z # where x.y.z is the new version added in this PR
6969

70-
kind load docker-image docker.stackable.tech/stackable/airflow:x.y.z-stackable0.0.0-dev
70+
kind load docker-image oci.stackable.tech/sdp/airflow:x.y.z-stackable0.0.0-dev
7171

7272
# Change directory into the airflow-operator repository and update the
7373
# product version in tests/test-definition.yaml

‎.github/ISSUE_TEMPLATE/update-product-druid.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ pip install image-tools-stackabletech==0.0.13
7171

7272
bake --product druid=x.y.z # where x.y.z is the new version added in this PR
7373

74-
kind load docker-image docker.stackable.tech/stackable/druid:x.y.z-stackable0.0.0-dev
74+
kind load docker-image oci.stackable.tech/sdp/druid:x.y.z-stackable0.0.0-dev
7575

7676
# Change directory into the druid-operator repository and update the
7777
# product version in tests/test-definition.yaml

‎.github/ISSUE_TEMPLATE/update-product-hbase-phoenix-omid.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ pip install image-tools-stackabletech==0.0.13
7676
bake --product hbase=x.y.z # where x.y.z is the new version added in this PR
7777
bake --product omid=x.y.z # where x.y.z is the new version added in this PR
7878

79-
kind load docker-image docker.stackable.tech/stackable/hbase:x.y.z-stackable0.0.0-dev
80-
kind load docker-image docker.stackable.tech/stackable/omid:x.y.z-stackable0.0.0-dev
79+
kind load docker-image oci.stackable.tech/sdp/hbase:x.y.z-stackable0.0.0-dev
80+
kind load docker-image oci.stackable.tech/sdp/omid:x.y.z-stackable0.0.0-dev
8181

8282
# Change directory into the hbase-operator repository and update the
8383
# product version in tests/test-definition.yaml

‎.github/ISSUE_TEMPLATE/update-product-hdfs.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ pip install image-tools-stackabletech==0.0.13
6969

7070
bake --product hadoop=x.y.z # where x.y.z is the new version added in this PR
7171

72-
kind load docker-image docker.stackable.tech/stackable/hadoop:x.y.z-stackable0.0.0-dev
72+
kind load docker-image oci.stackable.tech/sdp/hadoop:x.y.z-stackable0.0.0-dev
7373

7474
# Change directory into the hdfs-operator repository and update the
7575
# product version in tests/test-definition.yaml

‎.github/ISSUE_TEMPLATE/update-product-hive.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pip install image-tools-stackabletech==0.0.13
6868

6969
bake --product hive=x.y.z # where x.y.z is the new version added in this PR
7070

71-
kind load docker-image docker.stackable.tech/stackable/hive:x.y.z-stackable0.0.0-dev
71+
kind load docker-image oci.stackable.tech/sdp/hive:x.y.z-stackable0.0.0-dev
7272

7373
# Change directory into the hive-operator repository and update the
7474
# product version in tests/test-definition.yaml

‎.github/ISSUE_TEMPLATE/update-product-kafka.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ pip install image-tools-stackabletech==0.0.13
8080
bake --product kafka=x.y.z # where x.y.z is the new version added in this PR
8181
bake --product kafka-testing-tools=1.0.0 # This version doesn't change
8282

83-
kind load docker-image docker.stackable.tech/stackable/kafka:x.y.z-stackable0.0.0-dev
84-
kind load docker-image docker.stackable.tech/stackable/kafka-testing-tools:1.0.0-stackable0.0.0-dev
83+
kind load docker-image oci.stackable.tech/sdp/kafka:x.y.z-stackable0.0.0-dev
84+
kind load docker-image oci.stackable.tech/sdp/kafka-testing-tools:1.0.0-stackable0.0.0-dev
8585

8686
# Change directory into the kafka-operator repository and update the
8787
# product version in tests/test-definition.yaml

‎.github/ISSUE_TEMPLATE/update-product-nifi.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pip install image-tools-stackabletech==0.0.13
6868

6969
bake --product nifi=x.y.z # where x.y.z is the new version added in this PR
7070

71-
kind load docker-image docker.stackable.tech/stackable/nifi:x.y.z-stackable0.0.0-dev
71+
kind load docker-image oci.stackable.tech/sdp/nifi:x.y.z-stackable0.0.0-dev
7272

7373
# Change directory into the nifi-operator repository and update the
7474
# product version in tests/test-definition.yaml

‎.github/ISSUE_TEMPLATE/update-product-opa.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ pip install image-tools-stackabletech==0.0.13
6767

6868
bake --product opa=x.y.z # where x.y.z is the new version added in this PR
6969

70-
kind load docker-image docker.stackable.tech/stackable/opa:x.y.z-stackable0.0.0-dev
70+
kind load docker-image oci.stackable.tech/sdp/opa:x.y.z-stackable0.0.0-dev
7171

7272
# Change directory into the opa-operator repository and update the
7373
# product version in tests/test-definition.yaml

‎.github/ISSUE_TEMPLATE/update-product-spark.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ pip install image-tools-stackabletech==0.0.13
6969

7070
bake --product spark-k8s=x.y.z # where x.y.z is the new version added in this PR
7171

72-
kind load docker-image docker.stackable.tech/stackable/spark-k8s:x.y.z-stackable0.0.0-dev
72+
kind load docker-image oci.stackable.tech/sdp/spark-k8s:x.y.z-stackable0.0.0-dev
7373

7474
# Change directory into the spark-k8s-operator repository and update the
7575
# product version in tests/test-definition.yaml

‎.github/ISSUE_TEMPLATE/update-product-superset.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ pip install image-tools-stackabletech==0.0.13
6969

7070
bake --product superset=x.y.z # where x.y.z is the new version added in this PR
7171

72-
kind load docker-image docker.stackable.tech/stackable/superset:x.y.z-stackable0.0.0-dev
72+
kind load docker-image oci.stackable.tech/sdp/superset:x.y.z-stackable0.0.0-dev
7373

7474
# Change directory into the superset-operator repository and update the
7575
# product version in tests/test-definition.yaml

‎.github/ISSUE_TEMPLATE/update-product-trino.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ pip install image-tools-stackabletech==0.0.13
7878
bake --product trino=x.y.z # where x.y.z is the new version added in this PR
7979
bake --product trino-cli=x.y.z # where x.y.z is the new version added in this PR
8080

81-
kind load docker-image docker.stackable.tech/stackable/trino:x.y.z-stackable0.0.0-dev
82-
kind load docker-image docker.stackable.tech/stackable/trino-cli:x.y.z-stackable0.0.0-dev
81+
kind load docker-image oci.stackable.tech/sdp/trino:x.y.z-stackable0.0.0-dev
82+
kind load docker-image oci.stackable.tech/sdp/trino-cli:x.y.z-stackable0.0.0-dev
8383

8484
# Change directory into the trino-operator repository and update the
8585
# product version in tests/test-definition.yaml

‎.github/ISSUE_TEMPLATE/update-product-zookeeper.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pip install image-tools-stackabletech==0.0.13
6868

6969
bake --product zookeeper=x.y.z # where x.y.z is the new version added in this PR
7070

71-
kind load docker-image docker.stackable.tech/stackable/zookeeper:x.y.z-stackable0.0.0-dev
71+
kind load docker-image oci.stackable.tech/sdp/zookeeper:x.y.z-stackable0.0.0-dev
7272

7373
# Change directory into the zookeeper-operator repository and update the
7474
# product version in tests/test-definition.yaml

‎.github/workflows/preflight.yaml

+12-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,12 @@ on:
3434
registry:
3535
description: 'Image repository.'
3636
required: true
37-
default: 'docker.stackable.tech'
37+
default: 'oci.stackable.tech'
38+
type: string
39+
organization:
40+
description: 'Organization name within the given registry'
41+
required: true
42+
default: 'sdp'
3843
type: string
3944
jobs:
4045
preflight:
@@ -84,12 +89,14 @@ jobs:
8489
if: ${{ inputs.submit == true }}
8590
env:
8691
REGISTRY: ${{ inputs.registry }}
87-
IMAGE_VERSION: ${{inputs.tag }}
92+
ORGANIZATION: ${{ inputs.organization }}
93+
IMAGE_VERSION: ${{ inputs.tag }}
8894
run: |
8995
ARCH_FOR_PREFLIGHT="$(arch | sed -e 's#x86_64#amd64#' | sed -e 's#aarch64#arm64#')"
9096
check-container --product "${{ matrix.product }}" \
9197
--image-version "$IMAGE_VERSION" \
9298
--registry "$REGISTRY" \
99+
--organization "$ORGANIZATION" \
93100
--architecture "linux/${ARCH_FOR_PREFLIGHT}" \
94101
--executable ./preflight-linux-amd64 \
95102
--token "${{ secrets.RH_PYXIS_API_TOKEN }}" \
@@ -98,12 +105,14 @@ jobs:
98105
if: ${{ inputs.submit == false }}
99106
env:
100107
REGISTRY: ${{ inputs.registry }}
101-
IMAGE_VERSION: ${{inputs.tag }}
108+
ORGANIZATION: ${{ inputs.organization }}
109+
IMAGE_VERSION: ${{ inputs.tag }}
102110
run: |
103111
ARCH_FOR_PREFLIGHT="$(arch | sed -e 's#x86_64#amd64#' | sed -e 's#aarch64#arm64#')"
104112
check-container --product "${{ matrix.product }}" \
105113
--image-version "$IMAGE_VERSION" \
106114
--registry "$REGISTRY" \
115+
--organization "$ORGANIZATION" \
107116
--architecture "linux/${ARCH_FOR_PREFLIGHT}" \
108117
--executable ./preflight-linux-amd64 \
109118
--token "${{ secrets.RH_PYXIS_API_TOKEN }}" \

‎.scripts/update_feature_tracker_db.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ product_image_digest() {
4646
#
4747
# Params:
4848
#
49-
# IMAGE_NAME - Example: docker.stackable.tech/stackable/zookeeper:3.8.3-stackable23.11.0
49+
# IMAGE_NAME - Example: oci.stackable.tech/sdp/zookeeper:3.8.3-stackable23.11.0
5050
#
5151
IMAGE_NAME="$1"
5252

@@ -123,7 +123,7 @@ update_release_components() {
123123
#
124124
# RELEASE_VERSION - Example: 23.11.0
125125
# PRODUCT_VERSION_ID - Example: 38. See ensure_product_version() above.
126-
# REPOSITORY_NAME - Example: docker.stackable.tech/stackable/zookeeper
126+
# REPOSITORY_NAME - Example: oci.stackable.tech/sdp/zookeeper
127127
# IMAGE_DIGEST - Example: sha256:822d427031bf93055c51f4dc3bcaa468867ce83f59de6824af279df4cce2d066
128128

129129
local RELEASE_VERSION="$1"
@@ -170,8 +170,8 @@ main() {
170170
local RELEASE_NAME="${1:-}"
171171
local RELEASE_VERSION="${2:-}"
172172

173-
local REGISTRY=docker.stackable.tech # REGISTRY=oci.stackable.tech
174-
local REGISTRY_PATH=stackable # REGISTRY_PATH=sdp
173+
local REGISTRY=oci.stackable.tech
174+
local REGISTRY_PATH=sdp
175175

176176
if [ -z "$RELEASE_NAME" ]; then
177177
echo "Release name cannot be empty."

‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ All notable changes to this project will be documented in this file.
2121
### Changed
2222

2323
- kafka: Bump 3.7.1 to 3.7.2 ([#968]).
24+
- Update registry references to oci ([#989]).
2425

2526
### Removed
2627

@@ -44,6 +45,7 @@ All notable changes to this project will be documented in this file.
4445
[#980]: https://github.com/stackabletech/docker-images/pull/980
4546
[#981]: https://github.com/stackabletech/docker-images/pull/981
4647
[#982]: https://github.com/stackabletech/docker-images/pull/982
48+
[#989]: https://github.com/stackabletech/docker-images/pull/989
4749
[#990]: https://github.com/stackabletech/docker-images/pull/990
4850
[#988]: https://github.com/stackabletech/docker-images/pull/988
4951

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This repository contains Dockerfiles and scripts to build base images for use wi
2121

2222
## Build Product Images
2323

24-
Product images are published to the `docker.stackable.tech` registry under the `stackable` organization by default.
24+
Product images are published to the `oci.stackable.tech` registry under the `sdp` organization by default.
2525

2626
### Build single products locally
2727

@@ -75,7 +75,7 @@ This will bake in the current stable Rust version at the time this image was bui
7575
## Example usage
7676

7777
```dockerfile
78-
FROM docker.stackable.tech/ubi9-rust-builder AS builder
78+
FROM oci.stackable.tech/ubi9-rust-builder AS builder
7979

8080
FROM registry.access.redhat.com/ubi9/ubi-minimal AS operator
8181
LABEL maintainer="Stackable GmbH"

0 commit comments

Comments
 (0)