airship/airshipctl
Code Issues Proposed changes

Add base images override support

Browse Source 
Go builder and base images override support for downstream
deployment customizations for both airshipctl and plugins.
If required, adjust the following Zuul job variables:
 - docker.base_go_image
 - docker.base_release_image
 - docker.base_plugins_build_image
 - docker.base_plugins_release_image

Closes: #515
Change-Id: Iaf4b54a353207b06c9ed6bdcae876537e73f6e44
This commit is contained in:
Roman Gorshunov
2021-04-08 13:18:42 +02:00
parent 7ed59086fc
commit 7998615a7b
5 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/airshipctl-build-images/tasks/main.yaml
View File

@@ -18,6 +18,10 @@
PROXY: "{{ proxy.http }}"
NO_PROXY: "{{ proxy.noproxy }}"
USE_PROXY: "{{ proxy.enabled | lower }}"
DOCKER_BASE_GO_IMAGE: "{{ docker.base_go_image | default(omit) }}"
DOCKER_BASE_RELEASE_IMAGE: "{{ docker.base_release_image | default(omit) }}"
DOCKER_BASE_PLUGINS_BUILD_IMAGE: "{{ docker.base_plugins_build_image | default(omit) }}"
DOCKER_BASE_PLUGINS_RELEASE_IMAGE: "{{ docker.base_plugins_release_image | default(omit) }}"
- name: Verify Image Exists
shell: docker image inspect "$(make print-docker-image-tag)"

24
roles/airshipctl-publish-images/tasks/main.yaml
View File

@@ -28,28 +28,22 @@
password: "{{ airshipctl_image_repo_credentials.password }}"
registry_url: "{{ image_repo }}"
- name: Push Image with Latest Tag
- name: Push Image with Tags
make:
chdir: "{{ zuul.project.src_dir }}"
params:
DOCKER_IMAGE_TAG: latest
PUBLISH: "true"
PROXY: "{{ proxy.http }}"
NO_PROXY: "{{ proxy.noproxy }}"
USE_PROXY: "{{ proxy.enabled | lower }}"
DOCKER_REGISTRY: "{{ image_repo }}"
DOCKER_IMAGE_PREFIX: "{{ image_prefix | default('airshipit') }}"
target: images
- name: Push Image with Commit Tag
make:
chdir: "{{ zuul.project.src_dir }}"
params:
DOCKER_IMAGE_TAG: "{{ zuul.newrev }}"
DOCKER_IMAGE_TAG: "{{ item }}"
PUBLISH: "true"
PROXY: "{{ proxy.http }}"
NO_PROXY: "{{ proxy.noproxy }}"
USE_PROXY: "{{ proxy.enabled | lower }}"
DOCKER_REGISTRY: "{{ image_repo }}"
DOCKER_IMAGE_PREFIX: "{{ image_prefix | default('airshipit') }}"
DOCKER_BASE_GO_IMAGE: "{{ docker.base_go_image | default(omit) }}"
DOCKER_BASE_RELEASE_IMAGE: "{{ docker.base_release_image | default(omit) }}"
DOCKER_BASE_PLUGINS_BUILD_IMAGE: "{{ docker.base_plugins_build_image | default(omit) }}"
DOCKER_BASE_PLUGINS_RELEASE_IMAGE: "{{ docker.base_plugins_release_image | default(omit) }}"
target: images
loop:
- "latest"
- "{{ zuul.newrev }}"