diff --git a/bitnami/laravel/10/debian-11/Dockerfile b/bitnami/laravel/10/debian-11/Dockerfile index 0c5e289c619a..0c392aed17b2 100644 --- a/bitnami/laravel/10/debian-11/Dockerfile +++ b/bitnami/laravel/10/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-02T00:58:14Z" \ + org.opencontainers.image.created="2023-03-02T20:15:38Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.0.3-debian-11-r4" \ + org.opencontainers.image.ref.name="10.0.4-debian-11-r0" \ org.opencontainers.image.title="laravel" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="10.0.3" + org.opencontainers.image.version="10.0.4" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ @@ -25,7 +25,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ "php-8.1.16-2-linux-${OS_ARCH}-debian-11" \ "node-18.14.2-0-linux-${OS_ARCH}-debian-11" \ "wait-for-port-1.0.6-1-linux-${OS_ARCH}-debian-11" \ - "laravel-10.0.3-1-linux-${OS_ARCH}-debian-11" \ + "laravel-10.0.4-0-linux-${OS_ARCH}-debian-11" \ "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ @@ -44,7 +44,7 @@ RUN /build/bitnami-user.sh COPY rootfs / RUN /opt/bitnami/scripts/laravel/postunpack.sh RUN /opt/bitnami/scripts/php/postunpack.sh -ENV APP_VERSION="10.0.3" \ +ENV APP_VERSION="10.0.4" \ BITNAMI_APP_NAME="laravel" \ NODE_PATH="/opt/bitnami/node/lib/node_modules" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/node/bin:/opt/bitnami/common/bin:$PATH" \ diff --git a/bitnami/laravel/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/laravel/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index ae454b8ba3a1..a3a4f2b8f03f 100644 --- a/bitnami/laravel/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/laravel/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -8,10 +8,10 @@ }, "laravel": { "arch": "amd64", - "digest": "ffc4e90cc112394a0f8a996fad38979d5e35a976ee26bbc22dbcd8ed629f28c9", + "digest": "85c11ef1419172dcb739674366ea5a0ba8d8e66ed958451fb3fe6940899c464d", "distro": "debian-11", "type": "NAMI", - "version": "10.0.3-1" + "version": "10.0.4-0" }, "node": { "arch": "amd64", diff --git a/bitnami/laravel/10/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/laravel/10/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index af64e198ad2d..2d53aca9af84 100644 --- a/bitnami/laravel/10/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/laravel/10/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -277,16 +277,21 @@ remove_logrotate_conf() { # Arguments: # $1 - Service name # Flags: +# --custom-service-content - Custom content to add to the [service] block +# --environment - Environment variable to define (multiple --environment options may be passed) +# --environment-file - Text file with environment variables # --exec-start - Start command (required) # --exec-stop - Stop command (optional) # --exec-reload - Reload command (optional) +# --group - System group to start the service with # --name - Service full name (e.g. Apache HTTP Server, defaults to $1) # --restart - When to restart the Systemd service after being stopped (defaults to always) -# --pid-file - Service PID file (required when --restart is set to always) +# --pid-file - Service PID file +# --standard-output - File where to print stdout output +# --standard-error - File where to print stderr output +# --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 -# --group - System group to start the service with -# --environment - Environment variable to define (multiple --environment options may be passed) # Returns: # None ######################### @@ -300,6 +305,7 @@ generate_systemd_conf() { local user="" local group="" local environment="" + local environment_file="" local exec_start="" local exec_stop="" local exec_reload="" @@ -307,6 +313,9 @@ generate_systemd_conf() { local pid_file="" local standard_output="journal" local standard_error="" + local limits_content="" + local success_exit_status="" + local custom_service_content="" # Parse CLI flags shift while [[ "$#" -gt 0 ]]; do @@ -315,6 +324,7 @@ generate_systemd_conf() { | --type \ | --user \ | --group \ + | --environment-file \ | --exec-start \ | --exec-stop \ | --exec-reload \ @@ -322,10 +332,18 @@ generate_systemd_conf() { | --pid-file \ | --standard-output \ | --standard-error \ + | --success-exit-status \ + | --custom-service-content \ ) var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" shift - declare "$var_name"="${1:?"$var_name" is missing}" + declare "$var_name"="${1:?"${var_name} value is missing"}" + ;; + --limit-*) + [[ -n "$limits_content" ]] && limits_content+=$'\n' + var_name="${1//--limit-}" + shift + limits_content+="Limit${var_name^^}=${1:?"--limit-${var_name} value is missing"}" ;; --environment) shift @@ -346,10 +364,6 @@ generate_systemd_conf() { error "The --exec-start option is required" error="yes" fi - if [[ "$restart" = "always" && -z "$pid_file" ]]; then - error "The --restart option cannot be set to 'always' if --pid-file is not set" - error="yes" - fi if [[ "$error" != "no" ]]; then return 1 fi @@ -382,10 +396,16 @@ EOF if [[ -n "$pid_file" ]]; then cat >> "$service_file" <<< "PIDFile=${pid_file}" fi + if [[ -n "$restart" ]]; then + cat >> "$service_file" <<< "Restart=${restart}" + fi # Environment flags (may be specified multiple times in a unit) if [[ -n "$environment" ]]; then cat >> "$service_file" <<< "$environment" fi + if [[ -n "$environment_file" ]]; then + cat >> "$service_file" <<< "EnvironmentFile=${environment_file}" + fi # Logging if [[ -n "$standard_output" ]]; then cat >> "$service_file" <<< "StandardOutput=${standard_output}" @@ -393,14 +413,28 @@ EOF if [[ -n "$standard_error" ]]; then cat >> "$service_file" <<< "StandardError=${standard_error}" fi + if [[ -n "$custom_service_content" ]]; then + cat >> "$service_file" <<< "$custom_service_content" + fi + if [[ -n "$success_exit_status" ]]; then + cat >> "$service_file" <> "$service_file" <> "$service_file" <> "$service_file" <