diff --git a/.ci/build b/.ci/build index cafb876..58377c7 100755 --- a/.ci/build +++ b/.ci/build @@ -68,6 +68,20 @@ function execute-isolated() { if [[ "$1" == cabal* ]] ; then execute-isolated "$@" # execute the cabal command +elif [[ "$1" == 'shell' ]] + then + echo "+ execute-isolated $*" + exec docker run -it -u"$(id -u):$(id -g)" \ + -v $CABAL_CACHE_DIR:$HOME/.cabal \ + -v $CABAL_CACHE_DIR:/.cabal \ + -v $DIST_NEWSTYLE_DIR:$WORKDIR/dist-newstyle/ \ + -v $WORKDIR:$WORKDIR \ + -v $CHROOT_DIR:/chroot-env/ \ + -e OVERRIDE_CHROOT_DIR=/chroot-env \ + -e HOME=$HOME \ + --entrypoint /bin/bash \ + --workdir $WORKDIR \ + dquadrant/cardano-ci else ## default build execute-isolated 'cabal build exe:kuber && bash -e ./.ci/copy-libraries.sh' diff --git a/.dockerignore b/.dockerignore index 7f29364..09fd87c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,5 @@ * -!./dist-newstyle/build/docker \ No newline at end of file +!./dist-newstyle/build/docker/chroot-env +!./.ci +!./playground +./playground/node_modules \ No newline at end of file diff --git a/README.md b/README.md index 92fd281..7217d23 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Kuber can be stared easily with [docker-compose.yml](./docker-compose.yml) file. ```bash git clone https://github.com/dquadrant/kuber.git -git checkout 2.2.0 +git checkout 2.3.0 docker-compose up -d ``` diff --git a/kuber.cabal b/kuber.cabal index 3587fd5..8c4612b 100644 --- a/kuber.cabal +++ b/kuber.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: kuber -version: 2.1.0.0 +version: 2.3.0.0 -- A short (one-line) description of the package. -- synopsis: diff --git a/server/kuber-server.cabal b/server/kuber-server.cabal index e13455a..acc40b4 100644 --- a/server/kuber-server.cabal +++ b/server/kuber-server.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: kuber-server -version: 2.1.0.0 +version: 2.3.0.0 -- A short (one-line) description of the package. -- synopsis: