Skip to content

Commit 819ff15

Browse files
authored
chore: update to oci references (#37)
1 parent 2d3d7dd commit 819ff15

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

.scripts/get_manifest_digest.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env bash
22

33
# Get a manifest digest. Example inputs:
4-
# - docker.stackable.tech/stackable/hello-world:0.0.1-SNAPSHOT-stackable0.0.0-dev
5-
# - docker.stackable.tech/stackable/hello-world:0.0.1-SNAPSHOT-stackable0.0.0-dev-amd64
4+
# - oci.stackable.tech/sdp/hello-world:0.0.1-SNAPSHOT-stackable0.0.0-dev
5+
# - oci.stackable.tech/sdp/hello-world:0.0.1-SNAPSHOT-stackable0.0.0-dev-amd64
66
set -euo pipefail
77

88
# Note: `docker manifest push` currently outputs the same hash, but `manifest`

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ particular step in a workflow.
77

88
| Name | Example |
99
| ---------------------------------- | ---------------------------------------------------------------------- |
10-
| Image Registry | `docker.stackable.tech` |
10+
| Image Registry | `oci.stackable.tech` |
1111
| Image Repository | `stackable/kafka` |
1212
| Image Index Manifest Tag | `3.4.1-stackable0.0.0-dev` |
1313
| Image Manifest Tag | `3.4.1-stackable0.0.0-dev-amd64` |
14-
| Image Repository URI | `docker.stackable.tech/stackable/kafka` |
15-
| Image Index URI (if multi-arch) | `docker.stackable.tech/stackable/kafka:3.4.1-stackable0.0.0-dev` |
16-
| Image Manifest URI (if multi-arch) | `docker.stackable.tech/stackable/kafka:3.4.1-stackable0.0.0-dev-amd64` |
17-
| Image Repo Digest | `docker.stackable.tech/stackable/kafka@sha256:917f800259ef4915f976...` |
14+
| Image Repository URI | `oci.stackable.tech/sdp/kafka` |
15+
| Image Index URI (if multi-arch) | `oci.stackable.tech/sdp/kafka:3.4.1-stackable0.0.0-dev` |
16+
| Image Manifest URI (if multi-arch) | `oci.stackable.tech/sdp/kafka:3.4.1-stackable0.0.0-dev-amd64` |
17+
| Image Repo Digest | `oci.stackable.tech/sdp/kafka@sha256:917f800259ef4915f976...` |
1818
| Digest | `sha256:917f800259ef4915f976e93987b752fd64debf347568610d7f685d2022...` |
1919

2020
## Available Actions

build-product-image/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This action builds a *single* container image using `bake`. It does the followin
1616

1717
1. Free disk space to avoid running out of disk space during larger builds.
1818
2. Build the image using `bake` which internally uses `docker buildx`.
19-
3. Temporarily retag the image to use `localhost` instead of `docker.stackable.tech/stackable`.
19+
3. Temporarily retag the image to use `localhost` instead of `oci.stackable.tech/sdp`.
2020
4. Produce output values to be used in later steps.
2121

2222
This action is considered to be the **single** source of truth regarding image index tag and image
@@ -25,7 +25,7 @@ manifest tag. All subsequent tasks must use these values to ensure consistency.
2525
Currently, bake provides the following ouput in the `bake-target-tags` file:
2626

2727
```plain
28-
docker.stackable.tech/stackable/kafka:3.4.1-stackable0.0.0-dev-amd64
28+
oci.stackable.tech/sdp/kafka:3.4.1-stackable0.0.0-dev-amd64
2929
```
3030

3131
Until bake supports the ability to specify the registry, this action will retag the image as:
@@ -43,7 +43,7 @@ localhost/kafka:3.4.1-stackable0.0.0-dev-amd64
4343

4444
- `product-name` (eg: `kafka`)
4545
- `product-version` (eg: `3.4.1`)
46-
- `image-tools-version` (eg: `0.0.13`)
46+
- `image-tools-version` (eg: `0.0.14`)
4747
- `bake-config-file` (defaults to `./conf.py`)
4848
- `sdp-version` (defaults to: `0.0.0-dev`)
4949
- `extra-tag-data` (optional, eg. `pr321`)

build-product-image/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ inputs:
1010
required: true
1111
image-tools-version:
1212
description: The Stackable image-tools version
13-
default: 0.0.13
13+
default: 0.0.14
1414
bake-config-file:
1515
description: Path to the bake config file, defaults to `./conf.py`
1616
default: ./conf.py
@@ -89,12 +89,12 @@ runs:
8989
run: |
9090
set -euo pipefail
9191
92-
# Extract the image uri and replace 'docker.stackable.tech/stackable'
92+
# Extract the image uri and replace 'oci.stackable.tech/sdp'
9393
# with 'localhost' until bake does the right thing
9494
OLD_IMAGE_URI="$(< bake-target-tags)"
9595
9696
# Replace the image uri in the bake file
97-
sed -i -e 's/docker\.stackable\.tech\/stackable/localhost/' bake-target-tags
97+
sed -i -e 's/oci\.stackable\.tech\/sdp/localhost/' bake-target-tags
9898
9999
# Finally, re-tag image
100100
docker tag "$OLD_IMAGE_URI" "$(< bake-target-tags)"

publish-index-manifest/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ runs:
6060
set -euo pipefail
6161
6262
# Construct the image index uri, which for example contains:
63-
# docker.stackable.tech/stackable/kafka:3.4.1-stackable0.0.0-dev
63+
# oci.stackable.tech/sdp/kafka:3.4.1-stackable0.0.0-dev
6464
IMAGE_INDEX_URI="$REGISTRY_URI/$IMAGE_REPOSITORY:$IMAGE_INDEX_MANIFEST_TAG"
6565
echo "IMAGE_INDEX_URI=$IMAGE_INDEX_URI" | tee -a "$GITHUB_ENV"
6666
@@ -100,7 +100,7 @@ runs:
100100
DIGEST=$("$GITHUB_ACTION_PATH/../.scripts/get_manifest_digest.sh" "$IMAGE_INDEX_URI")
101101
102102
# Construct the image repo digest, which for example contains:
103-
# docker.stackable.tech/stackable/kafka@sha256:91...
103+
# oci.stackable.tech/sdp/kafka@sha256:91...
104104
IMAGE_REPO_DIGEST="$REGISTRY_URI/$IMAGE_REPOSITORY@$DIGEST"
105105
106106
# This generates a signature and publishes it to the registry, next to

tools/interu/fixtures/test-definition.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ dimensions:
77
- 2.9.3
88
- 2.10.2
99
# To use a custom image, add a comma and the full name after the product version
10-
# - 2.8.1,docker.stackable.tech/sandbox/airflow:2.8.1-stackable0.0.0-dev
10+
# - 2.8.1,oci.stackable.tech/sandbox/airflow:2.8.1-stackable0.0.0-dev
1111
- name: airflow-latest
1212
values:
1313
- 2.10.2
1414
# To use a custom image, add a comma and the full name after the product version
15-
# - 2.8.1,docker.stackable.tech/sandbox/airflow:2.8.1-stackable0.0.0-dev
15+
# - 2.8.1,oci.stackable.tech/sandbox/airflow:2.8.1-stackable0.0.0-dev
1616
- name: ldap-authentication
1717
values:
1818
- no-tls

0 commit comments

Comments
 (0)