diff options
| author | Elan Ruusamäe | 2021-03-10 22:45:27 (GMT) |
|---|---|---|
| committer | Elan Ruusamäe | 2021-03-10 23:10:58 (GMT) |
| commit | ebceaeef21dc503a366cf958048968fdf1e47ba3 (patch) | |
| tree | a259262973bbb7345821c22493ebb914998c2b1b | |
| parent | 03501aec5dafa8f438087bacd185a63ecf6e57b0 (diff) | |
| download | cleanbuild-ebceaeef21dc503a366cf958048968fdf1e47ba3.zip cleanbuild-ebceaeef21dc503a366cf958048968fdf1e47ba3.tar.gz | |
Create container with docker-compose
Using docker compose is more easier to do overrides
using docker-compose.override.yml file.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | bin/cleanbuild-docker.sh | 18 | ||||
| -rw-r--r-- | docker-compose.yml | 15 |
3 files changed, 23 insertions, 11 deletions
@@ -2,3 +2,4 @@ *.sw[o-p] /cache/ /rpm/ +/docker-compose.override.yml diff --git a/bin/cleanbuild-docker.sh b/bin/cleanbuild-docker.sh index b7259fc..d0f9747 100755 --- a/bin/cleanbuild-docker.sh +++ b/bin/cleanbuild-docker.sh @@ -56,17 +56,13 @@ create_container() { install -d $topdir/logs # start the container - docker run --name=$name -d \ - -w $home \ - -v $topdir:$home/rpm \ - -v $dir:$home/cleanbuild \ - -v $dir/cache/poldek:/var/cache/poldek \ - -v $dir/cache/ccache/$PACKAGE_NAME:$home/.ccache \ - --label=cleanbuild=$name \ - $(tmpfs) \ - $image >/dev/null - - # set the homedir + TMPFS_SIZE=$TMPFS \ + PACKAGE_NAME=$PACKAGE_NAME \ + docker-compose run --rm -d \ + --name=$name \ + --label=cleanbuild=$PACKAGE_NAME \ + cleanbuild + docker exec --user=root -w / $name usermod -d $home builder # these paths need to be accessible for builder diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..7bb6a55 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,15 @@ +version: "3.8" + +services: + cleanbuild: + image: registry.gitlab.com/pld-linux/cleanbuild + working_dir: /home/builder + volumes: + - ./rpm:/home/builder/rpm + - ./:/home/builder/cleanbuild + - ./cache/poldek:/var/cache/poldek + - ./cache/ccache/$PACKAGE_NAME:/home/builder/.ccache + tmpfs: + - /home/builder/rpm/BUILD:exec,nosuid,nodev,size=$TMPFS_SIZE + +# vim:ts=2:sw=2:et |