Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e07cb53932 | |||
| 51d7bdc968 | |||
| 79d3d5d4b5 |
@@ -56,12 +56,11 @@ sub package_deps {
|
|||||||
# leading to duplicates. The sanest thing to do is dedup the list. This gives the superset of all
|
# leading to duplicates. The sanest thing to do is dedup the list. This gives the superset of all
|
||||||
# possible dependencies, which isn't perfectly accurate but should be good enough. For completely
|
# possible dependencies, which isn't perfectly accurate but should be good enough. For completely
|
||||||
# accurate results, pass in a versioned atom.
|
# accurate results, pass in a versioned atom.
|
||||||
@dependencies =
|
@dependencies = uniq(
|
||||||
uniq
|
|
||||||
sort
|
sort
|
||||||
grep { $_ }
|
grep { $_ }
|
||||||
map { $_ =~ s/\[.*\]|\s//g; &atom($_) if $atom; $_ }
|
map { $_ =~ s/\[.*\]|\s//g; &atom($_) if $atom; $_ }
|
||||||
@dependencies;
|
@dependencies);
|
||||||
|
|
||||||
$cache{$cache_key} = \@dependencies;
|
$cache{$cache_key} = \@dependencies;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -88,6 +89,6 @@ 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 run $DOCKER_OPTS --entrypoint /bin/bash ${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
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -86,6 +87,6 @@ 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 run $DOCKER_OPTS --entrypoint /bin/bash ${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
|
||||||
|
|||||||
Reference in New Issue
Block a user