From fc91e4d622bd5223ed795df6ec81ac483a4ed17e Mon Sep 17 00:00:00 2001 From: Dmitry Maksyoma Date: Thu, 14 Jan 2021 21:25:41 +1300 Subject: [PATCH] Don't use "sodu docker", just "docker" --- builder/README.md | 12 ++++++------ builder/build-deb | 4 ++-- builder/build-tarball | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/builder/README.md b/builder/README.md index 9af5342..01a5bec 100644 --- a/builder/README.md +++ b/builder/README.md @@ -3,32 +3,32 @@ Docker CE # Build the www webpack ``` -sudo docker build -t kasmweb/www -f builder/dockerfile.www.build . -sudo docker run -it --rm -v $PWD/builder/www:/build kasmweb/www:latest +docker build -t kasmweb/www -f builder/dockerfile.www.build . +docker run -it --rm -v $PWD/builder/www:/build kasmweb/www:latest ``` # build the docker image ``` cd /src_code_root - sudo docker build -t kasmvncbuilder:18.04 -f builder/dockerfile.ubuntu1804.build . + docker build -t kasmvncbuilder:18.04 -f builder/dockerfile.ubuntu1804.build . ``` ### Run the builder ```sh mkdir -p builder/build - sudo docker run -v /tmp:/build --rm kasmvncbuilder:18.04 + docker run -v /tmp:/build --rm kasmvncbuilder:18.04 cp /tmp/build/kasmvnc.ubuntu_18.04.tar.gz builder/build/ ``` ### Build test desktop container ```sh cd builder - sudo docker build -t kasmvnctester:18.04 -f dockerfile.ubuntu1804.test . + docker build -t kasmvnctester:18.04 -f dockerfile.ubuntu1804.test . ``` ### run an instance of the new destkop ```sh -sudo docker run -it -p 443:8443 --rm -e "VNC_USER=username" -e "VNC_PW=password123" kasmvnctester:18.04 +docker run -it -p 443:8443 --rm -e "VNC_USER=username" -e "VNC_PW=password123" kasmvnctester:18.04 ``` open browser and point to https:///vnc.html diff --git a/builder/build-deb b/builder/build-deb index b63f0b5..d068f8e 100755 --- a/builder/build-deb +++ b/builder/build-deb @@ -4,10 +4,10 @@ set -e cd "$(dirname "$0")/.." -sudo docker build -t debbuilder_ubuntu:18.04 -f \ +docker build -t debbuilder_ubuntu:18.04 -f \ builder/dockerfile.ubuntu1804.deb.build . deb_output_dir=$(cd .. && echo $PWD) L_UID=$(id -u) #Ubuntu already has UID env var, but this should work on all Linix systems L_GID=$(id -g) -sudo docker run --rm -v "$deb_output_dir":/src --user $L_UID:$L_GID debbuilder_ubuntu:18.04 /bin/bash -c '/src/*/builder/build-deb-inside-docker' +docker run --rm -v "$deb_output_dir":/src --user $L_UID:$L_GID debbuilder_ubuntu:18.04 /bin/bash -c '/src/*/builder/build-deb-inside-docker' diff --git a/builder/build-tarball b/builder/build-tarball index baa3188..2c96ace 100755 --- a/builder/build-tarball +++ b/builder/build-tarball @@ -3,20 +3,20 @@ set -e build_www_dir() { - sudo docker build -t kasmweb/www -f builder/dockerfile.www.build . - sudo docker run -it --rm -v $PWD/builder/www:/build kasmweb/www:latest + docker build -t kasmweb/www -f builder/dockerfile.www.build . + docker run -it --rm -v $PWD/builder/www:/build kasmweb/www:latest } cd "$(dirname "$0")/.." build_www_dir -sudo docker pull ubuntu:18.04 -sudo docker build -t kasmvncbuilder:18.04 -f builder/dockerfile.ubuntu1804.build . +docker pull ubuntu:18.04 +docker build -t kasmvncbuilder:18.04 -f builder/dockerfile.ubuntu1804.build . mkdir -p builder/build -sudo docker run -v /tmp:/build --rm kasmvncbuilder:18.04 +docker run -v /tmp:/build --rm kasmvncbuilder:18.04 L_GID=$(id -g) L_UID=$(id -u) -sudo chown $L_UID:$L_GID /tmp/kasmvnc.ubuntu_18.04.tar.gz +chown $L_UID:$L_GID /tmp/kasmvnc.ubuntu_18.04.tar.gz mv /tmp/kasmvnc.ubuntu_18.04.tar.gz $PWD/builder/build/