Mercurial > hg
changeset 27245:cea1473ba468 stable
dockerlib: short form for non-unique uid/gid for CentOS 5 compat (issue4977)
CentOS 5 does not support '--non-unique', but does support the short '-o'.
| author | Mathias De Maré <mathias.demare@gmail.com> |
|---|---|
| date | Mon, 07 Dec 2015 17:39:31 +0100 |
| parents | 10695f8f3323 |
| children | 42aa0e570eaa 59d5f619e69e |
| files | contrib/dockerlib.sh |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/dockerlib.sh Thu Dec 03 01:38:21 2015 +0100 +++ b/contrib/dockerlib.sh Mon Dec 07 17:39:31 2015 +0100 @@ -35,8 +35,8 @@ # running docker. This is *very likely* to fail at some point. echo RUN useradd $DBUILDUSER -u 1000 else - echo RUN groupadd $DBUILDUSER -g `id -g` --non-unique - echo RUN useradd $DBUILDUSER -u `id -u` -g $DBUILDUSER --non-unique + echo RUN groupadd $DBUILDUSER -g `id -g` -o + echo RUN useradd $DBUILDUSER -u `id -u` -g $DBUILDUSER -o fi ) | $DOCKER build --tag $CONTAINER - }