Skip to content

Commit bbd2f5d

Browse files
authored
feat: add Docker image for tasks (#887)
1 parent a3ff003 commit bbd2f5d

File tree

2 files changed

+32
-0
lines changed

2 files changed

+32
-0
lines changed

.github/workflows/deployment.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,16 @@ jobs:
125125
push: true
126126
tags: "ghcr.io/diracgrid/diracx/services:${{ needs.deploy-pypi.outputs.new-version }}"
127127
platforms: linux/amd64,linux/arm64
128+
- name: Build and push tasks (release)
129+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
130+
if: ${{ needs.deploy-pypi.outputs.create-release == 'true' }}
131+
with:
132+
context: .
133+
file: containers/Dockerfile
134+
build-args: PIXI_ENV=container-tasks
135+
push: true
136+
tags: "ghcr.io/diracgrid/diracx/tasks:${{ needs.deploy-pypi.outputs.new-version }}"
137+
platforms: linux/amd64,linux/arm64
128138
- name: Build and push client (release)
129139
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
130140
if: ${{ needs.deploy-pypi.outputs.create-release == 'true' }}
@@ -145,6 +155,15 @@ jobs:
145155
push: ${{ github.event_name != 'pull_request' && github.repository == 'DIRACGrid/diracx' && github.ref_name == 'main' }}
146156
tags: ghcr.io/diracgrid/diracx/services:dev
147157
platforms: linux/amd64,linux/arm64
158+
- name: Build and push tasks (dev)
159+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
160+
with:
161+
context: .
162+
file: containers/Dockerfile
163+
build-args: PIXI_ENV=container-tasks
164+
push: ${{ github.event_name != 'pull_request' && github.repository == 'DIRACGrid/diracx' && github.ref_name == 'main' }}
165+
tags: ghcr.io/diracgrid/diracx/tasks:dev
166+
platforms: linux/amd64,linux/arm64
148167
- name: Build and push client (dev)
149168
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
150169
with:

.github/workflows/main.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,15 @@ jobs:
138138
PIXI_ENV=${{ matrix.extension == 'diracx' && 'container-services' || 'gubbins-container-services' }}
139139
tags: ghcr.io/${{ matrix.extension == 'diracx' && 'diracgrid/diracx' || 'gubbins' }}/services:dev
140140
outputs: type=docker,dest=/tmp/services_image.tar
141+
- name: Build tasks image
142+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
143+
with:
144+
context: .
145+
file: containers/Dockerfile
146+
build-args: |
147+
PIXI_ENV=${{ matrix.extension == 'diracx' && 'container-tasks' || 'gubbins-container-tasks' }}
148+
tags: ghcr.io/${{ matrix.extension == 'diracx' && 'diracgrid/diracx' || 'gubbins' }}/tasks:dev
149+
outputs: type=docker,dest=/tmp/tasks_image.tar
141150
- name: Build client image
142151
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
143152
with:
@@ -151,6 +160,8 @@ jobs:
151160
run: |
152161
docker load --input /tmp/services_image.tar
153162
rm -f /tmp/services_image.tar
163+
docker load --input /tmp/tasks_image.tar
164+
rm -f /tmp/tasks_image.tar
154165
docker load --input /tmp/client_image.tar
155166
rm -f /tmp/client_image.tar
156167
docker builder prune -af || true
@@ -182,6 +193,7 @@ jobs:
182193
demo_args+=("--extension-chart-path" "/tmp/gubbins-charts")
183194
demo_args+=("--ci-values" "./extensions/gubbins_values.yaml")
184195
demo_args+=("--load-docker-image" "ghcr.io/gubbins/services:dev")
196+
demo_args+=("--load-docker-image" "ghcr.io/gubbins/tasks:dev")
185197
demo_args+=("--load-docker-image" "ghcr.io/gubbins/client:dev")
186198
demo_args+=("--prune-loaded-images")
187199
elif [ ${{ matrix.extension }} != 'diracx' ]; then
@@ -191,6 +203,7 @@ jobs:
191203
demo_args+=("--set-value" "developer.autoReload=false")
192204
demo_args+=("--set-value" "global.imagePullPolicy=IfNotPresent")
193205
demo_args+=("--load-docker-image" "ghcr.io/diracgrid/diracx/services:dev")
206+
demo_args+=("--load-docker-image" "ghcr.io/diracgrid/diracx/tasks:dev")
194207
demo_args+=("--load-docker-image" "ghcr.io/diracgrid/diracx/client:dev")
195208
demo_args+=("--prune-loaded-images")
196209
fi

0 commit comments

Comments
 (0)