Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 11f56726d5 | |||
| ff9fb250a2 |
+1
-3
@@ -7,7 +7,7 @@ entropysrv=$(mktemp)
|
|||||||
createrepo=$(mktemp)
|
createrepo=$(mktemp)
|
||||||
REPOSITORY_NAME="${REPOSITORY_NAME:-default}"
|
REPOSITORY_NAME="${REPOSITORY_NAME:-default}"
|
||||||
REPOSITORY_DESCRIPTION="${REPOSITORY_DESCRIPTION:-My Sabayon repository}"
|
REPOSITORY_DESCRIPTION="${REPOSITORY_DESCRIPTION:-My Sabayon repository}"
|
||||||
DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/builder-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}"
|
||||||
|
|
||||||
@@ -44,8 +44,6 @@ cat >$createrepo <<EOF
|
|||||||
set -e
|
set -e
|
||||||
built_pkgs=\$(find /usr/portage/packages -name "*.tbz2" | xargs)
|
built_pkgs=\$(find /usr/portage/packages -name "*.tbz2" | xargs)
|
||||||
repo="\${REPOSITORY:-default}"
|
repo="\${REPOSITORY:-default}"
|
||||||
|
|
||||||
equo i entropy-server
|
|
||||||
mkdir -p /sabayon/artifacts
|
mkdir -p /sabayon/artifacts
|
||||||
|
|
||||||
[[ -z "\${built_pkgs}" ]] && echo "ERROR: no tbz2s found" && exit 2
|
[[ -z "\${built_pkgs}" ]] && echo "ERROR: no tbz2s found" && exit 2
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ check_docker_requirements(){
|
|||||||
if [ "$(id -u)" != "0" ]; then
|
if [ "$(id -u)" != "0" ]; then
|
||||||
groups | grep -q docker || echo "--> If you are not running the script as root, your user should be in the docker group to use it. (sudo gpasswd -a $USER docker)"
|
groups | grep -q docker || echo "--> If you are not running the script as root, your user should be in the docker group to use it. (sudo gpasswd -a $USER docker)"
|
||||||
fi
|
fi
|
||||||
ps aux | grep -q '[d]ocker' || echo "--> Be sure to have the docker daemon running (sudo systemctl start docker)"
|
ps aux | grep -q '[d]ocker' || echo "--> Be sure to have the docker daemon running (sudo systemctl start docker) of configure it to run on boot (sudo systemctl enable docker). Trying to start it anyway" && sudo systemctl start docker
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
|||||||
Reference in New Issue
Block a user