From 73556de7edb9c6b8098fd5dc41a54d6beeacd364 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 13 Apr 2024 18:02:13 +0800 Subject: [PATCH 1/2] alpine-ansible-lint: add entrypoint.sh which need by Jenkins Docker plugin --- oci/base/alpine-ansible-lint/Dockerfile | 5 +++-- oci/base/alpine-ansible-lint/entrypoint.sh | 9 +++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100755 oci/base/alpine-ansible-lint/entrypoint.sh diff --git a/oci/base/alpine-ansible-lint/Dockerfile b/oci/base/alpine-ansible-lint/Dockerfile index d783d27..b79dd7d 100644 --- a/oci/base/alpine-ansible-lint/Dockerfile +++ b/oci/base/alpine-ansible-lint/Dockerfile @@ -27,5 +27,6 @@ RUN apk add --no-cache bash git python3 py3-pip jq \ # Set work directory WORKDIR /src -# Define an entrypoint -ENTRYPOINT ["/bin/bash"] + +ADD entrypoint.sh / +ENTRYPOINT [ "/entrypoint.sh" ] diff --git a/oci/base/alpine-ansible-lint/entrypoint.sh b/oci/base/alpine-ansible-lint/entrypoint.sh new file mode 100755 index 0000000..c8b76f0 --- /dev/null +++ b/oci/base/alpine-ansible-lint/entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/sh +set -e + +# check if there was a command passed +# required by Jenkins Docker plugin: https://github.com/docker-library/official-images#consistency +if [ "$1" ]; then + # execute it + exec "$@" +fi From dd80a45e38aa9e1b5bbf6dec80ca943a454bc2ce Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 13 Apr 2024 18:04:23 +0800 Subject: [PATCH 2/2] alpine-ansible-lint: add jenkins issues url --- oci/base/alpine-ansible-lint/entrypoint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/oci/base/alpine-ansible-lint/entrypoint.sh b/oci/base/alpine-ansible-lint/entrypoint.sh index c8b76f0..9aac491 100755 --- a/oci/base/alpine-ansible-lint/entrypoint.sh +++ b/oci/base/alpine-ansible-lint/entrypoint.sh @@ -3,6 +3,7 @@ set -e # check if there was a command passed # required by Jenkins Docker plugin: https://github.com/docker-library/official-images#consistency +# https://issues.jenkins.io/browse/JENKINS-51307?focusedCommentId=341121&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel if [ "$1" ]; then # execute it exec "$@"