diff --git a/bitnami/gitlab-runner-helper/15/debian-11/Dockerfile b/bitnami/gitlab-runner-helper/15/debian-11/Dockerfile index d24d71aa23ed..5fad5c46e973 100644 --- a/bitnami/gitlab-runner-helper/15/debian-11/Dockerfile +++ b/bitnami/gitlab-runner-helper/15/debian-11/Dockerfile @@ -3,13 +3,13 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-03-13T21:31:22Z" \ + org.opencontainers.image.created="2023-03-18T21:32:46Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="15.9.1-debian-11-r7" \ + org.opencontainers.image.ref.name="15.10.0-debian-11-r0" \ org.opencontainers.image.title="gitlab-runner-helper" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="15.9.1" + org.opencontainers.image.version="15.10.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,8 +22,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl git git-lfs openssh-client procps RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \ - "gitlab-runner-helper-15.9.1-0-linux-${OS_ARCH}-debian-11" \ + "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \ + "gitlab-runner-helper-15.10.0-0-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -41,7 +41,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN mkdir /home/gitlab-runner && chmod -R g+rwX /home/gitlab-runner && ln -s /opt/bitnami/common/bin/dumb-init /usr/bin/dumb-init && ln -s /opt/bitnami/scripts/gitlab-runner-helper/entrypoint.sh /entrypoint -ENV APP_VERSION="15.9.1" \ +ENV APP_VERSION="15.10.0" \ BITNAMI_APP_NAME="gitlab-runner-helper" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/gitlab-runner-helper/bin:$PATH" diff --git a/bitnami/gitlab-runner-helper/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/gitlab-runner-helper/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index dd34d6bd2330..0c3b164324e7 100644 --- a/bitnami/gitlab-runner-helper/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/gitlab-runner-helper/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,16 +1,16 @@ { "gitlab-runner-helper": { "arch": "amd64", - "digest": "44a1b3ffce85878db955db941bbd61edfdb1c35c5a539927cc37e8936e98e442", + "digest": "9b2e152605a56556e8691588df55850c63d17f0f377dd79096b5500bc6b00265", "distro": "debian-11", "type": "NAMI", - "version": "15.9.1-0" + "version": "15.10.0-0" }, "gosu": { "arch": "amd64", - "digest": "f6056076afb745fd7d9d87d20f71e7248d63330352cf5ae0be2130b7f44a8cfa", + "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23", "distro": "debian-11", "type": "NAMI", - "version": "1.16.0-2" + "version": "1.16.0-3" } } \ No newline at end of file diff --git a/bitnami/gitlab-runner-helper/15/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/gitlab-runner-helper/15/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 2d53aca9af84..2d4b7af6fd3a 100644 --- a/bitnami/gitlab-runner-helper/15/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/gitlab-runner-helper/15/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -281,6 +281,8 @@ remove_logrotate_conf() { # --environment - Environment variable to define (multiple --environment options may be passed) # --environment-file - Text file with environment variables # --exec-start - Start command (required) +# --exec-start-pre - Pre-start command (optional) +# --exec-start-post - Post-start command (optional) # --exec-stop - Stop command (optional) # --exec-reload - Reload command (optional) # --group - System group to start the service with @@ -292,6 +294,7 @@ remove_logrotate_conf() { # --success-exit-status - Exit code that indicates a successful shutdown # --type - Systemd unit type (defaults to forking) # --user - System user to start the service with +# --working-directory - Working directory at which to start the service # Returns: # None ######################### @@ -307,6 +310,8 @@ generate_systemd_conf() { local environment="" local environment_file="" local exec_start="" + local exec_start_pre="" + local exec_start_post="" local exec_stop="" local exec_reload="" local restart="always" @@ -316,6 +321,7 @@ generate_systemd_conf() { local limits_content="" local success_exit_status="" local custom_service_content="" + local working_directory="" # Parse CLI flags shift while [[ "$#" -gt 0 ]]; do @@ -334,6 +340,7 @@ generate_systemd_conf() { | --standard-error \ | --success-exit-status \ | --custom-service-content \ + | --working-directory \ ) var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" shift @@ -345,11 +352,21 @@ generate_systemd_conf() { shift limits_content+="Limit${var_name^^}=${1:?"--limit-${var_name} value is missing"}" ;; + --exec-start-pre) + shift + [[ -n "$exec_start_pre" ]] && exec_start_pre+=$'\n' + exec_start_pre+="ExecStartPre=${1:?"--exec-start-pre value is missing"}" + ;; + --exec-start-post) + shift + [[ -n "$exec_start_post" ]] && exec_start_post+=$'\n' + exec_start_post+="ExecStartPost=${1:?"--exec-start-post value is missing"}" + ;; --environment) shift # It is possible to add multiple environment lines [[ -n "$environment" ]] && environment+=$'\n' - environment+="Environment=${1:?"environment" is missing}" + environment+="Environment=${1:?"--environment value is missing"}" ;; *) echo "Invalid command line flag ${1}" >&2 @@ -376,8 +393,21 @@ PartOf=bitnami.service [Service] Type=${type} -ExecStart=${exec_start} EOF + if [[ -n "$working_directory" ]]; then + cat >> "$service_file" <<< "WorkingDirectory=$working_directory" + fi + if [[ -n "$exec_start_pre" ]]; then + # This variable may contain multiple ExecStartPre= directives + cat >> "$service_file" <<< "$exec_start_pre" + fi + if [[ -n "$exec_start" ]]; then + cat >> "$service_file" <<< "ExecStart=${exec_start}" + fi + if [[ -n "$exec_start_post" ]]; then + # This variable may contain multiple ExecStartPost= directives + cat >> "$service_file" <<< "$exec_start_post" + fi # Optional stop and reload commands if [[ -n "$exec_stop" ]]; then cat >> "$service_file" <<< "ExecStop=${exec_stop}" @@ -399,8 +429,9 @@ EOF if [[ -n "$restart" ]]; then cat >> "$service_file" <<< "Restart=${restart}" fi - # Environment flags (may be specified multiple times in a unit) + # Environment flags if [[ -n "$environment" ]]; then + # This variable may contain multiple Environment= directives cat >> "$service_file" <<< "$environment" fi if [[ -n "$environment_file" ]]; then @@ -414,6 +445,7 @@ EOF cat >> "$service_file" <<< "StandardError=${standard_error}" fi if [[ -n "$custom_service_content" ]]; then + # This variable may contain multiple miscellaneous directives cat >> "$service_file" <<< "$custom_service_content" fi if [[ -n "$success_exit_status" ]]; then @@ -424,7 +456,8 @@ EOF fi cat >> "$service_file" < Gitlab Runner Helper is an auxiliary container to be used with Gitlab Runner. Gitlab Runner allows to run CI/CD jobs and send the results back to Gitlab. [Overview of Gitlab Runner Helper](https://gitlab.com/gitlab-org/gitlab-runner/) - Trademarks: This software listing is packaged by Bitnami. The respective trademarks mentioned in the offering are owned by the respective companies, and use of them does not imply any affiliation or endorsement. ## TL;DR