added makes to continerfiles

Author: btr1975

cookiecutter.json

@@ -38,8 +38,12 @@
         "podman",
         "docker"
     ],
+    "container_git_protocol": [
+        "ssh",
+        "https"
+    ],
     "__template_repo": "https://github.com/btr1975/cookiecutter-python-fastapi-openapi",
-    "__template_version": "1.0.11",
+    "__template_version": "1.0.12",
     "_new_lines": "\n",
     "_copy_without_render": [
         "{{cookiecutter.__app_name}}/templates",
@@ -90,6 +94,11 @@
             "__prompt__": "Which container runtime will be used",
             "podman": "Podman",
             "docker": "Docker"
+        },
+        "container_git_protocol": {
+            "__prompt__": "Which protocol will be used for installing in the container",
+            "ssh": "SSH",
+            "https": "HTTPS"
         }
     }
 }

{{cookiecutter.git_repo_name}}/containers/Containerfile

@@ -13,8 +13,15 @@ ARG build_branch=main
 
 ENV BUILD_BRANCH=${build_branch}
 
+{% if cookiecutter.container_git_protocol == "https" %}
+# This can only be used if you repo is a public repo
+RUN ${PIP_INSTALL_COMMAND} git+https://github.com/{{ cookiecutter.git_username }}/{{ cookiecutter.git_repo_name }}@${BUILD_BRANCH}
+{% endif %}
+
+{% if cookiecutter.container_git_protocol == "ssh" %}
 RUN --mount=type=ssh,required=true  \
     ${PIP_INSTALL_COMMAND} git+ssh://[email protected]/{{ cookiecutter.git_username }}/{{ cookiecutter.git_repo_name }}@${BUILD_BRANCH}
+{% endif %}
 
 EXPOSE 8080/tcp
 

{{cookiecutter.git_repo_name}}/containers/Dockerfile

@@ -13,8 +13,15 @@ ARG build_branch=main
 
 ENV BUILD_BRANCH=${build_branch}
 
+{% if cookiecutter.container_git_protocol == "https" %}
+# This can only be used if you repo is a public repo
+RUN ${PIP_INSTALL_COMMAND} git+https://github.com/{{ cookiecutter.git_username }}/{{ cookiecutter.git_repo_name }}@${BUILD_BRANCH}
+{% endif %}
+
+{% if cookiecutter.container_git_protocol == "ssh" %}
 RUN --mount=type=ssh,required=true  \
     ${PIP_INSTALL_COMMAND} git+ssh://[email protected]/{{ cookiecutter.git_username }}/{{ cookiecutter.git_repo_name }}@${BUILD_BRANCH}
+{% endif %}
 
 EXPOSE 8080/tcp
 

{{cookiecutter.git_repo_name}}/containers/Makefile

@@ -0,0 +1,30 @@
+# Makefile for container needs
+# Author: Ben Trachtenberg
+# Version: 1.0.0
+#
+
+.PHONY: build-container
+
+info:
+	@echo "make options"
+	@echo "    build-container             To build the container"
+
+{% if cookiecutter.container_runtime == "podman" %}
+build-container:
+	@echo "Building the container with build_branch=$(build_branch)"
+{% if cookiecutter.container_git_protocol == "https" %}
+	@podman build --build-arg=build_branch=$(build_branch) -t {{ cookiecutter.git_repo_name }}:latest -t {{ cookiecutter.git_repo_name }}:$(build_branch) -f Containerfile
+{% else %}
+	@podman build --ssh=default --build-arg=build_branch=$(build_branch) -t {{ cookiecutter.git_repo_name }}:latest -t {{ cookiecutter.git_repo_name }}:$(build_branch) -f Containerfile
+{% endif %}
+{% endif %}
+
+{% if cookiecutter.container_runtime == "docker" %}
+build-container:
+	@echo "Building the container with build_branch=$(build_branch)"
+{% if cookiecutter.container_git_protocol == "https" %}
+	@docker build --build-arg=build_branch=$(build_branch) -t {{ cookiecutter.git_repo_name }}:latest -t {{ cookiecutter.git_repo_name }}:$(build_branch) -f Dockerfile
+{% else %}
+	@docker build --ssh=default --build-arg=build_branch=$(build_branch) -t {{ cookiecutter.git_repo_name }}:latest -t {{ cookiecutter.git_repo_name }}:$(build_branch) -f Dockerfile
+{% endif %}
+{% endif %}

{{cookiecutter.git_repo_name}}/containers/make.bat

@@ -0,0 +1,53 @@
+@ECHO OFF
+REM Makefile for container needs
+REM Author: Ben Trachtenberg
+REM Version: 1.0.0
+REM
+
+SET option=%1
+SET build_branch=%2
+
+IF "%option%" == "" (
+    GOTO BAD_OPTIONS
+)
+
+IF "%build_branch%" == "" (
+    GOTO BAD_OPTIONS
+)
+
+{% if cookiecutter.container_runtime == "podman" %}
+IF "%option%" == "build-container" (
+    @ECHO "Building the container with build_branch=%build_branch%"
+{% if cookiecutter.container_git_protocol == "https" %}
+    podman build --build-arg=build_branch=%build_branch% -t {{ cookiecutter.git_repo_name }}:latest -t {{ cookiecutter.git_repo_name }}:%build_branch% -f Containerfile
+{% else %}
+    podman build --ssh=default --build-arg=build_branch=%build_branch% -t {{ cookiecutter.git_repo_name }}:latest -t {{ cookiecutter.git_repo_name }}:%build_branch% -f Containerfile
+{% endif %}
+    GOTO END
+)
+{% endif %}
+
+{% if cookiecutter.container_runtime == "docker" %}
+IF "%option%" == "build-container" (
+    @ECHO "Building the container with build_branch=%build_branch%"
+{% if cookiecutter.container_git_protocol == "https" %}
+    docker build --build-arg=build_branch=%build_branch% -t {{ cookiecutter.git_repo_name }}:latest -t {{ cookiecutter.git_repo_name }}:%build_branch% -f Containerfile
+{% else %}
+    docker build --ssh=default --build-arg=build_branch=%build_branch% -t {{ cookiecutter.git_repo_name }}:latest -t {{ cookiecutter.git_repo_name }}:%build_branch% -f Containerfile
+{% endif %}
+    GOTO END
+)
+{% endif %}
+
+
+@ECHO make options
+@ECHO     build-container             To build the container
+GOTO END
+
+:BAD_OPTIONS
+@ECHO Argument is missing
+@ECHO Usage: make.bat option build_branch
+@ECHO.
+GOTO END
+
+:END