improve docs, build.py and remove Makefile

Author: erubboli

.dockerignore

@@ -1,9 +1,2 @@
-**/target/
-**/*.rs.bk
-**/Dockerfile
-**/.dockerignore
-**/.git
-**/.gitignore
-**/tmp
-**/Cargo.lock
-.docker/
+target
+.git

Makefile

@@ -2,42 +2,38 @@
 
 This document outlines the steps to build Docker images for the Mintlayer node daemon, wallet-cli, and node-gui. 
 
-Before building make sure you clone the repository and change directory in the root of the repository.
+Before building make sure you clone the repository and change the current directory in the root of the repository.
 
+# The python build script
 
-## Building the Node Daemon Docker Image
-
-To build the Docker image for the node daemon, follow these steps:
+Make sure you have python installed together with the `toml` package, you may want to create a specific environment:
 
 ```bash
-docker build -f docker/Dockerfile.node-daemon -t node-daemon .
+python3 -m venv env
+source env/bin/activate
+python3 -m pip install --upgrade pip
+python3 -m pip install toml
 ```
 
-
-## Building the Wallet-CLI Docker Image
-
-To build the Docker image for the wallet-cli, follow these steps:
+In order to build the images run:
 
 ```bash
-docker build -f docker/Dockerfile.wallet-cli -t wallet-cli .
+python3 build-tools/docker/build.py
 ```
 
+NOTE: to change the version of the images use the `-version` flag such as `--version=1.2.3`.
 
-## Building the Node-GUI Docker Image
-
-Node-gui is a graphical interface that runs the node itself in the background. 
-To build the Docker image for the node-gui, follow these steps:
+For verifing images are built with use the following command:
 
 ```bash
-docker build -f docker/Dockerfile.node-gui -t node-gui .
+docker images | grep mintlayer
 ```
 
+The result should similar to the following:
 
-
-## Verify the builds 
-
-Once the build process finishes, you can verify the image was created successfully by running:
-
-```bash
-docker images
+```
+$ docker images |grep mintlayer
+mintlayer/wallet-cli           0.1.1     57dcc4898a30   2 minutes ago   125MB
+mintlayer/node-gui             0.1.1     a2ed3937e081   2 minutes ago   290MB
+mintlayer/node-daemon          0.1.1     ad830bf576e3   3 minutes ago   119MB
 ```

build-tools/docker/BUILD.md

@@ -27,8 +27,8 @@ docker run -d -p 3030:3030 -p 13031:13031 --network=mintlayer-net --name mintlay
 ```
 
 The `-v` option is used to mount a local directory (in this case `~/.mintlayer`) as a volume in the Docker container.
-The `--user` option is used to specify the user that will write the `~/.mintlayer` directory. 
-NOTE: this wont work on windows hosts. 
+The `--user` option is used to specify the user that will write to the `~/.mintlayer` directory. 
+NOTE: this won't work on windows hosts. 
 
 If you want to display logs you can pass the `-e RUST_LOG=info` argument, such as:
 
@@ -61,4 +61,3 @@ docker run -it --network=mintlayer-net -v ~/.mintlayer:/root/.mintlayer mintlaye
 replace `<NETWORK>` with `mainnet` or `testnet` depending on what network you're running and `<IP_ADDRESS>` with the result of the command above.
 
 This command mounts the same `~/.mintlayer` directory as a volume in the `wallet-cli` container and uses the `--rpc-cookie-file` option to specify the path to the cookie file.
-

build-tools/docker/README.md

@@ -19,18 +19,22 @@ def get_cargo_version(cargo_toml_path):
 
     return version
 
-def build_docker_image(dockerfile_path, image_name, version):
-    # Docker build command
-    command = f"docker build -t {image_name}:{version} -f {dockerfile_path} ."
 
-    # Run the command
-    process = subprocess.Popen(command, shell=True)
-    output, error = process.communicate()
+def build_docker_image(dockerfile_path, image_name, version, num_jobs=None):
+    # Docker build command
+    command = f"docker build -t {image_name}:{version} -f {dockerfile_path}"
+    if num_jobs:
+        command += f" --build-arg NUM_JOBS={num_jobs}"
+    command += " ."
 
-    if error:
-        print(f"Error occurred: {error}")
-    else:
+    try: 
+        # Run the command
+        subprocess.check_call(command, shell=True)
         print(f"Built {image_name}:{version} successfully.")
+    catch:
+        print(f"Error occurred: {error}")
+        exit(1) # stop the build 
+
 
 def push_docker_image(image_name, version, latest=False):
     # Docker tag command
@@ -53,6 +57,7 @@ def push_docker_image(image_name, version, latest=False):
     if latest:
         print(f"Pushed {latest_image_name} successfully.")
 
+
 def delete_docker_image(image_name, version):
     # Full image name
     full_image_name = f"{image_name}:{version}"
@@ -67,33 +72,40 @@ def delete_docker_image(image_name, version):
     except subprocess.CalledProcessError:
         print(f"Failed to delete {full_image_name}.")
 
-def build_instances(version):
-    build_docker_image("build-tools/docker/Dockerfile.builder", "mintlayer-builder", "latest")
+
+def build_instances(version, num_jobs=None):
+    build_docker_image("build-tools/docker/Dockerfile.builder", "mintlayer-builder", "latest", num_jobs)
     build_docker_image("build-tools/docker/Dockerfile.node-daemon", "mintlayer/node-daemon", version)
     build_docker_image("build-tools/docker/Dockerfile.node-gui", "mintlayer/node-gui", version)
     build_docker_image("build-tools/docker/Dockerfile.wallet-cli", "mintlayer/wallet-cli", version)
     delete_docker_image("mintlayer-builder", "latest")
 
+
 def push_instances(version, latest):
     push_docker_image("mintlayer/node-daemon",version , latest)
     push_docker_image("mintlayer/node-gui",version , latest)
     push_docker_image("mintlayer/wallet-cli",version , latest)
 
+
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument('--push', action='store_true', help='Push the Docker image to Docker Hub')
     parser.add_argument('--latest', action='store_true', help='Tag the Docker image as latest while pushing')
     parser.add_argument('--build', type=lambda x: (str(x).lower() == 'true'), default=True, help="Set to false avoid the build")
+    parser.add_argument('--version', help='Override version number', default=None)
+    parser.add_argument('--num_jobs', help='Number of parallel jobs, defaults to # of CPUs', default=None)
     args = parser.parse_args()
-    version = get_cargo_version("Cargo.toml")
+
+    version = args.version if args.version else get_cargo_version("Cargo.toml")
 
     if args.build:
-        build_instances(version)
+        build_instances(version, num_jobs)
 
     # Only push the image if the --push flag is provided
     if args.push:
         latest = args.latest
         push_instances(version, latest)
 
+
 if __name__ == "__main__":
     main()