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: 0 additions & 2 deletions .flake8

This file was deleted.

6 changes: 4 additions & 2 deletions .github/workflows/dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ jobs:
uses: docker/setup-buildx-action@885d1462b80bc1c1c7f0b00334ad271f09369c55 # tag=v2
- name: Install python 3
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # tag=v4
- run: pip install image-tools-stackabletech
with:
python-version: '3.x'
- name: Login to Stackable Nexus
Expand All @@ -52,7 +53,7 @@ jobs:
- name: Publish dev images
id: publish_images
run: |
BAKE_OUTPUT=$(python -m image_tools.bake --product "${{ matrix.product }}" --image-version 0.0.0-dev --push 2>&1)
BAKE_OUTPUT=$(bake --product "${{ matrix.product }}" --image-version 0.0.0-dev --push 2>&1)
echo "$BAKE_OUTPUT"
# needed for multiline strings in github actions
EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
Expand Down Expand Up @@ -104,9 +105,10 @@ jobs:
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # tag=v4
with:
python-version: '3.x'
- run: pip install image-tools-stackabletech
- name: Install preflight
run: |
wget https://github.com/redhat-openshift-ecosystem/openshift-preflight/releases/latest/download/preflight-linux-amd64
chmod +x preflight-linux-amd64
- name: OpenShift certification checks
run: python -m image_tools.preflight --product "${{ matrix.product }}" --image-version 0.0.0-dev --preflight-cmd ./preflight-linux-amd64
run: check-container --product "${{ matrix.product }}" --image-version 0.0.0-dev --executable ./preflight-linux-amd64
6 changes: 4 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ jobs:
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # tag=v4
with:
python-version: '3.x'
- run: pip install image-tools-stackabletech
- name: Login to Stackable Nexus
uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # tag=v2
with:
Expand All @@ -57,7 +58,7 @@ jobs:
- name: Publish release product images
id: publish_images
run: |
BAKE_OUTPUT=$(python -m image_tools.bake --product "${{ matrix.product }}" --image-version "$GITHUB_REF_NAME" --organization stackable --architecture linux/amd64 --push 2>&1)
BAKE_OUTPUT=$(bake --product "${{ matrix.product }}" --image-version "$GITHUB_REF_NAME" --organization stackable --architecture linux/amd64 --push 2>&1)
echo "$BAKE_OUTPUT"
# needed for multiline strings in github actions
EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
Expand Down Expand Up @@ -114,9 +115,10 @@ jobs:
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # tag=v4
with:
python-version: '3.x'
- run: pip install image-tools-stackabletech
- name: Install preflight
run: |
wget https://github.com/redhat-openshift-ecosystem/openshift-preflight/releases/download/1.6.2/preflight-linux-amd64
chmod +x preflight-linux-amd64
- name: Submit images to OpenShift certification projects
run: python -m image_tools.preflight --product "${{ matrix.product }}" --image-version "$GITHUB_REF_NAME" --preflight-cmd ./preflight-linux-amd64 --token "${{ secrets.RH_PYXIS_API_TOKEN }}" --submit
run: check-container --product "${{ matrix.product }}" --image-version "$GITHUB_REF_NAME" --executable ./preflight-linux-amd64 --token "${{ secrets.RH_PYXIS_API_TOKEN }}" --submit
11 changes: 0 additions & 11 deletions .github/workflows/reviewdog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,6 @@ jobs:
with:
github_token: ${{ secrets.github_token }}

flake8:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # tag=v3.3.0
- uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # tag=v4
with:
python-version: "3.9"
- uses: reviewdog/action-flake8@1212bd6f1c67830dcff438cf39522d4b58407e71 # tag=v3.7.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}

hadolint:
runs-on: ubuntu-latest
steps:
Expand Down
33 changes: 0 additions & 33 deletions .pylintrc

This file was deleted.

2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.

### Changed

- Extract image tools their own [repository](https://github.com/stackabletech/image-tools) ([#437])
- Bump ubi8-rust-builder toolchain to 1.71.0 ([#419]).
- BREAKING: Upgrade Vector in all product images to version 0.31.0. The
integration tests of the operators must be adapted because the metric
Expand All @@ -23,6 +24,7 @@ All notable changes to this project will be documented in this file.
[#419]: https://github.com/stackabletech/docker-images/pull/419
[#429]: https://github.com/stackabletech/docker-images/pull/429
[#433]: https://github.com/stackabletech/docker-images/pull/433
[#437]: https://github.com/stackabletech/docker-images/pull/437

## [23.7.0] - 2023-07-14

Expand Down
18 changes: 13 additions & 5 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,27 @@ ENTRYPOINT ["/stackable-zookeeper-operator"]
== Build Product Images

Product images are published to the `docker.stackable.tech` registry under the `stackable` organization.
This uses the Docker CLI plugin `buildx` which is not necessarily installed by default when installing Docker.
Make sure that `docker buildx` works before running the following commands.

Prerequisites:

* Stackable Image Tools (`pip install image-tools-stackabletech`) https://github.com/stackabletech/image-tools
* Docker including the `buildx` plugin: https://github.com/docker/buildx

To build and push product images to the default repository, use the `build_product_images.py` like this:

python -m image_tools.bake --product zookeeper --image 0.0.0-dev --push
bake --product zookeeper --image 0.0.0-dev --push

This will build images for Apache ZooKeeper versions as defined in the `image_tools/conf.py` and tag them with the `image-version` 0.0.0-dev
This will build images for Apache ZooKeeper versions as defined in the `conf.py` file and tag them with the `image-version` 0.0.0-dev

The GitHub action called `Product images` can be triggered manually to do the same but not on the local machine.

== Verify Product Images

Prerequisites:

* Stackable Image Tools (`pip install image-tools-stackabletech`) https://github.com/stackabletech/image-tools
* OpenShift preflight tool: https://github.com/redhat-openshift-ecosystem/openshift-preflight

To verify if Apache Zookeeper validate against OpenShift preflight, run:

python -m image_tools.preflight --product zookeeper --image 0.0.0-dev
check-container --product zookeeper --image 0.0.0-dev
2 changes: 2 additions & 0 deletions image_tools/conf.py → conf.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
"""
Configuration file for the Stackable image-tools: https://github.com/stackabletech/image-tools.

Application images will be created for products and associated versions configured here.
"""

Expand Down
1 change: 0 additions & 1 deletion image_tools/__init__.py

This file was deleted.

81 changes: 0 additions & 81 deletions image_tools/args.py

This file was deleted.

Loading