diff options
| author | Riku Voipio <riku.voipio@linaro.org> | 2017-04-18 18:46:09 +0300 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2017-04-18 18:46:09 +0300 |
| commit | 0dbc4a4a9825b6cc4d882c0cd52f7d51e149c96c (patch) | |
| tree | 288797765df3493932b8c559e7a3c72854a649ad /stretch-arm64-obsworker | |
| parent | 45a3842ab5fe9d34a6eaab6ae2e040ed7ab69c01 (diff) | |
obsworker: allow setting port and use tmpfs
since lots of build time goes into fsync() during
apt-get install, use the existing tmpfs option. Also
allow setting listening port.
These changes are needed by the ansible review in flight.
Change-Id: I3489af3a54e9e82edc37f3b9b6ee060bf6fbab19
Diffstat (limited to 'stretch-arm64-obsworker')
| -rw-r--r-- | stretch-arm64-obsworker/Dockerfile | 5 | ||||
| -rwxr-xr-x | stretch-arm64-obsworker/start-obsworker | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/stretch-arm64-obsworker/Dockerfile b/stretch-arm64-obsworker/Dockerfile index 8aa4ce8b..4ac661f3 100644 --- a/stretch-arm64-obsworker/Dockerfile +++ b/stretch-arm64-obsworker/Dockerfile @@ -1,7 +1,5 @@ FROM linaro/base-arm64-debian:stretch -COPY start-obsworker / - RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ apt-utils \ @@ -26,5 +24,6 @@ RUN apt-get update \ /tmp/* \ /var/tmp/* -EXPOSE 5454 +COPY start-obsworker / + CMD ["/start-obsworker"] diff --git a/stretch-arm64-obsworker/start-obsworker b/stretch-arm64-obsworker/start-obsworker index 6245e22b..3788a0aa 100755 --- a/stretch-arm64-obsworker/start-obsworker +++ b/stretch-arm64-obsworker/start-obsworker @@ -8,4 +8,9 @@ echo $OBS_IP $OBS_SERVER >> /etc/hosts curl -s "http://$OBS_SERVER:5252/getworkercode" | cpio --quiet --extract ln -s . XML -exec /usr/bin/perl -w ./bs_worker --hardstatus --port 5454 --root /srv/obs/worker/root_1 --statedir /srv/obs/run/worker/1 --id `hostname`:1 --reposerver http://$OBS_SERVER:5252 --jobs $OBS_JOBS +if [ ! -z $OBS_TMPFS ] +then + extra_args="--vmdisk-rootsize $OBS_TMPFS --tmpfs" +fi + +exec /usr/bin/perl -w ./bs_worker --hardstatus --port $OBS_PORT --root /srv/obs/worker/root_1 --statedir /srv/obs/run/worker/1 --id `hostname`:1 --reposerver http://$OBS_SERVER:5252 --jobs $OBS_JOBS $extra_args |