diff --git a/.github/workflows/build_hello-world.yaml b/.github/workflows/build_hello-world.yaml deleted file mode 100644 index 5bf41506e..000000000 --- a/.github/workflows/build_hello-world.yaml +++ /dev/null @@ -1,31 +0,0 @@ ---- -name: Build Hello-World -run-name: | - Build Hello-World (attempt #${{ github.run_attempt }}) - -on: - workflow_dispatch: - schedule: - - cron: '0 1 2/2 * *' # https://crontab.guru/#0_1_2/2_*_* - push: - branches: [main] - tags: ['*'] - paths: - # To check dependencies, run this ( you will need to consider transitive dependencies) - # bake --product PRODUCT -d | grep -v 'docker buildx bake' | jq '.target | keys[]' - - hello-world/** - - .github/actions/** - - .github/workflows/build_hello-world.yaml - - .github/workflows/reusable_build_image.yaml - -jobs: - build_image: - name: Reusable Workflow - uses: ./.github/workflows/reusable_build_image.yaml - secrets: - harbor-robot-secret: ${{ secrets.HARBOR_ROBOT_SDP_GITHUB_ACTION_BUILD_SECRET }} - slack-token: ${{ secrets.SLACK_CONTAINER_IMAGE_TOKEN }} - with: - product-name: hello-world - sdp-version: ${{ github.ref_type == 'tag' && github.ref_name || '0.0.0-dev' }} - registry-namespace: sdp diff --git a/.scripts/update_readme_badges.sh b/.scripts/update_readme_badges.sh index bf5944bac..88e16cc34 100755 --- a/.scripts/update_readme_badges.sh +++ b/.scripts/update_readme_badges.sh @@ -54,12 +54,15 @@ for BUILD_WORKFLOW_FILE in .github/workflows/build_*.yaml; do echo >> "$BADGES_TMP" fi done -# This needs to add the remaning empty columns of the last row in the table -# This is a hack to fix the status quo and make markdownlint happy. -for _ in $(seq 0 $((COLS - 1))); do - echo -n "| " >> "$BADGES_TMP" -done -echo "|" >> "$BADGES_TMP" + +# Add remaining empty columns to complete the last row if needed +# "if needed" is the first if here: It'll only run when we're NOT on the last column (0 indexed) +if [ ${CURRENT_COLUMN} -ne $((COLS - 1)) ]; then + for _ in $(seq $((CURRENT_COLUMN + 1)) $((COLS - 1))); do + echo -n "| " >> "$BADGES_TMP" + done + echo "|" >> "$BADGES_TMP" +fi echo -n "" >> "$BADGES_TMP" # Print the image and link shortcuts. Eg: diff --git a/README.md b/README.md index d0df4da04..1d8ee7a44 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,11 @@ This repository contains Dockerfiles and scripts to build base images for use wi | | | | | | -: | -: | -: | -: | | [![Build Airflow]][build_airflow.yaml] | [![Build Druid]][build_druid.yaml] | [![Build Hadoop]][build_hadoop.yaml] | [![Build HBase]][build_hbase.yaml] | -| [![Build Hello-World]][build_hello-world.yaml] | [![Build Hive]][build_hive.yaml] | [![Build Java Base]][build_java-base.yaml] | [![Build Java Development]][build_java-devel.yaml] | -| [![Build Kafka Testing Tools]][build_kafka-testing-tools.yaml] | [![Build Kafka]][build_kafka.yaml] | [![Build Krb5]][build_krb5.yaml] | [![Build NiFi]][build_nifi.yaml] | -| [![Build Omid]][build_omid.yaml] | [![Build OPA]][build_opa.yaml] | [![Build Spark Connect Client]][build_spark-connect-client.yaml] | [![Build Spark K8s]][build_spark-k8s.yaml] | -| [![Build Stackable Base]][build_stackable-base.yaml] | [![Build Superset]][build_superset.yaml] | [![Build Testing Tools]][build_testing-tools.yaml] | [![Build Tools]][build_tools.yaml] | -| [![Build Trino CLI]][build_trino-cli.yaml] | [![Build Trino]][build_trino.yaml] | [![Build Vector]][build_vector.yaml] | [![Build ZooKeeper]][build_zookeeper.yaml] | -| | | | | +| [![Build Hive]][build_hive.yaml] | [![Build Java Base]][build_java-base.yaml] | [![Build Java Development]][build_java-devel.yaml] | [![Build Kafka Testing Tools]][build_kafka-testing-tools.yaml] | +| [![Build Kafka]][build_kafka.yaml] | [![Build Krb5]][build_krb5.yaml] | [![Build NiFi]][build_nifi.yaml] | [![Build Omid]][build_omid.yaml] | +| [![Build OPA]][build_opa.yaml] | [![Build Spark Connect Client]][build_spark-connect-client.yaml] | [![Build Spark K8s]][build_spark-k8s.yaml] | [![Build Stackable Base]][build_stackable-base.yaml] | +| [![Build Superset]][build_superset.yaml] | [![Build Testing Tools]][build_testing-tools.yaml] | [![Build Tools]][build_tools.yaml] | [![Build Trino CLI]][build_trino-cli.yaml] | +| [![Build Trino]][build_trino.yaml] | [![Build Vector]][build_vector.yaml] | [![Build ZooKeeper]][build_zookeeper.yaml] | | ## Prerequisites @@ -222,8 +221,6 @@ ENTRYPOINT ["/stackable-zookeeper-operator"] [build_hadoop.yaml]: https://github.com/stackabletech/docker-images/actions/workflows/build_hadoop.yaml [Build HBase]: https://github.com/stackabletech/docker-images/actions/workflows/build_hbase.yaml/badge.svg [build_hbase.yaml]: https://github.com/stackabletech/docker-images/actions/workflows/build_hbase.yaml -[Build Hello-World]: https://github.com/stackabletech/docker-images/actions/workflows/build_hello-world.yaml/badge.svg -[build_hello-world.yaml]: https://github.com/stackabletech/docker-images/actions/workflows/build_hello-world.yaml [Build Hive]: https://github.com/stackabletech/docker-images/actions/workflows/build_hive.yaml/badge.svg [build_hive.yaml]: https://github.com/stackabletech/docker-images/actions/workflows/build_hive.yaml [Build Java Base]: https://github.com/stackabletech/docker-images/actions/workflows/build_java-base.yaml/badge.svg diff --git a/conf.py b/conf.py index ae57a1c84..0a75cd90a 100644 --- a/conf.py +++ b/conf.py @@ -18,7 +18,6 @@ hbase_phoenix = importlib.import_module("hbase.phoenix.versions") hbase_opa_authorizer = importlib.import_module("hbase.hbase-opa-authorizer.versions") hbase_operator_tools = importlib.import_module("hbase.hbase-operator-tools.versions") -hello_world = importlib.import_module("hello-world.versions") hive = importlib.import_module("hive.versions") java_base = importlib.import_module("java-base.versions") java_devel = importlib.import_module("java-devel.versions") @@ -54,7 +53,6 @@ {"name": "hbase/phoenix", "versions": hbase_phoenix.versions}, {"name": "hbase/hbase-opa-authorizer", "versions": hbase_opa_authorizer.versions}, {"name": "hbase/hbase-operator-tools", "versions": hbase_operator_tools.versions}, - {"name": "hello-world", "versions": hello_world.versions}, {"name": "hive", "versions": hive.versions}, {"name": "java-base", "versions": java_base.versions}, {"name": "java-devel", "versions": java_devel.versions}, diff --git a/hello-world/Dockerfile b/hello-world/Dockerfile deleted file mode 100644 index f664612ee..000000000 --- a/hello-world/Dockerfile +++ /dev/null @@ -1,41 +0,0 @@ -# syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7 -# check=error=true - -FROM stackable/image/java-base - -ARG PRODUCT -ARG RELEASE -ARG STACKABLE_USER_UID - -LABEL name="Hello World" \ - maintainer="info@stackable.tech" \ - vendor="Stackable GmbH" \ - version="${PRODUCT}" \ - release="${RELEASE}" \ - summary="The Stackable image for the Stackable Hello World Operator" \ - description="This image is deployed by the Stackable Hello World Operator." - -RUN <