diff --git a/hooks/00-create-changelog-prebuild b/hooks/05-create-changelog-prebuild similarity index 100% rename from hooks/00-create-changelog-prebuild rename to hooks/05-create-changelog-prebuild diff --git a/hooks/00-install-build-depends-prebuild b/hooks/10-install-build-depends-prebuild similarity index 100% rename from hooks/00-install-build-depends-prebuild rename to hooks/10-install-build-depends-prebuild diff --git a/lib/util.sh b/lib/util.sh index 9faca65..d58cfe3 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -71,7 +71,7 @@ function exec_hooks { local hook=${1} local workspace=${2} - local hook_scripts=$( find "${HOOKS_DIR}" -type f -name "*${hook}" -executable) + local hook_scripts=$( find "${HOOKS_DIR}" -type f -name "*${hook}" -executable | sort ) for hook_script in ${hook_scripts}; do diff --git a/package.sh b/package.sh index 5b503ac..f2fcd2c 100755 --- a/package.sh +++ b/package.sh @@ -92,6 +92,9 @@ function main { # Expose host uid & gid docker_opt="${docker_opt} -e HOST_UID=$(id -u) -e HOST_GID=$(id -g)" + # Expose host proxy variables + docker_opt="${docker_opt} -e HTTP_PROXY=${HTTP_PROXY} -e HTTPS_PROXY=${HTTPS_PROXY}" + docker_opt="${docker_opt} -e http_proxy=${http_proxy} -e https_proxy=${https_proxy}" if [[ ${PERSIST_CONTAINER} -eq 0 ]] then diff --git a/src-example/scripts/pre-build.sh b/src-example/scripts/pre-build.sh deleted file mode 100755 index 521fa54..0000000 --- a/src-example/scripts/pre-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - - -mkdir -p $DESTDIR/opt/hello-world -cp $SRCDIR/hello-world $DESTDIR/opt/hello-world/ diff --git a/src-example/scripts/pre-install.sh b/src-example/scripts/pre-install.sh deleted file mode 100644 index b7007f7..0000000 --- a/src-example/scripts/pre-install.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -echo "Test pre-install" diff --git a/src-example/tamarin.json b/src-example/tamarin.json deleted file mode 100644 index be7a6b0..0000000 --- a/src-example/tamarin.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "hello-world", - "dependencies": { - "debian:jessie": { - "apache2": ">= 2.4", - "php5": ">= 5.4" - } - }, - "hooks": { - "preBuild": "./scripts/pre-build.sh", - "preInstall": "./scripts/pre-install.sh", - "preRemove": "", - "postInstall": "", - "postRemove": "" - } -}