Show More
@@ -38,5 +38,5 b' function initcontainer() {' | |||||
38 | echo RUN groupadd $DBUILDUSER -g `id -g` -o |
|
38 | echo RUN groupadd $DBUILDUSER -g `id -g` -o | |
39 | echo RUN useradd $DBUILDUSER -u `id -u` -g $DBUILDUSER -o |
|
39 | echo RUN useradd $DBUILDUSER -u `id -u` -g $DBUILDUSER -o | |
40 | fi |
|
40 | fi | |
41 | ) | $DOCKER build --tag $CONTAINER - |
|
41 | ) | $DOCKER build --build-arg http_proxy --build-arg https_proxy --tag $CONTAINER - | |
42 | } |
|
42 | } |
@@ -16,10 +16,10 b' RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM' | |||||
16 | contrib/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $* |
|
16 | contrib/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $* | |
17 |
|
17 | |||
18 | DSHARED=/mnt/shared |
|
18 | DSHARED=/mnt/shared | |
19 | $DOCKER run -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \ |
|
19 | $DOCKER run -e http_proxy -e https_proxy -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \ | |
20 | rpmbuild --define "_topdir $DSHARED" -ba $DSHARED/SPECS/mercurial.spec --clean |
|
20 | rpmbuild --define "_topdir $DSHARED" -ba $DSHARED/SPECS/mercurial.spec --clean | |
21 |
|
21 | |||
22 | $DOCKER run -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \ |
|
22 | $DOCKER run -e http_proxy -e https_proxy -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \ | |
23 | createrepo $DSHARED |
|
23 | createrepo $DSHARED | |
24 |
|
24 | |||
25 | cat << EOF > $RPMBUILDDIR/mercurial.repo |
|
25 | cat << EOF > $RPMBUILDDIR/mercurial.repo |
General Comments 0
You need to be logged in to leave comments.
Login now