Merge pull request #14 from Pwnzer0tt1/dev-nfproxy

Fix start.py and gh action for future nfproxy feature

.github/workflows/pypi-publish.yml

@@ -39,7 +39,7 @@ jobs:
         sed -i "s/{{VERSION_PLACEHOLDER}}/${{ steps.tag.outputs.TAG_NAME }}/g" proxy-client/setup.py;
         sed -i "s/{{VERSION_PLACEHOLDER}}/${{ steps.tag.outputs.TAG_NAME }}/g" proxy-client/firegex/__init__.py;
     - name: Build package
-      run: cd client && python -m build && mv ./dist ../
+      run: cd proxy-client && python -m build && mv ./dist ../
     - name: Publish package
       uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
       with:

start.py

@@ -114,6 +114,13 @@ def gen_args(args_to_parse: list[str]|None = None):
     parser_restart.add_argument('--logs', required=False, action="store_true", help='Show firegex logs', default=False)
     args = parser.parse_args(args=args_to_parse)
     
+    if "version" in args and args.version and g.build:
+        puts("The version argument is not used when the image is built from the Dockerfile", color=colors.yellow)
+        puts("The version will be ignored", color=colors.yellow)
+    
+    if "version" not in args or not args.version:
+        args.version = "latest"
+    
     if "clear" not in args:
         args.clear = False
     
@@ -314,7 +321,7 @@ def main():
                     write_compose(skip_password=False)
                     if not g.build:
                         puts("Downloading docker image from github packages 'docker pull ghcr.io/pwnzer0tt1/firegex'", color=colors.green)
-                        cmd_check("docker pull ghcr.io/pwnzer0tt1/firegex", print_output=True)
+                        cmd_check(f"docker pull ghcr.io/pwnzer0tt1/firegex:{args.version}", print_output=True)
                     puts("Running 'docker compose up -d --build'\n", color=colors.green)
                     composecmd("up -d --build", g.composefile)
             case "compose":