CERTUNLP · mateodurante · May 16, 2025 · Apr 30, 2025 · Apr 30, 2025 · May 5, 2025
diff --git a/.github/workflows/push-tag-rc.yml b/.github/workflows/push-tag-rc.yml
@@ -21,9 +21,17 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Extract tag version
+      - name: Extract metadata and set variables
         id: vars
-        run: echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+        run: |
+          RAW_TAG=${GITHUB_REF#refs/tags/}
+          CLEAN_TAG=${RAW_TAG#v}
+          COMMIT=$(git rev-parse --short HEAD)
+          BRANCH=$(git branch -r --contains "$GITHUB_SHA" | grep -v '\->' | head -n 1 | sed 's|origin/||')
+          echo "TAG=$CLEAN_TAG" >> $GITHUB_OUTPUT
+          echo "RAW_TAG=$RAW_TAG" >> $GITHUB_OUTPUT
+          echo "COMMIT=$COMMIT" >> $GITHUB_OUTPUT
+          echo "BRANCH=$BRANCH" >> $GITHUB_OUTPUT
 
       - name: Build and push backend image for ngen-django release candidate
         uses: docker/build-push-action@v5
@@ -32,6 +40,13 @@ jobs:
           file: docker/Dockerfile.prod
           push: true
           tags: certunlp/ngen-django:${{ steps.vars.outputs.TAG }}
+          build-args: |
+            APP_VERSION_TAG=${{ steps.vars.outputs.RAW_TAG }}
+            APP_COMMIT=${{ steps.vars.outputs.COMMIT }}
+            APP_BRANCH=${{ steps.vars.outputs.BRANCH }}
+          labels: |
+            org.opencontainers.image.version=${{ steps.vars.outputs.RAW_TAG }}
+            org.opencontainers.image.revision=${{ steps.vars.outputs.COMMIT }}
 
       - name: Build and push backend image for ngen release candidate
         uses: docker/build-push-action@v5
@@ -40,6 +55,13 @@ jobs:
           file: docker/Dockerfile.prod
           push: true
           tags: certunlp/ngen:${{ steps.vars.outputs.TAG }}
+          build-args: |
+            APP_VERSION_TAG=${{ steps.vars.outputs.RAW_TAG }}
+            APP_COMMIT=${{ steps.vars.outputs.COMMIT }}
+            APP_BRANCH=${{ steps.vars.outputs.BRANCH }}
+          labels: |
+            org.opencontainers.image.version=${{ steps.vars.outputs.RAW_TAG }}
+            org.opencontainers.image.revision=${{ steps.vars.outputs.COMMIT }}
 
       - name: Build and push frontend image release candidate
         uses: docker/build-push-action@v5
@@ -48,3 +70,10 @@ jobs:
           file: frontend/Dockerfile.prod
           push: true
           tags: certunlp/ngen-frontend:${{ steps.vars.outputs.TAG }}
+          build-args: |
+            APP_VERSION_TAG=${{ steps.vars.outputs.RAW_TAG }}
+            APP_COMMIT=${{ steps.vars.outputs.COMMIT }}
+            APP_BRANCH=${{ steps.vars.outputs.BRANCH }}
+          labels: |
+            org.opencontainers.image.version=${{ steps.vars.outputs.RAW_TAG }}
+            org.opencontainers.image.revision=${{ steps.vars.outputs.COMMIT }}
diff --git a/.github/workflows/push-tag.yml b/.github/workflows/push-tag.yml
@@ -21,12 +21,17 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Extract tag version
+      - name: Extract metadata and set variables
         id: vars
         run: |
           RAW_TAG=${GITHUB_REF#refs/tags/}
-          CLEAN_TAG=${RAW_TAG#v}  # Elimina la v si está al principio
+          CLEAN_TAG=${RAW_TAG#v}
+          COMMIT=$(git rev-parse --short HEAD)
+          BRANCH=$(git branch -r --contains "$GITHUB_SHA" | grep -v '\->' | head -n 1 | sed 's|origin/||')
           echo "TAG=$CLEAN_TAG" >> $GITHUB_OUTPUT
+          echo "RAW_TAG=$RAW_TAG" >> $GITHUB_OUTPUT
+          echo "COMMIT=$COMMIT" >> $GITHUB_OUTPUT
+          echo "BRANCH=$BRANCH" >> $GITHUB_OUTPUT
 
       - name: Build and push backend image for ngen-django
         uses: docker/build-push-action@v5
@@ -35,6 +40,13 @@ jobs:
           file: docker/Dockerfile.prod
           push: true
           tags: certunlp/ngen-django:latest,certunlp/ngen-django:${{ steps.vars.outputs.TAG }}
+          build-args: |
+            APP_VERSION_TAG=${{ steps.vars.outputs.RAW_TAG }}
+            APP_COMMIT=${{ steps.vars.outputs.COMMIT }}
+            APP_BRANCH=${{ steps.vars.outputs.BRANCH }}
+          labels: |
+            org.opencontainers.image.version=${{ steps.vars.outputs.RAW_TAG }}
+            org.opencontainers.image.revision=${{ steps.vars.outputs.COMMIT }}
 
       - name: Build and push backend image for ngen
         uses: docker/build-push-action@v5
@@ -43,6 +55,13 @@ jobs:
           file: docker/Dockerfile.prod
           push: true
           tags: certunlp/ngen:latest,certunlp/ngen:${{ steps.vars.outputs.TAG }}
+          build-args: |
+            APP_VERSION_TAG=${{ steps.vars.outputs.RAW_TAG }}
+            APP_COMMIT=${{ steps.vars.outputs.COMMIT }}
+            APP_BRANCH=${{ steps.vars.outputs.BRANCH }}
+          labels: |
+            org.opencontainers.image.version=${{ steps.vars.outputs.RAW_TAG }}
+            org.opencontainers.image.revision=${{ steps.vars.outputs.COMMIT }}
 
       - name: Build and push frontend image
         uses: docker/build-push-action@v5
@@ -51,3 +70,10 @@ jobs:
           file: frontend/Dockerfile.prod
           push: true
           tags: certunlp/ngen-frontend:latest,certunlp/ngen-frontend:${{ steps.vars.outputs.TAG }}
+          build-args: |
+            APP_VERSION_TAG=${{ steps.vars.outputs.RAW_TAG }}
+            APP_COMMIT=${{ steps.vars.outputs.COMMIT }}
+            APP_BRANCH=${{ steps.vars.outputs.BRANCH }}
+          labels: |
+            org.opencontainers.image.version=${{ steps.vars.outputs.RAW_TAG }}
+            org.opencontainers.image.revision=${{ steps.vars.outputs.COMMIT }}
diff --git a/docker/.env/ngen.base.env b/docker/.env/ngen.base.env
@@ -52,11 +52,11 @@ NGEN_LANG_EXTERNAL=en
 PAGE_SIZE=10
 PAGE_SIZE_MAX=100
 
-ALLOWED_FIELDS_BLOCKED_CASE=parent,state,tlp
-ALLOWED_FIELDS_BLOCKED_EVENT=parent,case,tlp
+BLOCKED_FIELDS_CASE=
+BLOCKED_FIELDS_EVENT=
 ALLOWED_FIELDS_MERGED_CASE=parent,state,tlp
 ALLOWED_FIELDS_MERGED_EVENT=parent,case,tlp,network,sid
-ALLOWED_FIELDS_BLOCKED_EXCEPTION=True
+BLOCKED_FIELDS_EXCEPTION=True
 
 PRIORITY_ATTEND_TIME_DEFAULT=10080
 PRIORITY_SOLVE_TIME_DEFAULT=10080

diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
@@ -9,5 +9,15 @@ RUN apk add gettext libmagic gcc musl-dev python3-dev
 
 COPY . /code/
 
+# Add version information
+ARG APP_VERSION_TAG
+ARG APP_COMMIT
+ARG APP_BRANCH
+ENV APP_VERSION_TAG=$APP_VERSION_TAG
+ENV APP_COMMIT=$APP_COMMIT
+ENV APP_BRANCH=$APP_BRANCH
+ENV APP_BUILD_FILE="dev"
+RUN echo "{\"tag\": \"$APP_VERSION_TAG\", \"commit\": \"$APP_COMMIT\", \"branch\": \"$APP_BRANCH\", \"build_file\": \"$APP_BUILD_FILE\"}" > /code/version.json
+
 # Must be built from the project root directory
 RUN pip install -r requirements.txt
diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod
@@ -1,6 +1,15 @@
 # Base stage for dependency installation
 FROM python:3.11-alpine3.20 AS base
 
+ARG APP_VERSION_TAG
+ARG APP_COMMIT
+ARG APP_BRANCH
+
+ENV APP_VERSION_TAG=$APP_VERSION_TAG
+ENV APP_COMMIT=$APP_COMMIT
+ENV APP_BRANCH=$APP_BRANCH
+ENV APP_BUILD_FILE="prod"
+
 # Configure environment variables for pip
 ENV PIP_NO_CACHE_DIR=true \
     PYTHONDONTWRITEBYTECODE=1 \
@@ -37,6 +46,9 @@ COPY --from=base /install /usr/local
 # Copy the application code
 COPY . /code/
 
+# Add version information
+RUN echo "{\"tag\": \"$APP_VERSION_TAG\", \"commit\": \"$APP_COMMIT\", \"branch\": \"$APP_BRANCH\", \"build_file\": \"$APP_BUILD_FILE\"}" > /code/version.json
+
 # Expose port 8000 but we will use a reverse proxy to serve the app anyway
 EXPOSE 8000
 

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   ngen-frontend:
-    image: certunlp/ngen-frontend:rc-2.3.2
+    image: certunlp/ngen-frontend:rc-2.3.8.2
     restart: always
     volumes:
       - ./data_static:/app/staticfiles
@@ -11,7 +11,7 @@ services:
       - "80:80"
 
   ngen-django:
-    image: certunlp/ngen-django:rc-2.3.2
+    image: certunlp/ngen-django:rc-2.3.8.2
     restart: always
     entrypoint: ./docker/entrypoint.sh
     command: gunicorn project.wsgi:application --bind 0.0.0.0:8000
@@ -27,7 +27,7 @@ services:
       - ngen-redis
 
   ngen-celery-worker:
-    image: certunlp/ngen-django:rc-2.3.2
+    image: certunlp/ngen-django:rc-2.3.8.2
     restart: always
     command: celery -A project worker -l warning
     env_file:
@@ -39,7 +39,7 @@ services:
       - ngen-redis
 
   ngen-celery-beat:
-    image: certunlp/ngen-django:rc-2.3.2
+    image: certunlp/ngen-django:rc-2.3.8.2
     restart: always
     command: celery -A project beat -l warning
     env_file:

diff --git a/frontend/Dockerfile.dev b/frontend/Dockerfile.dev
@@ -22,5 +22,15 @@ COPY . ./
 # Expose port
 EXPOSE 3000
 
+# Add version information
+ARG APP_VERSION_TAG
+ARG APP_COMMIT
+ARG APP_BRANCH
+ENV VITE_APP_VERSION_TAG=$APP_VERSION_TAG
+ENV VITE_APP_COMMIT=$APP_COMMIT
+ENV VITE_APP_BRANCH=$APP_BRANCH
+ENV VITE_APP_BUILD_FILE="dev"
+RUN echo "{\"tag\": \"$VITE_APP_VERSION_TAG\", \"commit\": \"$VITE_APP_COMMIT\", \"branch\": \"$VITE_APP_BRANCH\", \"build_file\": \"$VITE_APP_BUILD_FILE\"}" > /app/public/version.json
+
 # start app
 CMD ["npm", "run","start"]
diff --git a/frontend/Dockerfile.prod b/frontend/Dockerfile.prod
@@ -4,6 +4,14 @@ FROM node:18-alpine AS build
 # set working directory
 WORKDIR /app
 
+ARG APP_VERSION_TAG
+ARG APP_COMMIT
+ARG APP_BRANCH
+
+ENV VITE_APP_VERSION_TAG=$APP_VERSION_TAG
+ENV VITE_APP_COMMIT=$APP_COMMIT
+ENV VITE_APP_BRANCH=$APP_BRANCH
+ENV VITE_APP_BUILD_FILE="prod"
 # add `/app/node_modules/.bin` to $PATH
 ENV PATH=/app/node_modules/.bin:$PATH
 
@@ -37,6 +45,9 @@ COPY nginx-prod/nginx.conf.template.ssl /etc/nginx/nginx.conf.template.ssl
 COPY nginx-prod/nginx.conf.template.no-ssl /etc/nginx/nginx.conf.template.no-ssl
 COPY nginx-prod/docker-entrypoint.sh /docker-entrypoint.sh
 
+# Add version information
+RUN echo "{\"tag\": \"$VITE_APP_VERSION_TAG\", \"commit\": \"$VITE_APP_COMMIT\", \"branch\": \"$VITE_APP_BRANCH\", \"build_file\": \"$VITE_APP_BUILD_FILE\"}" > /usr/share/nginx/html/version.json
+
 # Give permissions to the entry script
 RUN chmod +x /docker-entrypoint.sh