mirror of
https://github.com/kasmtech/KasmVNC.git
synced 2025-06-22 18:51:48 +02:00
Merge branch 'master' into create_ubuntu20_package
This commit is contained in:
commit
c151f479f4
@ -2,6 +2,9 @@ image: docker
|
|||||||
services:
|
services:
|
||||||
- docker:dind
|
- docker:dind
|
||||||
|
|
||||||
|
variables:
|
||||||
|
GITLAB_SHARED_DIND_DIR: /builds/$CI_PROJECT_PATH/shared
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- build
|
- build
|
||||||
|
|
||||||
@ -11,6 +14,7 @@ build:
|
|||||||
- ls -l
|
- ls -l
|
||||||
- pwd
|
- pwd
|
||||||
- apk add bash
|
- apk add bash
|
||||||
|
- mkdir -p "$GITLAB_SHARED_DIND_DIR" && chmod 777 "$GITLAB_SHARED_DIND_DIR"
|
||||||
- bash builder/build-tarball
|
- bash builder/build-tarball
|
||||||
- bash builder/build-deb
|
- bash builder/build-deb
|
||||||
- mkdir output
|
- mkdir output
|
||||||
|
@ -11,4 +11,4 @@ os_dir="builder/build/${os_codename}"
|
|||||||
dpkg-buildpackage -us -uc -b
|
dpkg-buildpackage -us -uc -b
|
||||||
mkdir -p "$os_dir"
|
mkdir -p "$os_dir"
|
||||||
cp ../*.deb "$os_dir"
|
cp ../*.deb "$os_dir"
|
||||||
lintian ../*.deb
|
lintian ../*.deb || true
|
||||||
|
@ -4,9 +4,11 @@ set -e
|
|||||||
|
|
||||||
build_www_dir() {
|
build_www_dir() {
|
||||||
docker build -t kasmweb/www -f builder/dockerfile.www.build .
|
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")/.."
|
cd "$(dirname "$0")/.."
|
||||||
. builder/os_ver_cli.sh
|
. builder/os_ver_cli.sh
|
||||||
|
|
||||||
@ -15,10 +17,10 @@ build_www_dir
|
|||||||
docker build -t kasmvncbuilder:$os_codename \
|
docker build -t kasmvncbuilder:$os_codename \
|
||||||
-f builder/dockerfile.${os}_${os_codename}.build .
|
-f builder/dockerfile.${os}_${os_codename}.build .
|
||||||
mkdir -p builder/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_GID=$(id -g)
|
||||||
L_UID=$(id -u)
|
L_UID=$(id -u)
|
||||||
tarball_name="kasmvnc.${os}_${os_codename}.tar.gz"
|
tarball_name="kasmvnc.${os}_${os_codename}.tar.gz"
|
||||||
chown $L_UID:$L_GID /tmp/$tarball_name
|
chown $L_UID:$L_GID $shared_with_docker_dir/$tarball_name
|
||||||
mv /tmp/$tarball_name $PWD/builder/build/
|
mv $shared_with_docker_dir/$tarball_name $PWD/builder/build/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user