Merge pull request #145 from entelecheia/main

.copier-docker-config.yaml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; do NOT edit manually
-_commit: v0.28.2-4-g66300b6
+_commit: v0.28.3-3-g5892091
 _src_path: .
 app_dirname: entelecheia
 app_install_root: /opt

.copier-template/.github/workflows/{% if use_deploy_workflows %}deploy-app-image.yaml{% endif %}

@@ -61,7 +61,7 @@ jobs:
       # This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v5.5.0
+        uses: docker/metadata-action@v5.5.1
         with:
           images: ${{ env.IMAGE_NAME }}
           tags: |

.copier-template/.github/workflows/{% if use_deploy_workflows %}deploy-base-image.yaml{% endif %}

@@ -59,7 +59,7 @@ jobs:
       # This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v5.5.0
+        uses: docker/metadata-action@v5.5.1
         with:
           images: ${{ env.IMAGE_NAME }}
           tags: |

.docker/docker.version

@@ -1 +1 @@
-APP_VERSION="0.28.3"                    # The version of the project
+APP_VERSION="0.28.4"                    # The version of the project

.github/workflows/deploy-app-image.yaml

@@ -59,7 +59,7 @@ jobs:
       # This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v5.5.0
+        uses: docker/metadata-action@v5.5.1
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |

.github/workflows/deploy-base-image.yaml

@@ -59,7 +59,7 @@ jobs:
       # This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v5.5.0
+        uses: docker/metadata-action@v5.5.1
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |

.github/workflows/deploy-docs.yaml

@@ -26,7 +26,7 @@ jobs:
         with:
           python-version: 3.9
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           key: ${{ github.ref }}
           path: .cache

CHANGELOG.md

@@ -1,5 +1,11 @@
 <!--next-version-placeholder-->
 
+## v0.28.4 (2024-01-31)
+
+### Fix
+
+* **dependencies:** Upgrade docker/metadata-action from v5.5.0 to v5.5.1 ([`5892091`](https://github.com/entelecheia/hyperfast-docker-template/commit/5892091d179c3a4575aad399028efd2df3862389))
+
 ## v0.28.3 (2024-01-13)
 
 ### Fix

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hyperfast-docker-template"
-version = "0.28.3"
+version = "0.28.4"
 description = "Hyperfast Docker Template is a powerful tool that leverages copier to streamline the creation of new Docker projects. It simplifies and accelerates Docker configurations, fostering a highly efficient and user-friendly development experience."
 authors = ["Young Joon Lee <entelecheia@hotmail.com>"]
 license = "MIT"

tmp/.copier-docker-config.yaml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; do NOT edit manually
-_commit: v0.26.0-13-gd133f63
+_commit: v0.28.3-4-g9c84ad9
 _src_path: .
 app_dirname: entelecheia
 app_install_root: /workspace/projects

tmp/.docker/.ids/app.env

@@ -0,0 +1,10 @@
+DOCKER_PROJECT_ID="app"
+
+HOST_WORKSPACE_LOCATION=${WORKSPACE_LOCATION:-"$PWD/workspace/$PROJECT_ID"}
+HOST_WORKSPACE_ROOT=${WORKSPACE_ROOT:-"$HOST_WORKSPACE_LOCATION/workspace"}
+HOST_SCRIPTS_DIR="$PWD/.docker/scripts"
+HOST_SSH_DIR="$HOST_WORKSPACE_LOCATION/.ssh"
+HOST_CACHE_DIR="$HOST_WORKSPACE_LOCATION/.cache"
+HOST_HF_HOME=${HF_HOME:-"${HOST_WORKSPACE_LOCATION}/.cache/huggingface"}
+HOST_GH_CONFIG_DIR="$HOST_WORKSPACE_LOCATION/.config/gh"
+HOST_PASSAGE_DIR="$HOST_WORKSPACE_LOCATION/.passage"

tmp/.docker/.ids/default.env

@@ -1,4 +1,4 @@
-DOCKER_PROJECT_ID="app"
+DOCKER_PROJECT_ID="default"
 
 HOST_WORKSPACE_LOCATION=${WORKSPACE_LOCATION:-"$PWD/workspace/$PROJECT_ID"}
 HOST_WORKSPACE_ROOT=${WORKSPACE_ROOT:-"$HOST_WORKSPACE_LOCATION/workspace"}

tmp/.github/workflows/deploy-app-image.yaml

@@ -61,7 +61,7 @@ jobs:
       # This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v5.0.0
+        uses: docker/metadata-action@v5.5.1
         with:
           images: ${{ env.IMAGE_NAME }}
           tags: |
@@ -73,7 +73,7 @@ jobs:
       # It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
       # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v5.1.0
         with:
           context: .
           file: ./.docker/Dockerfile.app

tmp/.github/workflows/deploy-base-image.yaml

@@ -5,11 +5,11 @@ name: deploy-base-image
 on:
   workflow_call:
   workflow_dispatch:
-  pull_request:
-    types:
-      - closed
+  push:
     branches:
-      - docker
+      - docker*
+    paths:
+      - ".docker/**"
 
 # Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
 env:
@@ -18,8 +18,6 @@ env:
 # There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
 jobs:
   build-and-push-image:
-    # this job will only run if the PR has been merged or it is manually triggered
-    if: ${{ github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch' }}
     runs-on: ubuntu-latest
     # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
     permissions:
@@ -61,7 +59,7 @@ jobs:
       # This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v5.0.0
+        uses: docker/metadata-action@v5.5.1
         with:
           images: ${{ env.IMAGE_NAME }}
           tags: |

tmp/.github/workflows/release.yaml

@@ -4,11 +4,11 @@ name: semantic-release
 on:
   workflow_call:
   workflow_dispatch:
-  pull_request:
-    types:
-      - closed
+  push:
     branches:
       - release*
+    paths:
+      - ".docker/**"
 
 permissions:
   contents: write
@@ -19,8 +19,6 @@ jobs:
   build:
     # Name the Job
     name: semantic-release
-    # this job will only run if the PR has been merged or it is manually triggered
-    if: ${{ github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch' }}
     # Set the agent to run on
     runs-on: ${{ matrix.os }}
     strategy:

tmp/Makefile

@@ -117,7 +117,7 @@ docker-config-base: ## show the docker base config
 	@bash .docker/.docker-scripts/docker-compose.sh config --variant base
 
 docker-config-app: ## show the docker app config
-	@bash .docker/.docker-scripts/docker-compose.sh config --variant app
+	@bash .docker/.docker-scripts/docker-compose.sh config --variant app --pid app
 
 docker-push-base: ## push the docker base image
 	@bash .docker/.docker-scripts/docker-compose.sh push --variant base
@@ -132,7 +132,7 @@ docker-run-app: ## run the docker app image
 	@bash .docker/.docker-scripts/docker-compose.sh run --variant app
 
 docker-up-app: ## launch the docker app image
-	@bash .docker/.docker-scripts/docker-compose.sh up --variant app
+	@bash .docker/.docker-scripts/docker-compose.sh up --variant app --pid app
 
 docker-up-app-detach: ## launch the docker app image in detached mode
-	@bash .docker/.docker-scripts/docker-compose.sh up --variant app --detach
+	@bash .docker/.docker-scripts/docker-compose.sh up --variant app --pid app --detach