Skip to content
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
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/update-base-java.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ pip install image-tools-stackabletech==0.0.13
# Test a product image can build, eg: ZooKeeper
bake --product zookeeper=x.y.z # where x.y.z is a valid product version using the newly added Java version

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

# Change directory into one of the operator repositories (eg: zookeeper-operator) and update the
# product version in tests/test-definition.yaml
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/update-base-vector.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ pip install image-tools-stackabletech==0.0.13

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

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

# Change directory into one of the operator repositories and update the
# product version in tests/test-definition.yaml
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/update-product-airflow.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ pip install image-tools-stackabletech==0.0.13

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

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

# Change directory into the airflow-operator repository and update the
# product version in tests/test-definition.yaml
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/update-product-druid.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ pip install image-tools-stackabletech==0.0.13

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

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

# Change directory into the druid-operator repository and update the
# product version in tests/test-definition.yaml
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/update-product-hbase-phoenix-omid.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ pip install image-tools-stackabletech==0.0.13
bake --product hbase=x.y.z # where x.y.z is the new version added in this PR
bake --product omid=x.y.z # where x.y.z is the new version added in this PR

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

# Change directory into the hbase-operator repository and update the
# product version in tests/test-definition.yaml
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/update-product-hdfs.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ pip install image-tools-stackabletech==0.0.13

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

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

# Change directory into the hdfs-operator repository and update the
# product version in tests/test-definition.yaml
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/update-product-hive.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ pip install image-tools-stackabletech==0.0.13

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

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

# Change directory into the hive-operator repository and update the
# product version in tests/test-definition.yaml
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/update-product-kafka.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ pip install image-tools-stackabletech==0.0.13
bake --product kafka=x.y.z # where x.y.z is the new version added in this PR
bake --product kafka-testing-tools=1.0.0 # This version doesn't change

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

# Change directory into the kafka-operator repository and update the
# product version in tests/test-definition.yaml
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/update-product-nifi.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ pip install image-tools-stackabletech==0.0.13

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

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

# Change directory into the nifi-operator repository and update the
# product version in tests/test-definition.yaml
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/update-product-opa.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ pip install image-tools-stackabletech==0.0.13

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

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

# Change directory into the opa-operator repository and update the
# product version in tests/test-definition.yaml
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/update-product-spark.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ pip install image-tools-stackabletech==0.0.13

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

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

# Change directory into the spark-k8s-operator repository and update the
# product version in tests/test-definition.yaml
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/update-product-superset.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ pip install image-tools-stackabletech==0.0.13

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

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

# Change directory into the superset-operator repository and update the
# product version in tests/test-definition.yaml
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/update-product-trino.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ pip install image-tools-stackabletech==0.0.13
bake --product trino=x.y.z # where x.y.z is the new version added in this PR
bake --product trino-cli=x.y.z # where x.y.z is the new version added in this PR

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

# Change directory into the trino-operator repository and update the
# product version in tests/test-definition.yaml
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/update-product-zookeeper.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ pip install image-tools-stackabletech==0.0.13

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

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

# Change directory into the zookeeper-operator repository and update the
# product version in tests/test-definition.yaml
Expand Down
15 changes: 12 additions & 3 deletions .github/workflows/preflight.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,12 @@ on:
registry:
description: 'Image repository.'
required: true
default: 'docker.stackable.tech'
default: 'oci.stackable.tech'
type: string
organization:
description: 'Organization name within the given registry'
required: true
default: 'sdp'
type: string
jobs:
preflight:
Expand Down Expand Up @@ -84,12 +89,14 @@ jobs:
if: ${{ inputs.submit == true }}
env:
REGISTRY: ${{ inputs.registry }}
IMAGE_VERSION: ${{inputs.tag }}
ORGANIZATION: ${{ inputs.organization }}
IMAGE_VERSION: ${{ inputs.tag }}
run: |
ARCH_FOR_PREFLIGHT="$(arch | sed -e 's#x86_64#amd64#' | sed -e 's#aarch64#arm64#')"
check-container --product "${{ matrix.product }}" \
--image-version "$IMAGE_VERSION" \
--registry "$REGISTRY" \
--organization "$ORGANIZATION" \
--architecture "linux/${ARCH_FOR_PREFLIGHT}" \
--executable ./preflight-linux-amd64 \
--token "${{ secrets.RH_PYXIS_API_TOKEN }}" \
Expand All @@ -98,12 +105,14 @@ jobs:
if: ${{ inputs.submit == false }}
env:
REGISTRY: ${{ inputs.registry }}
IMAGE_VERSION: ${{inputs.tag }}
ORGANIZATION: ${{ inputs.organization }}
IMAGE_VERSION: ${{ inputs.tag }}
run: |
ARCH_FOR_PREFLIGHT="$(arch | sed -e 's#x86_64#amd64#' | sed -e 's#aarch64#arm64#')"
check-container --product "${{ matrix.product }}" \
--image-version "$IMAGE_VERSION" \
--registry "$REGISTRY" \
--organization "$ORGANIZATION" \
--architecture "linux/${ARCH_FOR_PREFLIGHT}" \
--executable ./preflight-linux-amd64 \
--token "${{ secrets.RH_PYXIS_API_TOKEN }}" \
Expand Down
8 changes: 4 additions & 4 deletions .scripts/update_feature_tracker_db.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ product_image_digest() {
#
# Params:
#
# IMAGE_NAME - Example: docker.stackable.tech/stackable/zookeeper:3.8.3-stackable23.11.0
# IMAGE_NAME - Example: oci.stackable.tech/sdp/zookeeper:3.8.3-stackable23.11.0
#
IMAGE_NAME="$1"

Expand Down Expand Up @@ -123,7 +123,7 @@ update_release_components() {
#
# RELEASE_VERSION - Example: 23.11.0
# PRODUCT_VERSION_ID - Example: 38. See ensure_product_version() above.
# REPOSITORY_NAME - Example: docker.stackable.tech/stackable/zookeeper
# REPOSITORY_NAME - Example: oci.stackable.tech/sdp/zookeeper
# IMAGE_DIGEST - Example: sha256:822d427031bf93055c51f4dc3bcaa468867ce83f59de6824af279df4cce2d066

local RELEASE_VERSION="$1"
Expand Down Expand Up @@ -170,8 +170,8 @@ main() {
local RELEASE_NAME="${1:-}"
local RELEASE_VERSION="${2:-}"

local REGISTRY=docker.stackable.tech # REGISTRY=oci.stackable.tech
local REGISTRY_PATH=stackable # REGISTRY_PATH=sdp
local REGISTRY=oci.stackable.tech
local REGISTRY_PATH=sdp

if [ -z "$RELEASE_NAME" ]; then
echo "Release name cannot be empty."
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ All notable changes to this project will be documented in this file.
### Changed

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

### Removed

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

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ This repository contains Dockerfiles and scripts to build base images for use wi

## Build Product Images

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

### Build single products locally

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

```dockerfile
FROM docker.stackable.tech/ubi9-rust-builder AS builder
FROM oci.stackable.tech/ubi9-rust-builder AS builder

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