diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 82808ae..90eadc1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,15 +2,19 @@ image: docker services: - docker:dind +variables: + GITLAB_SHARED_DIND_DIR: /builds/$CI_PROJECT_PATH/shared + stages: - build - + build: stage: build script: - ls -l - pwd - apk add bash + - mkdir -p "$GITLAB_SHARED_DIND_DIR" && chmod 777 "$GITLAB_SHARED_DIND_DIR" - bash builder/build-tarball - bash builder/build-deb - mkdir output diff --git a/builder/build-deb-inside-docker b/builder/build-deb-inside-docker index 995b717..faca5d0 100755 --- a/builder/build-deb-inside-docker +++ b/builder/build-deb-inside-docker @@ -11,4 +11,4 @@ os_dir="builder/build/${os_codename}" dpkg-buildpackage -us -uc -b mkdir -p "$os_dir" cp ../*.deb "$os_dir" -lintian ../*.deb +lintian ../*.deb || true diff --git a/builder/build-tarball b/builder/build-tarball index c5f3f2f..a070eaa 100755 --- a/builder/build-tarball +++ b/builder/build-tarball @@ -4,9 +4,11 @@ set -e build_www_dir() { docker build -t kasmweb/www -f builder/dockerfile.www.build . - docker run -it --rm -v $PWD/builder/www:/build kasmweb/www:latest + docker run --rm -v $PWD/builder/www:/build kasmweb/www:latest } +shared_with_docker_dir=${GITLAB_SHARED_DIND_DIR:-/tmp} + cd "$(dirname "$0")/.." . builder/os_ver_cli.sh @@ -15,10 +17,10 @@ build_www_dir docker build -t kasmvncbuilder:$os_codename \ -f builder/dockerfile.${os}_${os_codename}.build . mkdir -p builder/build -docker run -v /tmp:/build --rm kasmvncbuilder:$os_codename +docker run -v $shared_with_docker_dir:/build --rm kasmvncbuilder:$os_codename L_GID=$(id -g) L_UID=$(id -u) tarball_name="kasmvnc.${os}_${os_codename}.tar.gz" -chown $L_UID:$L_GID /tmp/$tarball_name -mv /tmp/$tarball_name $PWD/builder/build/ +chown $L_UID:$L_GID $shared_with_docker_dir/$tarball_name +mv $shared_with_docker_dir/$tarball_name $PWD/builder/build/