scripts: docker-build.sh updated with changes from xtensa-build-zephyr.py

Removed old flags from python script call and replaced with
new one. Added one more working directory to zephyr-build container
now SOF is placed in /workdir/sof and west workspace in /workdir .

Signed-off-by: Andrey Borisovich <andrey.borisovich@intel.com>

.github/workflows/zephyr.yml

@@ -13,13 +13,16 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         # From time to time this will catch a git tag and change SOF_VERSION
-        with: {fetch-depth: 10, submodules: recursive}
+        with:
+          fetch-depth: 10
+          path: ./workspace/sof
 
       # https://github.com/zephyrproject-rtos/docker-image
       # Note: env variables can be passed to the container with
       # -e https_proxy=...
       - name: build
-        run: docker run -v "$(pwd)":/workdir
+        run: docker run -v "$(pwd)/workspace":/workspace
+             --workdir /workspace
              ghcr.io/zephyrproject-rtos/zephyr-build:latest
-             ./zephyr/docker-build.sh --cmake-args=-DEXTRA_CFLAGS=-Werror
-             --cmake-args=--warn-uninitialized   -a
+             ./sof/zephyr/docker-build.sh --cmake-args=-DEXTRA_CFLAGS=-Werror
+             --cmake-args=--warn-uninitialized -a

zephyr/docker-build.sh

@@ -13,7 +13,7 @@ set -x
 unset ZEPHYR_BASE
 
 # Make sure we're in the right place
-test -e ./scripts/xtensa-build-zephyr.py
+test -e ./sof/scripts/xtensa-build-zephyr.py
 
 
 # See https://stackoverflow.com/questions/35291520/docker-and-userns-remap-how-to-manage-volume-permissions-to-share-data-betwee + many others
@@ -71,8 +71,4 @@ unset ZEPHYR_SDK_INSTALL_DIR
 ls -ld /opt/toolchains/zephyr-sdk-*
 ln -s  /opt/toolchains/zephyr-sdk-*  ~/ || true
 
-if test -e zephyrproject; then
-    ./scripts/xtensa-build-zephyr.py  "$@"
-else # -c(lone) with west init etc.
-    ./scripts/xtensa-build-zephyr.py -c "$@"
-fi
+./sof/scripts/xtensa-build-zephyr.py -u --no-interactive "$@"