Skip to content

Commit

Permalink
Rename quay to docker in image bundles (apache#1768)
Browse files Browse the repository at this point in the history
* Rename quay to docker in image bundles

Signed-off-by: Ricardo Zanini <[email protected]>

* Move kogito-swf dir to sonataflow

Signed-off-by: Ricardo Zanini <[email protected]>

* Rename tests from kogito-swf to sonataflow

Signed-off-by: Ricardo Zanini <[email protected]>

* Rename tests from kogito-swf to sonataflow

Signed-off-by: Ricardo Zanini <[email protected]>

* Adding dockerhub correct URL; renaming ImageStream builder's name

Signed-off-by: Ricardo Zanini <[email protected]>

---------

Signed-off-by: Ricardo Zanini <[email protected]>
# Conflicts:
#	.ci/jenkins/dsl/jobs.groovy
  • Loading branch information
rgdoliveira committed Jun 10, 2024
1 parent 791a95d commit dec66df
Show file tree
Hide file tree
Showing 69 changed files with 111 additions and 111 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ endif
# tag with shortened version
ifneq ($(ignore_tag),true)
ifneq ($(findstring rc,$(IMAGE_VERSION)),rc)
${BUILD_ENGINE} tag quay.io/kiegroup/${image_name}:${IMAGE_VERSION} quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}
${BUILD_ENGINE} tag docker.io/apache/incubator-kie-${image_name}:${IMAGE_VERSION} docker.io/apache/incubator-kie-${image_name}:${SHORTENED_LATEST_VERSION}
endif
endif
# if ignore_test is set to true, ignore the tests
ifneq ($(ignore_test),true)
${CEKIT_CMD} --descriptor ${image_name}-image.yaml test behave ${test_options}
tests/shell/run.sh ${image_name} "quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}"
tests/shell/run.sh ${image_name} "docker.io/apache/incubator-kie-${image_name}:${SHORTENED_LATEST_VERSION}"
endif


Expand All @@ -85,11 +85,11 @@ _push:
.PHONY: push-image
image_name=
push-image:
${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push quay.io/kiegroup/${image_name}:${IMAGE_VERSION}
${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push quay.io/kiegroup/${image_name}:latest
${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push docker.io/apache/incubator-kie-${image_name}:${IMAGE_VERSION}
${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push docker.io/apache/incubator-kie-${image_name}:latest
ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
@echo "${SHORTENED_LATEST_VERSION} will be pushed"
${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}
${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push docker.io/apache/incubator-kie-${image_name}:${SHORTENED_LATEST_VERSION}
endif


Expand Down
58 changes: 29 additions & 29 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ The main purpose of this image is to be used within the Kogito Serverless Operat
an example on how to use it:

```bash
FROM quay.io/kiegroup/kogito-swf-builder:latest AS builder
FROM docker.io/apache/incubator-kie-sonataflow-builder:latest AS builder

# Copy all files from current directory to the builder context
COPY * ./resources/
Expand All @@ -143,7 +143,7 @@ If you run the image, it will start an empty [Kogito Serverless Workflow](https:
To run the image for testing your local workflow files, run:

```shell
docker run -it --rm -p 8080:8080 -v <local_workflow_path>:/home/kogito/serverless-workflow-project/src/main/resources/workflows quay.io/kiegroup/kogito-swf-builder:latest
docker run -it --rm -p 8080:8080 -v <local_workflow_path>:/home/kogito/serverless-workflow-project/src/main/resources/workflows docker.io/apache/incubator-kie-sonataflow-builder:latest
```

Replace `<local_workflow_path>` with your local filesystem containing your workflow files. You can test with the [example application](https://kiegroup.github.io/kogito-docs/serverlessworkflow/latest/getting-started/create-your-first-workflow-service.html#proc-creating-workflow).
Expand All @@ -166,12 +166,12 @@ The Kogito Component Images can be considered as lightweight images that will co
by providing extra capabilities, like managing the processes on a web UI or providing persistence layer to the Kogito applications.
Today we have the following Kogito Component Images:

* [quay.io/kiegroup/kogito-data-index-ephemeral](https://quay.io/kiegroup/kogito-data-index-ephemeral)
* [quay.io/kiegroup/kogito-data-index-postgresql](https://quay.io/kiegroup/kogito-data-index-postgresql)
* [quay.io/kiegroup/kogito-jobs-service-ephemeral](https://quay.io/kiegroup/kogito-jobs-service-ephemeral)
* [quay.io/kiegroup/kogito-jobs-service-postgresql](https://quay.io/kiegroup/kogito-jobs-service-postgresql)
* [quay.io/kiegroup/kogito-jobs-service-allinone](https://quay.io/kiegroup/kogito-jobs-service-allinone)
* [quay.io/kiegroup/kogito-jit-runner](https://quay.io/kiegroup/kogito-jit-runner)
* [docker.io/apache/incubator-kie-kogito-data-index-ephemeral](https://hub.docker.com/r/apache/incubator-kie-kogito-data-index-ephemeral)
* [docker.io/apache/incubator-kie-kogito-data-index-postgresql](https://hub.docker.com/r/apache/incubator-kie-kogito-data-index-postgresql)
* [docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral](https://hub.docker.com/r/apache/incubator-kie-kogito-jobs-service-ephemeral)
* [docker.io/apache/incubator-kie-kogito-jobs-service-postgresql](https://hub.docker.com/r/apache/incubator-kie-kogito-jobs-service-postgresql)
* [docker.io/apache/incubator-kie-kogito-jobs-service-allinone](https://hub.docker.com/r/apache/incubator-kie-kogito-jobs-service-allinone)
* [docker.io/apache/incubator-kie-kogito-jit-runner](https://hub.docker.com/r/apache/incubator-kie-kogito-jit-runner)


### Kogito Data Index Component Images
Expand All @@ -181,28 +181,28 @@ For more information please visit this (link)(https://docs.jboss.org/kogito/rele
The Data Index Service depends on a PostgreSQL instance.
The Persistence service can be switched by using its corresponding image

- Ephemeral PostgreSQL: quay.io/kiegroup/kogito-data-index-ephemeral
- Ephemeral PostgreSQL: docker.io/apache/incubator-kie-kogito-data-index-ephemeral
[image.yaml](kogito-data-index-ephemeral-image.yaml)
- PostgreSQL: quay.io/kiegroup/kogito-data-index-postgresql
- PostgreSQL: docker.io/apache/incubator-kie-kogito-data-index-postgresql
[image.yaml](kogito-data-index-postgresql-image.yaml)

Basic usage with Ephemeral PostgreSQL:
```bash
$ docker run -it quay.io/kiegroup/kogito-data-index-ephemeral:latest
$ docker run -it docker.io/apache/incubator-kie-kogito-data-index-ephemeral:latest
```

Basic usage with PostgreSQL:
```bash
$ docker run -it --env QUARKUS_DATASOURCE_JDBC_URL="jdbc:postgresql://localhost:5432/quarkus" \
--env QUARKUS_DATASOURCE_USERNAME="kogito" \
--env QUARKUS_DATASOURCE_PASSWORD="secret" \
quay.io/kiegroup/kogito-data-index-postgresql:latest
docker.io/apache/incubator-kie-kogito-data-index-postgresql:latest
```

To enable debug just use this env while running this image:

```bash
$ docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-data-index-postgresql:latest
$ docker run -it --env SCRIPT_DEBUG=true docker.io/apache/incubator-kie-kogito-data-index-postgresql:latest
```
You should notice a few debug messages present in the system output.

Expand All @@ -226,13 +226,13 @@ Today, the Jobs service contains four images:
Basic usage:

```bash
$ docker run -it quay.io/kiegroup/kogito-jobs-service-ephemeral:latest
$ docker run -it docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral:latest
```

To enable debug on the Jobs Service images, set the ` SCRIPT_DEBUG` to `true`, example:

```bash
docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-jobs-service-postgresql:latest
docker run -it --env SCRIPT_DEBUG=true docker.io/apache/incubator-kie-kogito-jobs-service-postgresql:latest
```

You should notice a few debug messages being printed in the system output.
Expand All @@ -258,13 +258,13 @@ using either environment variables or system properties.

Using environment variables:
```bash
podman run -it -e VARIABLE_NAME=value quay.io/kiegroup/kogito-jobs-service-allinone:latest
podman run -it -e VARIABLE_NAME=value docker.io/apache/incubator-kie-kogito-jobs-service-allinone:latest
```

Using system properties:
```bash
podman run -it -e JAVA_OPTIONS='-Dmy.sys.prop1=value1 -Dmy.sys.prop2=value2' \
quay.io/kiegroup/kogito-jobs-service-allinone:latest
docker.io/apache/incubator-kie-kogito-jobs-service-allinone:latest
```

For convenience there are `container-compose` files that can be used to start the Jobs Service with the desired
Expand All @@ -286,13 +286,13 @@ The Kogito JIT Runner provides a tool that allows you to submit a DMN model and
Basic usage:

```bash
$ docker run -it quay.io/kiegroup/kogito-jit-runner:latest
$ docker run -it docker.io/apache/incubator-kie-kogito-jit-runner:latest
```

To enable debug just use this env while running this image:

```bash
docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-jit-runner:latest
docker run -it --env SCRIPT_DEBUG=true docker.io/apache/incubator-kie-kogito-jit-runner:latest
```
You should notice a few debug messages being printed in the system output. You can then visit `localhost:8080/index.html` to test the service.

Expand Down Expand Up @@ -399,12 +399,12 @@ Below you can find all modules used to build the Kogito Images
For each image, we use a specific *-image.yaml file.
Please inspect the image files to learn which modules are being installed on each image:
- [quay.io/kiegroup/kogito-data-index-ephemeral](kogito-data-index-ephemeral-image.yaml)
- [quay.io/kiegroup/kogito-data-index-postgresql](kogito-data-index-postgresql-image.yaml)
- [quay.io/kiegroup/kogito-jobs-service-ephemeral](kogito-jobs-service-ephemeral-image.yaml)
- [quay.io/kiegroup/kogito-jobs-service-postgresql](kogito-jobs-service-postgresql-image.yaml)
- [quay.io/kiegroup/kogito-jobs-service-allinone](kogito-jobs-service-allinone-image.yaml)
- [quay.io/kiegroup/kogito-jit-runner](kogito-jit-runner-image.yaml)
- [docker.io/apache/incubator-kie-kogito-data-index-ephemeral](kogito-data-index-ephemeral-image.yaml)
- [docker.io/apache/incubator-kie-kogito-data-index-postgresql](kogito-data-index-postgresql-image.yaml)
- [docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral](kogito-jobs-service-ephemeral-image.yaml)
- [docker.io/apache/incubator-kie-kogito-jobs-service-postgresql](kogito-jobs-service-postgresql-image.yaml)
- [docker.io/apache/incubator-kie-kogito-jobs-service-allinone](kogito-jobs-service-allinone-image.yaml)
- [docker.io/apache/incubator-kie-kogito-jit-runner](kogito-jit-runner-image.yaml)
### Testing Images
Expand All @@ -428,12 +428,12 @@ See [Writing Behave Tests](#writing-behave-tests).
Example:
```bash
make build-image image_name=kogito-swf-builder test_options=--wip
make build-image image_name=sonataflow-builder test_options=--wip
```
Or by name:
```bash
make build-image image_name=kogito-swf-builder test_options=--name <Test Scenario Name>
make build-image image_name=sonataflow-builder test_options=--name <Test Scenario Name>
```
You can also add `cekit_option` to the make command, which will be appended to the Cekit command. Default is `cekit -v`.
Expand Down Expand Up @@ -497,12 +497,12 @@ this can be easily done by adding the **@wip** tag on the behave test that you a
All images have already test feature files. If a new image is being created, a new feature file will need to be created
and the very first line of this file would need to contain a tag with the image name.

For example, if we are creating a new image called quay.io/kiegroup/kogito-moon-service, we would have a feature called
For example, if we are creating a new image called docker.io/apache/incubator-kie-kogito-moon-service, we would have a feature called
**kogito-moon-service.feature** under the **tests/features** directory and this file will look like with the following
example:

```text
@quay.io/kiegroup/kogito-data-index-postgresql
@docker.io/apache/incubator-kie-kogito-data-index-postgresql
Feature: Kogito-data-index-postgresql feature.
...
Scenarios......
Expand Down
2 changes: 1 addition & 1 deletion contrib/jobs-service/container-compose-postgresql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ services:
- POSTGRES_PASSWORD=postgres

jobs-service-all-in-one:
image: quay.io/kiegroup/kogito-jobs-service-allinone:latest
image: docker.io/apache/incubator-kie-kogito-jobs-service-allinone:latest
container_name: jobs-service
ports:
- "8080:8080"
Expand Down
2 changes: 1 addition & 1 deletion kogito-base-builder-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#
schema_version: 1

name: "quay.io/kiegroup/kogito-base-builder"
name: "docker.io/apache/incubator-kie-kogito-base-builder"
version: "999-SNAPSHOT"
from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
description: "Image with JDK and Maven, used as a base image. It is used by Web Tools !"
Expand Down
2 changes: 1 addition & 1 deletion kogito-data-index-ephemeral-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#
schema_version: 1

name: "quay.io/kiegroup/kogito-data-index-ephemeral"
name: "docker.io/apache/incubator-kie-kogito-data-index-ephemeral"
version: "999-SNAPSHOT"
from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
description: "Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
Expand Down
2 changes: 1 addition & 1 deletion kogito-data-index-postgresql-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#
schema_version: 1

name: "quay.io/kiegroup/kogito-data-index-postgresql"
name: "docker.io/apache/incubator-kie-kogito-data-index-postgresql"
version: "999-SNAPSHOT"
from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
description: "Runtime image for Kogito Data Index Service for PostgreSQL persistence provider"
Expand Down
18 changes: 9 additions & 9 deletions kogito-imagestream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ items:
- kind: ImageStream
apiVersion: v1
metadata:
name: kogito-swf-builder
name: kie-sonataflow-builder
annotations:
openshift.io/display-name: Kogito Serverless Workflow builder with basic Quarkus SWF extensions preinstalled
openshift.io/provider-display-name: KIE Group.
Expand All @@ -44,7 +44,7 @@ items:
type: Local
from:
kind: DockerImage
name: quay.io/kiegroup/kogito-swf-builder:999-SNAPSHOT
name: docker.io/apache/incubator-kie-sonataflow-builder:999-SNAPSHOT
- kind: ImageStream
apiVersion: v1
metadata:
Expand All @@ -65,7 +65,7 @@ items:
type: Local
from:
kind: DockerImage
name: quay.io/kiegroup/kogito-base-builder:999-SNAPSHOT
name: docker.io/apache/incubator-kie-kogito-base-builder:999-SNAPSHOT
- kind: ImageStream
apiVersion: v1
metadata:
Expand All @@ -86,7 +86,7 @@ items:
type: Local
from:
kind: DockerImage
name: quay.io/kiegroup/kogito-data-index-ephemeral:999-SNAPSHOT
name: docker.io/apache/incubator-kie-kogito-data-index-ephemeral:999-SNAPSHOT
- kind: ImageStream
apiVersion: v1
metadata:
Expand All @@ -107,7 +107,7 @@ items:
type: Local
from:
kind: DockerImage
name: quay.io/kiegroup/kogito-data-index-postgresql:999-SNAPSHOT
name: docker.io/apache/incubator-kie-kogito-data-index-postgresql:999-SNAPSHOT
- kind: ImageStream
apiVersion: v1
metadata:
Expand All @@ -128,7 +128,7 @@ items:
type: Local
from:
kind: DockerImage
name: quay.io/kiegroup/kogito-jit-runner:999-SNAPSHOT
name: docker.io/apache/incubator-kie-kogito-jit-runner:999-SNAPSHOT
- kind: ImageStream
apiVersion: v1
metadata:
Expand All @@ -149,7 +149,7 @@ items:
type: Local
from:
kind: DockerImage
name: quay.io/kiegroup/kogito-jobs-service-ephemeral:999-SNAPSHOT
name: docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral:999-SNAPSHOT
- kind: ImageStream
apiVersion: v1
metadata:
Expand All @@ -170,7 +170,7 @@ items:
type: Local
from:
kind: DockerImage
name: quay.io/kiegroup/kogito-jobs-service-postgresql:999-SNAPSHOT
name: docker.io/apache/incubator-kie-kogito-jobs-service-postgresql:999-SNAPSHOT
- kind: ImageStream
apiVersion: v1
metadata:
Expand All @@ -191,4 +191,4 @@ items:
type: Local
from:
kind: DockerImage
name: quay.io/kiegroup/kogito-jobs-service-allinone:999-SNAPSHOT
name: docker.io/apache/incubator-kie-kogito-jobs-service-allinone:999-SNAPSHOT
2 changes: 1 addition & 1 deletion kogito-jit-runner-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#
schema_version: 1

name: "quay.io/kiegroup/kogito-jit-runner"
name: "docker.io/apache/incubator-kie-kogito-jit-runner"
version: "999-SNAPSHOT"
from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
description: "Runtime image for Kogito JIT Runner"
Expand Down
2 changes: 1 addition & 1 deletion kogito-jobs-service-allinone-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#
schema_version: 1

name: "quay.io/kiegroup/kogito-jobs-service-allinone"
name: "docker.io/apache/incubator-kie-kogito-jobs-service-allinone"
version: "999-SNAPSHOT"
from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
description: "Runtime image for Kogito Jobs Service with all available jdbc providers"
Expand Down
2 changes: 1 addition & 1 deletion kogito-jobs-service-ephemeral-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#
schema_version: 1

name: "quay.io/kiegroup/kogito-jobs-service-ephemeral"
name: "docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral"
version: "999-SNAPSHOT"
from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
description: "Runtime image for Kogito in memory Jobs Service"
Expand Down
2 changes: 1 addition & 1 deletion kogito-jobs-service-postgresql-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#
schema_version: 1

name: "quay.io/kiegroup/kogito-jobs-service-postgresql"
name: "docker.io/apache/incubator-kie-kogito-jobs-service-postgresql"
version: "999-SNAPSHOT"
from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
description: "Runtime image for Kogito Jobs Service based on Postgresql"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ mkdir -p "${KOGITO_HOME}"/.m2/repository
mkdir -p "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"

# Unzip Quarkus app and Maven repository
tar xf "${SOURCES_DIR}"/kogito-swf-quarkus-app.tar -C "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
tar xf "${SOURCES_DIR}"/kogito-swf-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository
tar xf "${SOURCES_DIR}"/sonataflow-quarkus-app.tar -C "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
tar xf "${SOURCES_DIR}"/sonataflow-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository

chown -R 1001:0 "${KOGITO_HOME}"
chmod -R ug+rwX "${KOGITO_HOME}"
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ description: "Kogito Serverless Workflow builder runtime module"

artifacts:
- image: builder
path: /home/kogito/build_output/kogito-swf-quarkus-app.tar
path: /home/kogito/build_output/sonataflow-quarkus-app.tar
- image: builder
path: /home/kogito/build_output/kogito-swf-maven-repo.tar
path: /home/kogito/build_output/sonataflow-maven-repo.tar

execute:
- script: configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ BUILD_OUTPUT="${KOGITO_HOME}"/build_output/
mkdir -p "${BUILD_OUTPUT}"

echo "Zip and copy scaffold project"
tar cf kogito-swf-quarkus-app.tar -C "${PROJECT_ARTIFACT_ID}" .
cp -v kogito-swf-quarkus-app.tar "${BUILD_OUTPUT}"
tar cf sonataflow-quarkus-app.tar -C "${PROJECT_ARTIFACT_ID}" .
cp -v sonataflow-quarkus-app.tar "${BUILD_OUTPUT}"

echo "Zip and copy maven repo"
cd "${KOGITO_HOME}"/.m2/repository/
tar cf kogito-swf-maven-repo.tar .
cp -v kogito-swf-maven-repo.tar "${BUILD_OUTPUT}"
tar cf sonataflow-maven-repo.tar .
cp -v sonataflow-maven-repo.tar "${BUILD_OUTPUT}"
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ teardown() {

@test "verify copy resources is working" {
TEMPD=$(mktemp -d)
cp -r $BATS_TEST_DIRNAME/../../../../../../tests/shell/kogito-swf-builder/resources/greet-with-inputschema/* ${TEMPD}
cp -r $BATS_TEST_DIRNAME/../../../../../../tests/shell/sonataflow-builder/resources/greet-with-inputschema/* ${TEMPD}

# We don't care about the errors to try to execute and build the program, just the copy matters
source ${KOGITO_HOME}/launch/build-app.sh ${TEMPD} || true
Expand Down
Loading

0 comments on commit dec66df

Please sign in to comment.