Skip to content

Commit d48c383

Browse files
committed
ironic-vnc-container: try syncing the assets in CI
1 parent 1b1ffab commit d48c383

26 files changed

+20
-1054
lines changed

.github/workflows/build-container-reuse.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,14 @@ on:
3232
type: string
3333
default: '{{ defaultContext }}'
3434
description: 'Path to docker context'
35+
prebuild_script:
36+
required: false
37+
type: string
38+
description: 'path to shell script to run before building the containers'
39+
prebuild_script_working_dir:
40+
type: string
41+
default: "."
42+
description: 'directory which the prebuild_script will run'
3543

3644
jobs:
3745
build:
@@ -71,6 +79,12 @@ jobs:
7179
# that are arch specific so populate them at the index as well.
7280
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
7381

82+
- uses: actions/checkout@v4
83+
- name: Run prebuild script
84+
if: ${{ inputs.prebuild_script != '' }}
85+
run: "${{ inputs.prebuild_script }}"
86+
working-directory: ${{ inputs.prebuild_script_working_dir }}
87+
7488
- name: build and push container image
7589
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
7690
with:

.github/workflows/containers.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,16 @@ jobs:
3737
target: prod
3838
- name: ironic-vnc-container
3939
target: ''
40-
dockerfile_path: Dockerfile
41-
context_path: "{{defaultContext}}:containers/ironic-vnc-container/"
40+
dockerfile_path: ./containers/ironic-vnc-container/Dockerfile
41+
context_path: "./containers/ironic-vnc-container/"
42+
prebuild_script: ./sync_from_upstream.sh
43+
prebuild_script_working_dir: containers/ironic-vnc-container/
4244
uses: ./.github/workflows/build-container-reuse.yaml
4345
secrets: inherit
4446
with:
4547
container_name: ${{ matrix.container.name }}
4648
dockerfile_path: ${{ matrix.container.dockerfile_path || format('containers/{0}/Dockerfile', matrix.container.name) }}
4749
target: ${{ matrix.container.target }}
4850
context_path: ${{ matrix.container.context_path || '{{defaultContext}}' }}
51+
prebuild_script: ${{ matrix.container.prebuild_script }}
52+
prebuild_script_working_dir: ${{ matrix.container.prebuild_script_working_dir }}

containers/ironic-vnc-container/Dockerfile

Lines changed: 0 additions & 37 deletions
This file was deleted.

containers/ironic-vnc-container/LICENSE

Lines changed: 0 additions & 176 deletions
This file was deleted.

containers/ironic-vnc-container/NOTICE

Lines changed: 0 additions & 3 deletions
This file was deleted.

containers/ironic-vnc-container/bin/cert-override.py

Lines changed: 0 additions & 43 deletions
This file was deleted.

containers/ironic-vnc-container/bin/discover-app.py

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)