Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a37db57b82 | |||
| 88fb0d890a |
@@ -8,6 +8,7 @@ MAKE_CONF="${MAKE_CONF:-$SAB_WORKSPACE/specs/make.conf}"
|
|||||||
OUTPUT_DIR="${OUTPUT_DIR:-$SAB_WORKSPACE/portage_artifacts/}"
|
OUTPUT_DIR="${OUTPUT_DIR:-$SAB_WORKSPACE/portage_artifacts/}"
|
||||||
LOCAL_OVERLAY="${LOCAL_OVERLAY:-$SAB_WORKSPACE/local_overlay}"
|
LOCAL_OVERLAY="${LOCAL_OVERLAY:-$SAB_WORKSPACE/local_overlay}"
|
||||||
ENTROPY_REPOSITORY="${ENTROPY_REPOSITORY:-main}" # Can be weekly, main, testing
|
ENTROPY_REPOSITORY="${ENTROPY_REPOSITORY:-main}" # Can be weekly, main, testing
|
||||||
|
DOCKER_OPTS="${DOCKER_OPTS:--ti --rm}"
|
||||||
|
|
||||||
. /sbin/sabayondevkit-functions.sh
|
. /sbin/sabayondevkit-functions.sh
|
||||||
|
|
||||||
@@ -55,6 +56,6 @@ fi
|
|||||||
|
|
||||||
echo "Spawning the package builder container for '$@'."
|
echo "Spawning the package builder container for '$@'."
|
||||||
echo ""
|
echo ""
|
||||||
echo "docker run --rm ${docker_env[@]} ${docker_volumes[@]} -ti $DOCKER_IMAGE $@"
|
echo "docker run $DOCKER_OPTS ${docker_env[@]} ${docker_volumes[@]} $DOCKER_IMAGE $@"
|
||||||
|
|
||||||
docker run --rm "${docker_env[@]}" "${docker_volumes[@]}" -ti $DOCKER_IMAGE $@
|
docker run $DOCKER_OPTS "${docker_env[@]}" "${docker_volumes[@]}" $DOCKER_IMAGE $@
|
||||||
|
|||||||
+3
-2
@@ -10,6 +10,7 @@ REPOSITORY_DESCRIPTION="${REPOSITORY_DESCRIPTION:-My Sabayon repository}"
|
|||||||
DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/eit-amd64}"
|
DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/eit-amd64}"
|
||||||
PORTAGE_ARTIFACTS="${PORTAGE_ARTIFACTS:-$SAB_WORKSPACE/portage_artifacts}"
|
PORTAGE_ARTIFACTS="${PORTAGE_ARTIFACTS:-$SAB_WORKSPACE/portage_artifacts}"
|
||||||
OUTPUT_DIR="${OUTPUT_DIR:-$SAB_WORKSPACE/entropy_artifacts}"
|
OUTPUT_DIR="${OUTPUT_DIR:-$SAB_WORKSPACE/entropy_artifacts}"
|
||||||
|
DOCKER_OPTS="${DOCKER_OPTS:--ti --rm}"
|
||||||
|
|
||||||
args=("$@")
|
args=("$@")
|
||||||
EDITOR=cat
|
EDITOR=cat
|
||||||
@@ -95,9 +96,9 @@ function cleanup {
|
|||||||
|
|
||||||
trap cleanup EXIT
|
trap cleanup EXIT
|
||||||
|
|
||||||
echo "docker run --rm --entrypoint /bin/bash ${docker_env[@]} ${docker_volumes[@]} -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh"
|
echo "docker $DOCKER_OPTS ${docker_env[@]} ${docker_volumes[@]} $DOCKER_IMAGE /sabayon/bin/create_repo.sh"
|
||||||
|
|
||||||
docker run --rm --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true
|
docker run $DOCKER_OPTS --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true
|
||||||
|
|
||||||
if [ -d "$OUTPUT_DIR/standard" ]; then
|
if [ -d "$OUTPUT_DIR/standard" ]; then
|
||||||
echo "The Sabayon repository files are in $SAB_WORKSPACE/entropy_artifacts"
|
echo "The Sabayon repository files are in $SAB_WORKSPACE/entropy_artifacts"
|
||||||
|
|||||||
Reference in New Issue
Block a user