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
77 changes: 0 additions & 77 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,80 +43,3 @@ jobs:
push: ${{ github.event_name == 'push' && github.repository == 'DIRACGrid/container-images' && github.ref_name == 'main' }}
tags: ghcr.io/diracgrid/diracx/${{ matrix.image-name }}:latest
platforms: linux/amd64,linux/arm64
build_chain:
runs-on: ubuntu-latest
timeout-minutes: 30
strategy:
fail-fast: false
steps:
- name: Checkout
uses: actions/checkout@v6
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Set up oras
uses: oras-project/setup-oras@v1
- name: Login to GitHub container registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build base
id: build_base
uses: docker/build-push-action@v6
with:
context: base
outputs: type=oci,dest=output-base.tar
tags: ghcr.io/diracgrid/diracx/base:latest
platforms: linux/amd64,linux/arm64
- name: Extract base
run: |
mkdir output-base
tar -C output-base -xf output-base.tar

- name: Build services-base
uses: docker/build-push-action@v6
with:
context: services-base
build-contexts: |
ghcr.io/diracgrid/diracx/base=oci-layout://output-base@${{steps.build_base.outputs.digest}}
outputs: type=oci,dest=output-services-base.tar
tags: ghcr.io/diracgrid/diracx/services-base:latest
platforms: linux/amd64,linux/arm64
- name: Extract services-base
run: |
mkdir output-services-base
tar -C output-services-base -xf output-services-base.tar

- name: Build client-base
uses: docker/build-push-action@v6
with:
context: client-base
build-contexts: |
ghcr.io/diracgrid/diracx/base=oci-layout://output-base@${{steps.build_base.outputs.digest}}
outputs: type=oci,dest=output-client-base.tar
tags: ghcr.io/diracgrid/diracx/client-base:latest
platforms: linux/amd64,linux/arm64
- name: Extract client-base
run: |
mkdir output-client-base
tar -C output-client-base -xf output-client-base.tar

- name: Push images
if: ${{ github.event_name != 'pull_request' && github.repository == 'DIRACGrid/container-images' && github.ref_name == 'main' }}
run: |
set -x

image_version=$(date +'%Y.%m.%d')
# Check how many tags already exist for the current date and increment the version
count=$(oras repo tags "ghcr.io/diracgrid/diracx/base" | { grep -c "${image_version}" || true; } )
image_version=${image_version}.${count}
echo "Pushing version ${image_version}"

for image_name in base services-base client-base; do
image_repo=ghcr.io/diracgrid/diracx/${image_name}
oras cp --from-oci-layout "$PWD/output-${image_name}:latest" "${image_repo}:latest,${image_version}"
done
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# Container images for DiracX

This repository contains the recipes and CI for building the base images used by DiracX.
> **Note:** As of diracx v0.0.12, diracx ships its own pixi-based
> runtime image (see `containers/Dockerfile` in the diracx repo).
> The `base`, `services-base`, and `client-base` images previously
> built here are no longer used and are not built by CI.
> Only `secret-generation` is maintained in this repository.

See [documentation](https://github.com/DIRACGrid/diracx/blob/main/docs/VERSIONING.md#container-images)
This repository contains the recipes and CI for building the container images used by DiracX.

## Available images

### secret-generation

This image is used by the [helm chart](https://github.com/DIRACGrid/diracx-charts) to run batch jobs within the cluster that automatically generate kubernetes secrets.



## How to build

The most up to date documentation on how to build is the [CI job](.github/workflows/main.yml)

```bash

docker build -t ghcr.io/diracgrid/diracx/base:latest base
docker build -t ghcr.io/diracgrid/diracx/servces-base:latest services-base/
```
docker build -t ghcr.io/diracgrid/diracx/secret-generation:latest secret-generation/
```
27 changes: 0 additions & 27 deletions base/Dockerfile

This file was deleted.

14 changes: 0 additions & 14 deletions base/diraccommon_dependencies.yml

This file was deleted.

66 changes: 0 additions & 66 deletions base/entrypoint.sh

This file was deleted.

29 changes: 0 additions & 29 deletions base/environment.yml

This file was deleted.

17 changes: 0 additions & 17 deletions client-base/Dockerfile

This file was deleted.

15 changes: 0 additions & 15 deletions client-base/environment.yml

This file was deleted.

18 changes: 0 additions & 18 deletions services-base/Dockerfile

This file was deleted.

31 changes: 0 additions & 31 deletions services-base/environment.yml

This file was deleted.

Loading