airship/airshipctl
Code Issues Proposed changes

Allow to override default entrypoint for airshipctl image

Browse Source 
Change-Id: Ic1eb96fbc7c0a510d135c079ac94187a51087155
Signed-off-by: Andrii Ostapenko <andrii.ostapenko@att.com>
This commit is contained in:
Andrii Ostapenko 2021-05-17 23:44:40 -05:00
parent 9ca9106f34
commit d5049239dc
No known key found for this signature in database
GPG Key ID: F3E83668DBB223B3
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -37,4 +37,5 @@ ARG BINARY=airshipctl
ENV BINARY=${BINARY} ENV BINARY=${BINARY}
COPY --from=builder /usr/src/airshipctl/bin/${BINARY} /usr/local/bin/${BINARY} COPY --from=builder /usr/src/airshipctl/bin/${BINARY} /usr/local/bin/${BINARY}
USER 65534 USER 65534
ENTRYPOINT /usr/local/bin/${BINARY} ARG ENTRYPOINT=/usr/local/bin/${BINARY}
ENTRYPOINT ${ENTRYPOINT}

3
Makefile
View File

@ -43,6 +43,9 @@ endif
ifneq ($(strip $(DOCKER_BASE_RELEASE_IMAGE)),) ifneq ($(strip $(DOCKER_BASE_RELEASE_IMAGE)),)
DOCKER_CMD_FLAGS += --build-arg RELEASE_IMAGE=$(strip $(DOCKER_BASE_RELEASE_IMAGE)) DOCKER_CMD_FLAGS += --build-arg RELEASE_IMAGE=$(strip $(DOCKER_BASE_RELEASE_IMAGE))
endif endif
ifneq ($(strip $(DOCKER_IMAGE_ENTRYPOINT)),)
DOCKER_CMD_FLAGS += --build-arg ENTRYPOINT=$(strip $(DOCKER_IMAGE_ENTRYPOINT))
endif
# use this variable for image labels added in internal build process # use this variable for image labels added in internal build process
COMMIT ?= $(shell git rev-parse HEAD) COMMIT ?= $(shell git rev-parse HEAD)
LABEL ?= org.airshipit.build=community LABEL ?= org.airshipit.build=community

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

@ -10,7 +10,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
- name: Buid airshipctl Image - name: Build airshipctl Image
make: make:
chdir: "{{ zuul.project.src_dir }}" chdir: "{{ zuul.project.src_dir }}"
target: images target: images
@ -25,6 +25,7 @@
DOCKER_BASE_RELEASE_IMAGE: "{{ docker.base_release_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_BUILD_IMAGE: "{{ docker.base_plugins_build_image | default(omit) }}"
DOCKER_BASE_PLUGINS_RELEASE_IMAGE: "{{ docker.base_plugins_release_image | default(omit) }}" DOCKER_BASE_PLUGINS_RELEASE_IMAGE: "{{ docker.base_plugins_release_image | default(omit) }}"
DOCKER_IMAGE_ENTRYPOINT: "{{ docker.entrypoint | default(omit) }}"
- name: Verify Image Exists - name: Verify Image Exists
shell: docker image inspect "$(make DOCKER_REGISTRY={{ image_repo }} DOCKER_IMAGE_PREFIX={{ image_prefix }} DOCKER_IMAGE_TAG={{ zuul.change }} print-docker-image-tag)" shell: docker image inspect "$(make DOCKER_REGISTRY={{ image_repo }} DOCKER_IMAGE_PREFIX={{ image_prefix }} DOCKER_IMAGE_TAG={{ zuul.change }} print-docker-image-tag)"

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

@ -43,6 +43,7 @@
DOCKER_BASE_RELEASE_IMAGE: "{{ docker.base_release_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_BUILD_IMAGE: "{{ docker.base_plugins_build_image | default(omit) }}"
DOCKER_BASE_PLUGINS_RELEASE_IMAGE: "{{ docker.base_plugins_release_image | default(omit) }}" DOCKER_BASE_PLUGINS_RELEASE_IMAGE: "{{ docker.base_plugins_release_image | default(omit) }}"
DOCKER_IMAGE_ENTRYPOINT: "{{ docker.entrypoint | default(omit) }}"
target: images target: images
loop: loop:
- "latest" - "latest"