From c5b003fbcfc94dc10543045a23d7291e73086394 Mon Sep 17 00:00:00 2001 From: darteaga Date: Thu, 27 Feb 2020 15:34:12 +0000 Subject: [PATCH] Remove */ol-7 if */debian-10 exists --- bitnami/laravel/6/ol-7/Dockerfile | 30 --- bitnami/laravel/6/ol-7/docker-compose.yml | 26 --- .../laravel/6/ol-7/prebuildfs/bitnami-user.sh | 6 - .../6/ol-7/prebuildfs/build/bitnami-user.sh | 6 - .../6/ol-7/prebuildfs/build/install-gosu.sh | 10 - .../6/ol-7/prebuildfs/build/install-nami.sh | 7 - .../6/ol-7/prebuildfs/build/install-tini.sh | 17 -- .../laravel/6/ol-7/prebuildfs/install-nami.sh | 7 - .../prebuildfs/opt/bitnami/base/functions | 121 ---------- .../ol-7/prebuildfs/opt/bitnami/base/helpers | 40 ---- .../ol-7/prebuildfs/usr/local/bin/bitnami-pkg | 211 ------------------ .../prebuildfs/usr/local/bin/install_packages | 29 --- .../laravel/6/ol-7/rootfs/app-entrypoint.sh | 110 --------- 13 files changed, 620 deletions(-) delete mode 100644 bitnami/laravel/6/ol-7/Dockerfile delete mode 100644 bitnami/laravel/6/ol-7/docker-compose.yml delete mode 100755 bitnami/laravel/6/ol-7/prebuildfs/bitnami-user.sh delete mode 100755 bitnami/laravel/6/ol-7/prebuildfs/build/bitnami-user.sh delete mode 100755 bitnami/laravel/6/ol-7/prebuildfs/build/install-gosu.sh delete mode 100755 bitnami/laravel/6/ol-7/prebuildfs/build/install-nami.sh delete mode 100755 bitnami/laravel/6/ol-7/prebuildfs/build/install-tini.sh delete mode 100755 bitnami/laravel/6/ol-7/prebuildfs/install-nami.sh delete mode 100644 bitnami/laravel/6/ol-7/prebuildfs/opt/bitnami/base/functions delete mode 100644 bitnami/laravel/6/ol-7/prebuildfs/opt/bitnami/base/helpers delete mode 100755 bitnami/laravel/6/ol-7/prebuildfs/usr/local/bin/bitnami-pkg delete mode 100755 bitnami/laravel/6/ol-7/prebuildfs/usr/local/bin/install_packages delete mode 100755 bitnami/laravel/6/ol-7/rootfs/app-entrypoint.sh diff --git a/bitnami/laravel/6/ol-7/Dockerfile b/bitnami/laravel/6/ol-7/Dockerfile deleted file mode 100644 index 68d510ef0974..000000000000 --- a/bitnami/laravel/6/ol-7/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM oraclelinux:7-slim -LABEL maintainer "Bitnami " - -ENV PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/node/bin:/opt/bitnami/laravel/bin:/opt/bitnami/nami/bin:$PATH" - -COPY prebuildfs / -# Install required system packages and dependencies -RUN install_packages bzip2-libs ca-certificates curl cyrus-sasl-lib freetds-libs freetype glibc gmp gnutls gzip hostname keyutils-libs krb5-libs libaio-devel libcom_err libcurl libffi libgcc libgcrypt libgpg-error libicu libidn libjpeg-turbo libmemcached libpng libselinux libssh2 libstdc++ libtasn1 libtidy libxml2 libxslt ncurses-libs nettle nspr nss nss-softokn-freebl nss-util openldap openssl-libs p11-kit pcre postgresql-libs procps-ng readline sqlite sudo tar which xz-libs zlib -RUN /build/bitnami-user.sh && \ - /build/install-nami.sh -RUN bitnami-pkg unpack php-7.3.15-0 --checksum 3a5c92718570bc7dbc0ebbbbd15301317f9e9e447bb7f3f058480e078a614927 -RUN bitnami-pkg install node-12.16.1-0 --checksum 97117776296f16fb71ae4797a6b33ba98dda58dd9ab91f535fa427fac75a7e06 -RUN bitnami-pkg install laravel-6.12.0-0 --checksum 2c1e7abf85e43c611ebff07649973f88aa992ef3ada6d9c2c06e974963571a64 -RUN yum upgrade -y && \ - rm -r /var/cache/yum -RUN mkdir /app && chown bitnami:bitnami /app -RUN /build/install-gosu.sh -RUN /build/install-tini.sh - -COPY rootfs / -ENV BITNAMI_APP_NAME="laravel" \ - BITNAMI_IMAGE_VERSION="6.12.0-ol-7-r27" \ - NODE_PATH="/opt/bitnami/node/lib/node_modules" - -EXPOSE 3000 - -WORKDIR /app -USER bitnami -ENTRYPOINT [ "/app-entrypoint.sh" ] -CMD [ "php", "artisan", "serve", "--host=0.0.0.0", "--port=3000" ] diff --git a/bitnami/laravel/6/ol-7/docker-compose.yml b/bitnami/laravel/6/ol-7/docker-compose.yml deleted file mode 100644 index b0283c808ef3..000000000000 --- a/bitnami/laravel/6/ol-7/docker-compose.yml +++ /dev/null @@ -1,26 +0,0 @@ -version: '2' - -services: - mariadb: - image: 'bitnami/mariadb:10.1-ol-7' - environment: - - ALLOW_EMPTY_PASSWORD=yes - - MARIADB_USER=my_user - - MARIADB_DATABASE=my_database - - MARIADB_PASSWORD=my_password - - myapp: - tty: true - image: bitnami/laravel:6-ol-7 - environment: - - DB_HOST=mariadb - - DB_USERNAME=my_user - - DB_DATABASE=my_database - - DB_PASSWORD=my_password - depends_on: - - mariadb - ports: - - 3000:3000 - volumes: - - ./:/app - # privileged: true # Privileged mode could be required to run this container under Windows diff --git a/bitnami/laravel/6/ol-7/prebuildfs/bitnami-user.sh b/bitnami/laravel/6/ol-7/prebuildfs/bitnami-user.sh deleted file mode 100755 index ab84296bcdfa..000000000000 --- a/bitnami/laravel/6/ol-7/prebuildfs/bitnami-user.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -useradd -ms /bin/bash bitnami -mkdir -p /opt/bitnami && chown bitnami:bitnami /opt/bitnami -sed -i -e 's/\s*Defaults\s*secure_path\s*=/# Defaults secure_path=/' /etc/sudoers -echo 'bitnami ALL=NOPASSWD: ALL' >> /etc/sudoers diff --git a/bitnami/laravel/6/ol-7/prebuildfs/build/bitnami-user.sh b/bitnami/laravel/6/ol-7/prebuildfs/build/bitnami-user.sh deleted file mode 100755 index ab84296bcdfa..000000000000 --- a/bitnami/laravel/6/ol-7/prebuildfs/build/bitnami-user.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -useradd -ms /bin/bash bitnami -mkdir -p /opt/bitnami && chown bitnami:bitnami /opt/bitnami -sed -i -e 's/\s*Defaults\s*secure_path\s*=/# Defaults secure_path=/' /etc/sudoers -echo 'bitnami ALL=NOPASSWD: ALL' >> /etc/sudoers diff --git a/bitnami/laravel/6/ol-7/prebuildfs/build/install-gosu.sh b/bitnami/laravel/6/ol-7/prebuildfs/build/install-gosu.sh deleted file mode 100755 index 1756700daa89..000000000000 --- a/bitnami/laravel/6/ol-7/prebuildfs/build/install-gosu.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -VERSION="1.11" -SHA256="0b843df6d86e270c5b0f5cbd3c326a04e18f4b7f9b8457fa497b0454c4b138d7" - -curl --silent -L "https://github.com/tianon/gosu/releases/download/${VERSION}/gosu-amd64" > "/usr/local/bin/gosu" -echo "$SHA256" "/usr/local/bin/gosu" | sha256sum --check -chmod u+x "/usr/local/bin/gosu" -mkdir -p "/opt/bitnami/licenses" -curl --silent -L "https://raw.githubusercontent.com/tianon/gosu/master/LICENSE" > "/opt/bitnami/licenses/gosu-${VERSION}.txt" diff --git a/bitnami/laravel/6/ol-7/prebuildfs/build/install-nami.sh b/bitnami/laravel/6/ol-7/prebuildfs/build/install-nami.sh deleted file mode 100755 index d8a59c381f6d..000000000000 --- a/bitnami/laravel/6/ol-7/prebuildfs/build/install-nami.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -curl --silent -L https://nami-prod.s3.amazonaws.com/tools/nami/releases/nami-1.0.0-1-linux-x64.tar.gz > /tmp/nami-linux-x64.tar.gz -echo "80488279b056d5e9c183fe34097c5f496715ab16a602afcc9f78d59f15139a16 /tmp/nami-linux-x64.tar.gz" | sha256sum --check -mkdir -p /opt/bitnami/nami /opt/bitnami/licenses -tar xzf /tmp/nami-linux-x64.tar.gz --strip 1 -C /opt/bitnami/nami && rm /tmp/nami-linux-x64.tar.gz -curl --silent -L https://raw.githubusercontent.com/bitnami/nami/master/COPYING > /opt/bitnami/licenses/nami-1.0.0-1.txt diff --git a/bitnami/laravel/6/ol-7/prebuildfs/build/install-tini.sh b/bitnami/laravel/6/ol-7/prebuildfs/build/install-tini.sh deleted file mode 100755 index 8376a36aee5f..000000000000 --- a/bitnami/laravel/6/ol-7/prebuildfs/build/install-tini.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -GPG_KEY="595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7" -GPG_KEY_FINGERPRINT="6380 DC42 8747 F6C3 93FE ACA5 9A84 159D 7001 A4E5" -SERVERS=("ha.pool.sks-keyservers.net" "hkp://p80.pool.sks-keyservers.net:80" "keyserver.ubuntu.com" "hkp://keyserver.ubuntu.com:80" "pgp.mit.edu") -VERSION="0.13.2" - -for server in "${SERVERS[@]}"; do - gpg --keyserver "$server" --recv-keys "$GPG_KEY" && break || : -done -gpg --fingerprint "$GPG_KEY" | grep -q "$GPG_KEY_FINGERPRINT" -curl --silent -L "https://github.com/krallin/tini/releases/download/v${VERSION}/tini.asc" > "/tmp/tini.asc" -curl --silent -L "https://github.com/krallin/tini/releases/download/v${VERSION}/tini" > "/usr/local/bin/tini" -gpg --verify "/tmp/tini.asc" "/usr/local/bin/tini" -chmod +x "/usr/local/bin/tini" -mkdir -p "/opt/bitnami/licenses" -curl --silent -L "https://raw.githubusercontent.com/krallin/tini/master/LICENSE" > "/opt/bitnami/licenses/tini-${VERSION}.txt" diff --git a/bitnami/laravel/6/ol-7/prebuildfs/install-nami.sh b/bitnami/laravel/6/ol-7/prebuildfs/install-nami.sh deleted file mode 100755 index d8a59c381f6d..000000000000 --- a/bitnami/laravel/6/ol-7/prebuildfs/install-nami.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -curl --silent -L https://nami-prod.s3.amazonaws.com/tools/nami/releases/nami-1.0.0-1-linux-x64.tar.gz > /tmp/nami-linux-x64.tar.gz -echo "80488279b056d5e9c183fe34097c5f496715ab16a602afcc9f78d59f15139a16 /tmp/nami-linux-x64.tar.gz" | sha256sum --check -mkdir -p /opt/bitnami/nami /opt/bitnami/licenses -tar xzf /tmp/nami-linux-x64.tar.gz --strip 1 -C /opt/bitnami/nami && rm /tmp/nami-linux-x64.tar.gz -curl --silent -L https://raw.githubusercontent.com/bitnami/nami/master/COPYING > /opt/bitnami/licenses/nami-1.0.0-1.txt diff --git a/bitnami/laravel/6/ol-7/prebuildfs/opt/bitnami/base/functions b/bitnami/laravel/6/ol-7/prebuildfs/opt/bitnami/base/functions deleted file mode 100644 index 6e9168c5577b..000000000000 --- a/bitnami/laravel/6/ol-7/prebuildfs/opt/bitnami/base/functions +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/bash - -[[ ${BASH_DEBUG:-false} = true ]] && set -x - -# Constants -MODULE="$(basename "$0")" -BITNAMI_PREFIX=/opt/bitnami - -# Color Palette -RESET='\033[0m' -BOLD='\033[1m' - -## Foreground -BLACK='\033[38;5;0m' -RED='\033[38;5;1m' -GREEN='\033[38;5;2m' -YELLOW='\033[38;5;3m' -BLUE='\033[38;5;4m' -MAGENTA='\033[38;5;5m' -CYAN='\033[38;5;6m' -WHITE='\033[38;5;7m' - -## Background -ON_BLACK='\033[48;5;0m' -ON_RED='\033[48;5;1m' -ON_GREEN='\033[48;5;2m' -ON_YELLOW='\033[48;5;3m' -ON_BLUE='\033[48;5;4m' -ON_MAGENTA='\033[48;5;5m' -ON_CYAN='\033[48;5;6m' -ON_WHITE='\033[48;5;7m' - -# Functions - -######################## -# Print to STDERR -# Arguments: -# Message to print -# Returns: -# None -######################### -stderr_print() { - printf "%b\\n" "${*}" >&2 -} - -######################## -# Log message -# Arguments: -# Message to log -# Returns: -# None -######################### -log() { - stderr_print "${NAMI_DEBUG:+${CYAN}${MODULE:-} ${MAGENTA}$(date "+%T.%2N ")}${RESET}${*}" -} -######################## -# Log an 'info' message -# Arguments: -# Message to log -# Returns: -# None -######################### -info() { - log "${GREEN}INFO ${RESET} ==> ${*}" -} -######################## -# Log message -# Arguments: -# Message to log -# Returns: -# None -######################### -warn() { - log "${YELLOW}WARN ${RESET} ==> ${*}" -} -######################## -# Log an 'error' message -# Arguments: -# Message to log -# Returns: -# None -######################### -error() { - log "${RED}ERROR${RESET} ==> ${*}" -} -######################## -# Print the welcome page -# Globals: -# DISABLE_WELCOME_MESSAGE -# BITNAMI_APP_NAME -# Arguments: -# None -# Returns: -# None -######################### -print_welcome_page() { - if [[ -z "${DISABLE_WELCOME_MESSAGE:-}" ]]; then - if [[ -n "$BITNAMI_APP_NAME" ]]; then - print_image_welcome_page - fi - fi -} -######################## -# Print the welcome page for a Bitnami Docker image -# Globals: -# BITNAMI_APP_NAME -# Arguments: -# None -# Returns: -# None -######################### -print_image_welcome_page() { - local github_url="https://github.com/bitnami/bitnami-docker-${BITNAMI_APP_NAME}" - - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "Send us your feedback at ${BOLD}containers@bitnami.com${RESET}" - log "" -} diff --git a/bitnami/laravel/6/ol-7/prebuildfs/opt/bitnami/base/helpers b/bitnami/laravel/6/ol-7/prebuildfs/opt/bitnami/base/helpers deleted file mode 100644 index da35a1975ec6..000000000000 --- a/bitnami/laravel/6/ol-7/prebuildfs/opt/bitnami/base/helpers +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /opt/bitnami/base/functions - -######################## -# Helper function to initialize a single nami module -# Arguments: -# Module to initialize -# Returns: -# None -# Description: -# Initialize an unpacked nami module with the `nami initialize` command. -# Command arguments can be specified as function argumnts after the module name. -# `--log-level trace` flag is added to the command if `NAMI_DEBUG` env variable exists. -# The log level can be overriden using the `NAMI_LOG_LEVEL` env variable. -######################### -nami_initialize_one() { - local module="${1:?module not specified}" - if nami inspect $module | grep -q '"lifecycle": "unpacked"'; then - local inputs= - if [[ -f "/${module}-inputs.json" ]]; then - inputs="--inputs-file=/${module}-inputs.json" - fi - nami ${NAMI_DEBUG:+--log-level ${NAMI_LOG_LEVEL:-trace}} initialize $module $inputs "${@:2}" - fi -} - -######################## -# Helper function to initialize one or more nami modules -# Arguments: -# Module to initialize -# Returns: -# None -######################### -nami_initialize() { - local module="${1:?module not specified}" - for module in "${@}"; do - nami_initialize_one $module - done -} diff --git a/bitnami/laravel/6/ol-7/prebuildfs/usr/local/bin/bitnami-pkg b/bitnami/laravel/6/ol-7/prebuildfs/usr/local/bin/bitnami-pkg deleted file mode 100755 index 78951f91f647..000000000000 --- a/bitnami/laravel/6/ol-7/prebuildfs/usr/local/bin/bitnami-pkg +++ /dev/null @@ -1,211 +0,0 @@ -#!/bin/bash -e -. /opt/bitnami/base/functions - -print_usage() { - log "Usage: bitnami-pkg - [OPTIONS] -- [ARGS]" - log "" - log "Download and install Bitnami packages" - log "" - log "Commands:" - log " install Download and install a package." - log " unpack Download and unpack a package." - log "" - log "Options:" - log " -b, --bucket Package release bucket (default: stacksmith)." - log " -c, --checksum SHA256 verification checksum." - log " -h, --help Show this help message and exit." - log "" - log "If the package is already available in the /tmp/bitnami/pkg/cache/" - log "directory, the download will be skipped. If there is a corresponding" - log "file of the same name post-fixed with .sha256 in the directory," - log "that sha will be used instead of the --checksum option." - log "" - log "Examples:" - log " - Unpack package" - log " \$ bitnami-pkg unpack nginx-1.9.10-0" - log "" - log " - Verify and Install package" - log " \$ bitnami-pkg install nginx-1.9.10-0 --checksum 15565d06b18c2e3710fc08e579ddb3d0e39aa663264a0f7404f0743cb4cdb58d" - log "" - log " - Install package with arguments" - log " \$ bitnami-pkg install mariadb-10.1.11-0 -- --password bitnami" - log "" - log " - Install package from testing" - log " \$ bitnami-pkg install mariadb-10.1.11-0 --bucket testing" - log "" -} - -identify_distro() { - distro="${IMAGE_OS:-unknown}" - if [ "${distro}" == "unknown" -a -f /etc/os-release ]; then - distro="$(grep "^ID=" /etc/os-release | cut -d'=' -f2 | cut -d'"' -f2)-$(grep "^VERSION_ID=" /etc/os-release | cut -d'=' -f2 | cut -d'"' -f2 | cut -d'.' -f1)" - fi - echo "$distro" -} - -identify_arch() { - local arch=$(uname -m) - - case "${arch}" in - ppc64le) - ;; # no-op - x86_64) - case $(identify_distro) in - debian-*) - arch=amd64 - ;; - ol-*) - arch=x86_64 - ;; - centos-*) - arch=x86_64 - ;; - rhel-*) - arch=x86_64 - ;; - photon-*) - arch=x86_64 - ;; - esac - ;; - *) - arch="unknown" - ;; - esac - echo $arch -} - -# break up command line for easy parsing and check legal options -ARGS=$(getopt -o b:c:h -l "bucket:,checksum:,help" -n "bitnami-pkg" -- "$@") -if [ $? -ne 0 ]; -then - exit 1 -fi - -eval set -- "$ARGS"; -while true; do - case "$1" in - -b|--bucket) - shift - if [ -n "$1" ]; then - RELEASE_BUCKET=$1 - shift - fi - ;; - -c|--checksum) - shift - if [ -n "$1" ]; then - PACKAGE_SHA256=$1 - shift - fi - ;; - -h|--help) - print_usage - exit 0 - ;; - --) - shift - break - ;; - esac -done - -# weed out unrecognized commands -case "$1" in - install|unpack) ;; - *) - error "Unrecognized command: $1" - print_usage - exit 1 - ;; -esac - -# install/unpack command need to be supplied a package name -if [ $# -lt 2 ]; then - print_usage - exit 1 -fi - -INSTALL_ROOT=/tmp/bitnami/pkg/install -CACHE_ROOT=/tmp/bitnami/pkg/cache - -PACKAGE="$2-linux-$(identify_arch)-$(identify_distro)" -PACKAGE_ARGS=${@:3} -PACKAGE_NAME=$(echo $PACKAGE | sed 's/-[0-9].*//') -RELEASE_BUCKET=${RELEASE_BUCKET:-stacksmith} - -mkdir -p $INSTALL_ROOT -cd $INSTALL_ROOT - -info "Downloading $PACKAGE package" -if [ -f $CACHE_ROOT/$PACKAGE.tar.gz ]; then - info "$CACHE_ROOT/$PACKAGE.tar.gz already exists, skipping download." - cp $CACHE_ROOT/$PACKAGE.tar.gz . - if [ -f $CACHE_ROOT/$PACKAGE.tar.gz.sha256 ]; then - info "Using the local sha256 from $CACHE_ROOT/$PACKAGE.tar.gz.sha256" - PACKAGE_SHA256=$(cat $CACHE_ROOT/$PACKAGE.tar.gz.sha256) - fi -else - # display cURL progress bar when a tty is attached - if tty -s; then - CURL_ARGS="-#" - else - CURL_ARGS="-sS" - fi - if ! curl $CURL_ARGS -LOf "https://downloads.bitnami.com/files/$RELEASE_BUCKET/$PACKAGE.tar.gz"; then - warn "Package name '$PACKAGE' does not exist, will try '${PACKAGE%-$(identify_distro)}'..." - if curl $CURL_ARGS -LOf "https://downloads.bitnami.com/files/$RELEASE_BUCKET/${PACKAGE%-$(identify_distro)}.tar.gz"; then - PACKAGE="${PACKAGE%-$(identify_distro)}" - else - error "Could not find the requested package..." - exit 1 - fi - fi -fi - -if ! tar tzf $PACKAGE.tar.gz >/dev/null 2>&1; then - error "Invalid or corrupt '$PACKAGE' package." - exit 1 -fi - -if [ "$PACKAGE_SHA256" ]; then - info "Verifying package integrity" - echo "$PACKAGE_SHA256 $PACKAGE.tar.gz" | sha256sum -c - -fi - -# If the tarball has too many files, it can trigger a bug -# in overlayfs when using tar. Install bsdtar in the container image -# to workaround it. As the overhead is too big (~40 MB), it is not added by -# default. Source: https://github.com/coreos/bugs/issues/1095 -if which bsdtar > /dev/null; then - bsdtar -xf $PACKAGE.tar.gz -else - tar xzf $PACKAGE.tar.gz -fi - -case "$1" in - install) info "Installing $PACKAGE" ;; - unpack) info "Unpacking $PACKAGE" ;; -esac -nami $1 $PACKAGE $PACKAGE_ARGS - -rm -rf $INSTALL_ROOT - -if [ "$BITNAMI_PKG_EXTRA_DIRS" ]; then - info "Creating extra directories" - for i in ${BITNAMI_PKG_EXTRA_DIRS}; do - mkdir -p $i - done -fi - -if [ "$BITNAMI_PKG_CHMOD" ]; then - DIRS="/.nami /bitnami $BITNAMI_PKG_EXTRA_DIRS" - if ! [[ $PACKAGE_NAME =~ .*-client ]]; then - mkdir -p /bitnami/$PACKAGE_NAME - fi - # We need to be in $HOME in order to nami inspect works - cd $HOME - DIRS+=" $(nami inspect $PACKAGE_NAME | grep -e '"installdir"' | cut -f4 -d\")" - info "Fixing permissions: chmod $BITNAMI_PKG_CHMOD $DIRS" - chmod $BITNAMI_PKG_CHMOD $DIRS -fi diff --git a/bitnami/laravel/6/ol-7/prebuildfs/usr/local/bin/install_packages b/bitnami/laravel/6/ol-7/prebuildfs/usr/local/bin/install_packages deleted file mode 100755 index 370f3516f403..000000000000 --- a/bitnami/laravel/6/ol-7/prebuildfs/usr/local/bin/install_packages +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -set -eu - -if [[ -n "oracle-epel-release-el7" ]]; then - if ! yum list installed oracle-epel-release-el7 >/dev/null 2>&1; then - yum -y install oracle-epel-release-el7 >/dev/null 2>&1 - CODE=$? - if (( $CODE != 0 )); then - echo "EPEL repository installation failed" - exit $CODE - fi - fi -fi - -max=2 -for ((n = 1 ; n <= max ; n+=1 )); do - set +e - yum --enablerepo base,updates,ol7_developer_EPEL,ol7_optional_latest install -y "$@" - CODE=$? - set -e - if (( $CODE == 0 )); then - break - fi - if (( $n == $max )); then - exit $CODE - fi - echo "yum failed, retrying" -done -rm -r /var/cache/yum diff --git a/bitnami/laravel/6/ol-7/rootfs/app-entrypoint.sh b/bitnami/laravel/6/ol-7/rootfs/app-entrypoint.sh deleted file mode 100755 index 7c40c05cdf32..000000000000 --- a/bitnami/laravel/6/ol-7/rootfs/app-entrypoint.sh +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/bash - -set -o errexit -set -o pipefail -# set -o xtrace - -# Load libraries -# shellcheck disable=SC1091 -. /opt/bitnami/base/functions - -# Constants -INIT_SEM=/tmp/initialized.sem - -# Functions - -######################## -# Replace a regex in a file -# Arguments: -# $1 - filename -# $2 - match regex -# $3 - substitute regex -# $4 - regex modifier -# Returns: none -######################### -replace_in_file() { - local filename="${1:?filename is required}" - local match_regex="${2:?match regex is required}" - local substitute_regex="${3:?substitute regex is required}" - local regex_modifier="${4:-}" - local result - - # We should avoid using 'sed in-place' substitutions - # 1) They are not compatible with files mounted from ConfigMap(s) - # 2) We found incompatibility issues with Debian10 and "in-place" substitutions - result="$(sed "${regex_modifier}s@${match_regex}@${substitute_regex}@g" "$filename")" - echo "$result" > "$filename" -} - -######################## -# Wait for database to be ready -# Globals: -# DATABASE_HOST -# DB_PORT -# Arguments: none -# Returns: none -######################### -wait_for_db() { - local db_host="${DB_HOST:-mariadb}" - local db_port="${DB_PORT:-3306}" - local db_address=$(getent hosts "$db_host" | awk '{ print $1 }') - counter=0 - log "Connecting to mariadb at $db_address" - while ! curl --silent "$db_address:$db_port" >/dev/null; do - counter=$((counter+1)) - if [ $counter == 30 ]; then - log "Error: Couldn't connect to mariadb." - exit 1 - fi - log "Trying to connect to mariadb at $db_address. Attempt $counter." - sleep 5 - done -} - -######################## -# Setup the database configuration -# Arguments: none -# Returns: none -######################### -setup_db() { - log "Configuring the database" - replace_in_file "/app/config/database.php" "utf8mb4" "utf8" - php artisan migrate --force -} - -print_welcome_page - -if [ "${1}" == "php" -a "$2" == "artisan" -a "$3" == "serve" ]; then - if [[ ! -f /app/config/database.php ]]; then - log "Creating laravel application" - cp -a /tmp/app/. /app/ - fi - - log "Installing/Updating Laravel dependencies (composer)" - if [[ ! -f /app/vendor ]]; then - composer install - log "Dependencies installed" - else - composer update - log "Dependencies updated" - fi - - wait_for_db - - if [[ -f $INIT_SEM ]]; then - echo "#########################################################################" - echo " " - echo " App initialization skipped: " - echo " Delete the file $INIT_SEM and restart the container to reinitialize " - echo " You can alternatively run specific commands using docker-compose exec " - echo " e.g docker-compose exec myapp php artisan make:console FooCommand " - echo " " - echo "#########################################################################" - else - setup_db - log "Initialization finished" - touch $INIT_SEM - fi -fi - -exec tini -- "$@"