Fix pypi overrides

Author: ostefano

core/Dockerfile

@@ -148,8 +148,8 @@ FROM php-base AS python-build
     ARG PYPI_CYBOX_VERSION
     ARG PYPI_PYMISP_VERSION
     ARG PYPI_MISP_STIX_VERSION
-    ARG PYPI_SETUPTOOLS
-    ARG PYPI_SUPERVISOR
+    ARG PYPI_SETUPTOOLS_VERSION
+    ARG PYPI_SUPERVISOR_VERSION
 
     RUN apt-get install -y --no-install-recommends \
         git \

docker-bake.hcl

@@ -38,15 +38,15 @@ variable "PYPI_PYMISP_VERSION" {
   default = ""
 }
 
-variable "PYPI_MISP_STIX" {
+variable "PYPI_MISP_STIX_VERSION" {
   default = ""
 }
 
-variable "PYPI_SETUPTOOLS" {
+variable "PYPI_SETUPTOOLS_VERSION" {
   default = ""
 }
 
-variable "PYPI_SUPERVISOR" {
+variable "PYPI_SUPERVISOR_VERSION" {
   default = ""
 }
 
@@ -129,8 +129,9 @@ target "misp-core" {
     "PYPI_MIXBOX_VERSION": "${PYPI_MIXBOX_VERSION}",
     "PYPI_CYBOX_VERSION": "${PYPI_CYBOX_VERSION}",
     "PYPI_PYMISP_VERSION": "${PYPI_PYMISP_VERSION}",
-    "PYPI_SETUPTOOLS": "${PYPI_SETUPTOOLS}",
-    "PYPI_SUPERVISOR": "${PYPI_SUPERVISOR}",
+    "PYPI_MISP_STIX_VERSION": "${PYPI_MISP_STIX_VERSION}",
+    "PYPI_SETUPTOOLS_VERSION": "${PYPI_SETUPTOOLS_VERSION}",
+    "PYPI_SUPERVISOR_VERSION": "${PYPI_SUPERVISOR_VERSION}",
   }
   platforms = "${PLATFORMS}"
 }
@@ -153,8 +154,9 @@ target "misp-core-slim" {
     "PYPI_MIXBOX_VERSION": "${PYPI_MIXBOX_VERSION}",
     "PYPI_CYBOX_VERSION": "${PYPI_CYBOX_VERSION}",
     "PYPI_PYMISP_VERSION": "${PYPI_PYMISP_VERSION}",
-    "PYPI_SETUPTOOLS": "${PYPI_SETUPTOOLS}",
-    "PYPI_SUPERVISOR": "${PYPI_SUPERVISOR}",
+    "PYPI_MISP_STIX_VERSION": "${PYPI_MISP_STIX_VERSION}",
+    "PYPI_SETUPTOOLS_VERSION": "${PYPI_SETUPTOOLS_VERSION}",
+    "PYPI_SUPERVISOR_VERSION": "${PYPI_SUPERVISOR_VERSION}",
   }
   platforms = "${PLATFORMS}"
 }

docker-compose.yml

@@ -72,8 +72,8 @@ services:
           - PYPI_CYBOX_VERSION=${PYPI_CYBOX_VERSION}
           - PYPI_PYMISP_VERSION=${PYPI_PYMISP_VERSION}
           - PYPI_MISP_STIX_VERSION=${PYPI_MISP_STIX_VERSION}
-          - PYPI_SETUPTOOLS=${PYPI_SETUPTOOLS}
-          - PYPI_SUPERVISOR=${PYPI_SUPERVISOR}
+          - PYPI_SETUPTOOLS_VERSION=${PYPI_SETUPTOOLS_VERSION}
+          - PYPI_SUPERVISOR_VERSION=${PYPI_SUPERVISOR_VERSION}
     depends_on:
       redis:
         condition: service_healthy

template.env

@@ -19,8 +19,8 @@ PHP_VER=20220829
 # PYPI_CYBOX_VERSION="==2.1.*"
 # PYPI_PYMISP_VERSION="==2.5.9"
 # PYPI_MISP_STIX_VERSION="==2.4.194"
-PYPI_SETUPTOOLS="==80.3.1"
-PYPI_SUPERVISOR="==4.2.5"
+PYPI_SETUPTOOLS_VERSION="==80.3.1"
+PYPI_SUPERVISOR_VERSION="==4.2.5"
 
 # CORE_COMMIT takes precedence over CORE_TAG
 # CORE_COMMIT=0bba3f5