docker: Add VS_COMMONS_DIR, set bash as default shell

docker/Dockerfile

@@ -28,7 +28,7 @@ RUN \
         unzip \
         wget
 
-RUN useradd -m builder && passwd -d builder
+RUN useradd -m builder -s /bin/bash && passwd -d builder
 RUN echo "builder ALL=(ALL) ALL" >> /etc/sudoers
 WORKDIR /home/builder
 USER builder

docker/entry-build.sh

@@ -3,10 +3,11 @@
 set -e
 $WORKSPACE/docker/entry-common.sh
 
-su builder -c ". ~/.profile && bash -c '\
-  cd $WORKSPACE && \
-  bun install &&
-  bun run codegen &&
-  bun run meson-setup.clang-release &&
+su builder -c bash << EOF
+  set -e
+  . ~/.profile
+  bun install
+  bun run codegen
+  bun run meson-setup.clang-release
   meson compile -C build/ vs:executable
-  '"
+EOF

docker/entry-common.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# main_entry.sh
+# entry-common.sh
 
 set -e
 
@@ -15,3 +15,6 @@ fi
 
 usermod -u $HOSTUID builder
 groupmod -g $HOSTGID builder
+
+echo 'export VS_COMMONS_DIR="$WORKSPACE"/build/commons/' >> /home/builder/.profile
+echo 'export VS_LOG_LEVEL=debug' >> /home/builder/.profile

docker/entry-default.sh

@@ -3,4 +3,4 @@
 set -e
 $WORKSPACE/docker/entry-common.sh
 
-su builder -c "cd $WORKSPACE && . ~/.profile && bash"
+su -l builder

meson.build

@@ -14,11 +14,6 @@ cxx = meson.get_compiler('cpp')
 #Used by pugi to enable compact mode. I might want to disable execptions too.
 add_global_arguments(['-DPUGIXML_COMPACT'], language: ['cpp', 'c'])
 
-meson.add_devenv(
-    {
-        'VS_COMMONS_DIR': join_paths(meson.project_source_root(), 'build', 'commons'),
-    },
-)
 meson.add_devenv({'VS_LOG_LEVEL': 'debug'})
 #TODO: Add a custom profile to devenv to avoid "polluting" or making user's one invalid.
 
@@ -303,4 +298,4 @@ pconf.generate(
     description: 'VS fltk library (C interface only)',
     url: 'https://github.com/KaruroChori/vs-fltk/',
     version: meson.project_version(),
-)
+)