From bf961dff3e77e0f6bd4344fd9dbaaffa6a109901 Mon Sep 17 00:00:00 2001 From: Domingo Dirutigliano Date: Tue, 18 Feb 2025 17:48:08 +0100 Subject: [PATCH 1/2] fix gh action --- .github/workflows/pypi-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index dbfe476..8588195 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.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: From 5284e9f0918a3c539a5ba5009c315acb32aa60fc Mon Sep 17 00:00:00 2001 From: Domingo Dirutigliano Date: Tue, 18 Feb 2025 17:57:59 +0100 Subject: [PATCH 2/2] fix start.py --- start.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/start.py b/start.py index 277e087..a7859ea 100755 --- a/start.py +++ b/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":