Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
abuild
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
25
Issues
25
List
Boards
Labels
Service Desk
Milestones
Merge Requests
17
Merge Requests
17
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
abuild
Commits
545eed3a
Commit
545eed3a
authored
Sep 27, 2017
by
Timo Teräs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
abuild: rootbld: reflect build branch in the builder hostname
parent
4736a56c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
9 deletions
+7
-9
abuild.in
abuild.in
+7
-9
No files found.
abuild.in
View file @
545eed3a
...
...
@@ -2078,6 +2078,12 @@ rootbld() {
cp
/
etc
/
abuild
.
conf
/
etc
/
group
/
etc
/
passwd
"$BUILD_ROOT/etc"
cp
/
etc
/
apk
/
keys
/*
"$BUILD_ROOT/etc/apk/keys"
local
version
=
"edge"
buildhost
=
"edge"
gitref
if
gitref
=
"$(expr "
$(
git
symbolic
-
ref
--
short
HEAD
)
" : '\([0-9]\+\(\.[0-9]\+\)*\)-')"
;
then
version
=
v
${
gitref
}
buildhost
=${
gitref
/./-}
fi
local
repo_template
=$
aportsgit
/$
repo
/.
rootbld
-
repositories
[
-
s
"$repo_template"
]
||
die
"rootbld: $repo_template does not exist"
(
...
...
@@ -2090,14 +2096,6 @@ rootbld() {
export
mirror
version
[
"$mirror"
]
||
mirror
=
http
://
dl
-
cdn
.
alpinelinux
.
org
/
alpine
if
[
-
z
"$version"
];
then
version
=$(
git
symbolic
-
ref
--
short
HEAD
)
[
"$version"
]
&&
\
version
=$(
expr
"$version"
:
'\([0-9]\+\(\.[0-9]\+\)*\)-'
)
&&
\
version
=
v
${
version
}
[
"$version"
]
||
version
=
edge
fi
envsubst
echo
"$REPODEST/$repo"
)
<
"$repo_template"
>
"$BUILD_ROOT/etc/apk/repositories"
...
...
@@ -2119,7 +2117,7 @@ rootbld() {
--
bind
"$BUILD_ROOT/tmp/pkg"
"$pkgbasedir"
\
--
bind
"$BUILD_ROOT/tmp"
/
tmp
\
--
bind
"$REPODEST"
"$REPODEST"
\
--
hostname
"build-
edge
-$CARCH"
\
--
hostname
"build-
$buildhost
-$CARCH"
\
--
chdir
"$startdir"
\
--
setenv
PATH
/
bin
:/
usr
/
bin
:/
sbin
:/
usr
/
sbin
\
/
usr
/
bin
/
abuild
$
force
rootbld_actions
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment