Create docker-compose.yml, add .env file, update README.md instructions and project/Dockerfile image name of the base referenced in FROM directive, bring --on-init build argument back, add environment compose entry

Author: AnastaZIuk

.env

@@ -0,0 +1 @@
+BUILD_SCRIPT_ARGS="--run-godbolt -- -j1"

README.md

@@ -15,41 +15,32 @@ Make sure you have switched to `Containers for Windows`
 
 ![Containers for Windows](https://user-images.githubusercontent.com/65064509/152947300-affca592-35a7-4e4c-a7fc-2055ce1ba528.png)
 
-build [***base***](https://github.com/Devsh-Graphics-Programming/Compiler-Explorer-DXC-Windows-Docker/blob/master/Dockerfile) docker image
+clone the repository 
 
 ```powershell
-docker build github.com/Devsh-Graphics-Programming/Compiler-Explorer-DXC-Windows-Docker -t godbolt.base
+git clone git@github.com:Devsh-Graphics-Programming/Compiler-Explorer-DXC-Windows-Docker.git
 ```
 
-build [***instance***](https://github.com/Devsh-Graphics-Programming/Compiler-Explorer-DXC-Windows-Docker/blob/master/project/Dockerfile) docker image
+enter the cloned directory and execute
 
 ```powershell
-docker build github.com/Devsh-Graphics-Programming/Compiler-Explorer-DXC-Windows-Docker#master:project -t godbolt.instance --build-arg BASE_IMAGE=godbolt.base --build-arg BUILD_SCRIPT_ARGS="-- -j4"
+docker compose up --build
 ```
 
-run your instance docker container with proxied 10240 port CE listens on
+once everything is built and run - open your browser with **http://localhost:10240** and enjoy.
 
-```powershell
-docker run -p 10240:10240 -it godbolt.instance --run-godbolt
-```
-
-open your browser with **http://localhost:10240** and enjoy.
-
-### Image creation arguments
-
-There are a few OS-wide variables you can override for building images, you can also override `BUILD_SCRIPT_ARGS` to execute initial [***build***](https://github.com/Devsh-Graphics-Programming/Compiler-Explorer-DXC-Windows-Docker/blob/master/project/scripts/build.py) script with different set of arguments - refer to base & instance docker files and build script syntax bellow for more details.
-
-### Container creation arguments
+### Build script options
 
-Containers created from the instance image have `ENTRYPOINT` set to application proxy batch script executing [***build***](https://github.com/Devsh-Graphics-Programming/Compiler-Explorer-DXC-Windows-Docker/blob/master/project/scripts/build.py) python script, the syntax is following
+Instance image and a container use proxy batch script executing [***build***](https://github.com/Devsh-Graphics-Programming/Compiler-Explorer-DXC-Windows-Docker/blob/master/project/scripts/build.py) python script with following syntax
 
 ```powershell
 <BUILD_SCRIPT_OPTIONS> -- <CMAKE_BUILD_OPTIONS>
 ```
 
-for example you may wish to run container with increased parallel build jobs and verbosity to build latest DXC but don't want to run compiler explorer with it hence you would execute
+you may wish to increase parallel build jobs and verbosity to build latest DXC while composing the application & running the container hence you would
 
 ```powershell
-docker run -p 10240:10240 -it godbolt.instance -- -j12 -v
+set BUILD_SCRIPT_ARGS="--run-godbolt -- -j12 -v"
 ```
 
+first and then execute the compose command.

docker-compose.yml

@@ -0,0 +1,28 @@
+version: '3'
+
+services:
+  base:
+    build:
+      context: .
+    image: artifactory.devsh.eu/godbolt/base:latest
+    container_name: devsh.godbolt.base
+    entrypoint: ["cmd", "/c", "echo", "Created base container is not intended for user usage, exiting!"]
+  instance:
+    build:
+      context: ./project
+      args:
+      - BUILD_SCRIPT_ARGS=${BUILD_SCRIPT_ARGS}
+    environment:
+    - BUILD_SCRIPT_ARGS=${BUILD_SCRIPT_ARGS}
+    image: artifactory.devsh.eu/godbolt/instance:latest
+    container_name: devsh.godbolt.instance
+    depends_on:
+      - base
+    entrypoint: ["build.bat", "%BUILD_SCRIPT_ARGS%"]
+    deploy:
+      resources:
+        limits:
+          cpus: '0.50'
+          memory: 4G
+    ports:
+      - "10240:10240"

project/Dockerfile

@@ -1,6 +1,6 @@
 # escape=`
 
-ARG BASE_IMAGE=artifactory.devsh.eu/services/godbolt.base:latest
+ARG BASE_IMAGE=artifactory.devsh.eu/godbolt/base:latest
 
 ARG BUILD_SCRIPT_DIRECTORY="C:\docker"
 ARG BUILD_SCRIPT_ARGS="-- -j1"
@@ -23,7 +23,7 @@ ARG BUILD_SCRIPT_ARGS
 
 # Build DXC
 RUN `
-	build.bat %BUILD_SCRIPT_ARGS%
+	build.bat --on-init %BUILD_SCRIPT_ARGS%
 
 # Generate dxc.local.properties
 RUN `

project/scripts/build.py

@@ -7,6 +7,7 @@ def logSHAs(local, remote):
     print(f"Local SHA: \"{local}\", url: https://github.com/microsoft/DirectXShaderCompiler/commit/{local}")
     print(f"Remote latest SHA: \"{remote}\", url: https://github.com/microsoft/DirectXShaderCompiler/commit/{remote}")
 
+onInit = False
 runGodbolt = False
 configureOnly = False
 hashCheckOnly = False
@@ -15,6 +16,8 @@ def logSHAs(local, remote):
 try:
     # Parse command line arguments
     for arg in sys.argv:
+        if arg == "--on-init":
+            onInit = True
         if arg == "--run-godbolt":
             runGodbolt = True
         elif arg == "--configure-only":
@@ -26,6 +29,9 @@ def logSHAs(local, remote):
             extraBuildVariables = " ".join(sys.argv[sys.argv.index(arg) + 1:])
             break
 
+    if onInit:
+        runGodbolt = False
+
     # Get the directory where this script is located
     scriptDirectory = os.path.dirname(os.path.abspath(__file__))