chore(docker): Handle classic image generation and generate for rc 1 & fix regex

tleon · tleon · commit e654bb440f18 · 2025-06-04T11:18:07.000+02:00
diff --git a/images/9.0.0-1.0-beta.1-classic/8.1-apache/Dockerfile b/images/9.0.0-1.0-beta.1-classic/8.1-apache/Dockerfile
@@ -1,10 +1,10 @@
 FROM prestashop/base:8.1-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
-ENV PS_VERSION 9.0.0-beta.1-classic
+ENV PS_VERSION 9.0.0-1.0-beta.1-classic
 
 # Get PrestaShop
-ADD https://github.com/PrestaShopCorp/PrestaShop-classic/releases/download/9.0.0-beta.1-classic/prestashop_9.0.0-beta.1-classic.zip /tmp/prestashop.zip
+ADD https://github.com/prestashopcorp/prestashop-classic/releases/download/9.0.0-1.0-beta.1/prestashop_9.0.0-1.0-beta.1.zip /tmp/prestashop.zip
 
 # Extract
 RUN mkdir -p /tmp/data-ps \
diff --git a/images/9.0.0-1.0-beta.1-classic/8.1-fpm/Dockerfile b/images/9.0.0-1.0-beta.1-classic/8.1-fpm/Dockerfile
@@ -1,10 +1,10 @@
 FROM prestashop/base:8.1-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
-ENV PS_VERSION 9.0.0-beta.1-classic
+ENV PS_VERSION 9.0.0-1.0-beta.1-classic
 
 # Get PrestaShop
-ADD https://github.com/PrestaShopCorp/PrestaShop-classic/releases/download/9.0.0-beta.1-classic/prestashop_9.0.0-beta.1-classic.zip /tmp/prestashop.zip
+ADD https://github.com/prestashopcorp/prestashop-classic/releases/download/9.0.0-1.0-beta.1/prestashop_9.0.0-1.0-beta.1.zip /tmp/prestashop.zip
 
 # Extract
 RUN mkdir -p /tmp/data-ps \
diff --git a/images/9.0.0-1.0-beta.1-classic/8.2-apache/Dockerfile b/images/9.0.0-1.0-beta.1-classic/8.2-apache/Dockerfile
@@ -1,10 +1,10 @@
 FROM prestashop/base:8.2-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
-ENV PS_VERSION 9.0.0-beta.1-classic
+ENV PS_VERSION 9.0.0-1.0-beta.1-classic
 
 # Get PrestaShop
-ADD https://github.com/PrestaShopCorp/PrestaShop-classic/releases/download/9.0.0-beta.1-classic/prestashop_9.0.0-beta.1-classic.zip /tmp/prestashop.zip
+ADD https://github.com/prestashopcorp/prestashop-classic/releases/download/9.0.0-1.0-beta.1/prestashop_9.0.0-1.0-beta.1.zip /tmp/prestashop.zip
 
 # Extract
 RUN mkdir -p /tmp/data-ps \
diff --git a/images/9.0.0-1.0-beta.1-classic/8.2-fpm/Dockerfile b/images/9.0.0-1.0-beta.1-classic/8.2-fpm/Dockerfile
@@ -1,10 +1,10 @@
 FROM prestashop/base:8.2-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
-ENV PS_VERSION 9.0.0-beta.1-classic
+ENV PS_VERSION 9.0.0-1.0-beta.1-classic
 
 # Get PrestaShop
-ADD https://github.com/PrestaShopCorp/PrestaShop-classic/releases/download/9.0.0-beta.1-classic/prestashop_9.0.0-beta.1-classic.zip /tmp/prestashop.zip
+ADD https://github.com/prestashopcorp/prestashop-classic/releases/download/9.0.0-1.0-beta.1/prestashop_9.0.0-1.0-beta.1.zip /tmp/prestashop.zip
 
 # Extract
 RUN mkdir -p /tmp/data-ps \
diff --git a/images/9.0.0-1.0-beta.1-classic/8.3-apache/Dockerfile b/images/9.0.0-1.0-beta.1-classic/8.3-apache/Dockerfile
@@ -1,10 +1,10 @@
 FROM prestashop/base:8.3-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
-ENV PS_VERSION 9.0.0-beta.1-classic
+ENV PS_VERSION 9.0.0-1.0-beta.1-classic
 
 # Get PrestaShop
-ADD https://github.com/PrestaShopCorp/PrestaShop-classic/releases/download/9.0.0-beta.1-classic/prestashop_9.0.0-beta.1-classic.zip /tmp/prestashop.zip
+ADD https://github.com/prestashopcorp/prestashop-classic/releases/download/9.0.0-1.0-beta.1/prestashop_9.0.0-1.0-beta.1.zip /tmp/prestashop.zip
 
 # Extract
 RUN mkdir -p /tmp/data-ps \
diff --git a/images/9.0.0-1.0-beta.1-classic/8.3-fpm/Dockerfile b/images/9.0.0-1.0-beta.1-classic/8.3-fpm/Dockerfile
@@ -1,10 +1,10 @@
 FROM prestashop/base:8.3-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
-ENV PS_VERSION 9.0.0-beta.1-classic
+ENV PS_VERSION 9.0.0-1.0-beta.1-classic
 
 # Get PrestaShop
-ADD https://github.com/PrestaShopCorp/PrestaShop-classic/releases/download/9.0.0-beta.1-classic/prestashop_9.0.0-beta.1-classic.zip /tmp/prestashop.zip
+ADD https://github.com/prestashopcorp/prestashop-classic/releases/download/9.0.0-1.0-beta.1/prestashop_9.0.0-1.0-beta.1.zip /tmp/prestashop.zip
 
 # Extract
 RUN mkdir -p /tmp/data-ps \
diff --git a/images/9.0.0-1.0-beta.1-classic/8.4-apache/Dockerfile b/images/9.0.0-1.0-beta.1-classic/8.4-apache/Dockerfile
@@ -1,10 +1,10 @@
 FROM prestashop/base:8.4-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
-ENV PS_VERSION 9.0.0-beta.1-classic
+ENV PS_VERSION 9.0.0-1.0-beta.1-classic
 
 # Get PrestaShop
-ADD https://github.com/PrestaShopCorp/PrestaShop-classic/releases/download/9.0.0-beta.1-classic/prestashop_9.0.0-beta.1-classic.zip /tmp/prestashop.zip
+ADD https://github.com/prestashopcorp/prestashop-classic/releases/download/9.0.0-1.0-beta.1/prestashop_9.0.0-1.0-beta.1.zip /tmp/prestashop.zip
 
 # Extract
 RUN mkdir -p /tmp/data-ps \
diff --git a/images/9.0.0-1.0-beta.1-classic/8.4-fpm/Dockerfile b/images/9.0.0-1.0-beta.1-classic/8.4-fpm/Dockerfile
@@ -1,10 +1,10 @@
 FROM prestashop/base:8.4-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
-ENV PS_VERSION 9.0.0-beta.1-classic
+ENV PS_VERSION 9.0.0-1.0-beta.1-classic
 
 # Get PrestaShop
-ADD https://github.com/PrestaShopCorp/PrestaShop-classic/releases/download/9.0.0-beta.1-classic/prestashop_9.0.0-beta.1-classic.zip /tmp/prestashop.zip
+ADD https://github.com/prestashopcorp/prestashop-classic/releases/download/9.0.0-1.0-beta.1/prestashop_9.0.0-1.0-beta.1.zip /tmp/prestashop.zip
 
 # Extract
 RUN mkdir -p /tmp/data-ps \
diff --git a/images/9.0.0-1.0-rc.1-classic/8.1-apache/Dockerfile b/images/9.0.0-1.0-rc.1-classic/8.1-apache/Dockerfile
@@ -0,0 +1,13 @@
+FROM prestashop/base:8.1-apache
+LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
+
+ENV PS_VERSION 9.0.0-1.0-rc.1-classic
+
+# Get PrestaShop
+ADD https://github.com/prestashopcorp/prestashop-classic/releases/download/9.0.0-1.0-rc.1/prestashop_9.0.0-1.0-rc.1.zip /tmp/prestashop.zip
+
+# Extract
+RUN mkdir -p /tmp/data-ps \
+	&& unzip -q /tmp/prestashop.zip -d /tmp/data-ps/ \
+	&& bash /tmp/ps-extractor.sh /tmp/data-ps \
+	&& rm /tmp/prestashop.zip
diff --git a/images/9.0.0-1.0-rc.1-classic/8.1-fpm/Dockerfile b/images/9.0.0-1.0-rc.1-classic/8.1-fpm/Dockerfile
@@ -0,0 +1,13 @@
+FROM prestashop/base:8.1-fpm
+LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
+
+ENV PS_VERSION 9.0.0-1.0-rc.1-classic
+
+# Get PrestaShop
+ADD https://github.com/prestashopcorp/prestashop-classic/releases/download/9.0.0-1.0-rc.1/prestashop_9.0.0-1.0-rc.1.zip /tmp/prestashop.zip
+
+# Extract
+RUN mkdir -p /tmp/data-ps \
+	&& unzip -q /tmp/prestashop.zip -d /tmp/data-ps/ \
+	&& bash /tmp/ps-extractor.sh /tmp/data-ps \
+	&& rm /tmp/prestashop.zip
diff --git a/images/9.0.0-1.0-rc.1-classic/8.2-apache/Dockerfile b/images/9.0.0-1.0-rc.1-classic/8.2-apache/Dockerfile
@@ -0,0 +1,13 @@
+FROM prestashop/base:8.2-apache
+LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
+
+ENV PS_VERSION 9.0.0-1.0-rc.1-classic
+
+# Get PrestaShop
+ADD https://github.com/prestashopcorp/prestashop-classic/releases/download/9.0.0-1.0-rc.1/prestashop_9.0.0-1.0-rc.1.zip /tmp/prestashop.zip
+
+# Extract
+RUN mkdir -p /tmp/data-ps \
+	&& unzip -q /tmp/prestashop.zip -d /tmp/data-ps/ \
+	&& bash /tmp/ps-extractor.sh /tmp/data-ps \
+	&& rm /tmp/prestashop.zip
diff --git a/images/9.0.0-1.0-rc.1-classic/8.2-fpm/Dockerfile b/images/9.0.0-1.0-rc.1-classic/8.2-fpm/Dockerfile
@@ -0,0 +1,13 @@
+FROM prestashop/base:8.2-fpm
+LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
+
+ENV PS_VERSION 9.0.0-1.0-rc.1-classic
+
+# Get PrestaShop
+ADD https://github.com/prestashopcorp/prestashop-classic/releases/download/9.0.0-1.0-rc.1/prestashop_9.0.0-1.0-rc.1.zip /tmp/prestashop.zip
+
+# Extract
+RUN mkdir -p /tmp/data-ps \
+	&& unzip -q /tmp/prestashop.zip -d /tmp/data-ps/ \
+	&& bash /tmp/ps-extractor.sh /tmp/data-ps \
+	&& rm /tmp/prestashop.zip
diff --git a/images/9.0.0-1.0-rc.1-classic/8.3-apache/Dockerfile b/images/9.0.0-1.0-rc.1-classic/8.3-apache/Dockerfile
@@ -0,0 +1,13 @@
+FROM prestashop/base:8.3-apache
+LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
+
+ENV PS_VERSION 9.0.0-1.0-rc.1-classic
+
+# Get PrestaShop
+ADD https://github.com/prestashopcorp/prestashop-classic/releases/download/9.0.0-1.0-rc.1/prestashop_9.0.0-1.0-rc.1.zip /tmp/prestashop.zip
+
+# Extract
+RUN mkdir -p /tmp/data-ps \
+	&& unzip -q /tmp/prestashop.zip -d /tmp/data-ps/ \
+	&& bash /tmp/ps-extractor.sh /tmp/data-ps \
+	&& rm /tmp/prestashop.zip
diff --git a/images/9.0.0-1.0-rc.1-classic/8.3-fpm/Dockerfile b/images/9.0.0-1.0-rc.1-classic/8.3-fpm/Dockerfile
@@ -0,0 +1,13 @@
+FROM prestashop/base:8.3-fpm
+LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
+
+ENV PS_VERSION 9.0.0-1.0-rc.1-classic
+
+# Get PrestaShop
+ADD https://github.com/prestashopcorp/prestashop-classic/releases/download/9.0.0-1.0-rc.1/prestashop_9.0.0-1.0-rc.1.zip /tmp/prestashop.zip
+
+# Extract
+RUN mkdir -p /tmp/data-ps \
+	&& unzip -q /tmp/prestashop.zip -d /tmp/data-ps/ \
+	&& bash /tmp/ps-extractor.sh /tmp/data-ps \
+	&& rm /tmp/prestashop.zip
diff --git a/images/9.0.0-1.0-rc.1-classic/8.4-apache/Dockerfile b/images/9.0.0-1.0-rc.1-classic/8.4-apache/Dockerfile
@@ -0,0 +1,13 @@
+FROM prestashop/base:8.4-apache
+LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
+
+ENV PS_VERSION 9.0.0-1.0-rc.1-classic
+
+# Get PrestaShop
+ADD https://github.com/prestashopcorp/prestashop-classic/releases/download/9.0.0-1.0-rc.1/prestashop_9.0.0-1.0-rc.1.zip /tmp/prestashop.zip
+
+# Extract
+RUN mkdir -p /tmp/data-ps \
+	&& unzip -q /tmp/prestashop.zip -d /tmp/data-ps/ \
+	&& bash /tmp/ps-extractor.sh /tmp/data-ps \
+	&& rm /tmp/prestashop.zip
diff --git a/images/9.0.0-1.0-rc.1-classic/8.4-fpm/Dockerfile b/images/9.0.0-1.0-rc.1-classic/8.4-fpm/Dockerfile
@@ -0,0 +1,13 @@
+FROM prestashop/base:8.4-fpm
+LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
+
+ENV PS_VERSION 9.0.0-1.0-rc.1-classic
+
+# Get PrestaShop
+ADD https://github.com/prestashopcorp/prestashop-classic/releases/download/9.0.0-1.0-rc.1/prestashop_9.0.0-1.0-rc.1.zip /tmp/prestashop.zip
+
+# Extract
+RUN mkdir -p /tmp/data-ps \
+	&& unzip -q /tmp/prestashop.zip -d /tmp/data-ps/ \
+	&& bash /tmp/ps-extractor.sh /tmp/data-ps \
+	&& rm /tmp/prestashop.zip
diff --git a/prestashop_docker/generator.py b/prestashop_docker/generator.py
@@ -24,7 +24,7 @@ def __init__(self, directory_path, template, nightly_template, branch_template):
         self.download_url = 'https://www.prestashop.com/download/old/' \
             'prestashop_{}.zip'
         self.download_url_github = 'https://github.com/PrestaShop/PrestaShop/releases/download/{}/prestashop_{}.zip'
-        self.download_url_github_classic = 'https://github.com/PrestaShopCorp/PrestaShop-classic/releases/download/{}/prestashop_{}.zip'
+        self.download_url_github_classic = 'https://github.com/prestashopcorp/prestashop-classic/releases/download/{}/prestashop_{}.zip'
         self.directory_path = directory_path
         self.template = Template(template)
         self.nightly_template = Template(nightly_template)
@@ -94,7 +94,7 @@ def generate_image(self, ps_version, container_version):
 
             if use_github_url:
                 if parsed_version['distribution'] == 'classic':
-                    ps_url = self.download_url_github_classic.format(ps_version, ps_version)
+                    ps_url = self.download_url_github_classic.format(ps_version.replace("-classic", ""), ps_version.replace("-classic", ""))
                 else:
                     ps_url = self.download_url_github.format(ps_version, ps_version)
             else:
diff --git a/prestashop_docker/version_manager.py b/prestashop_docker/version_manager.py
@@ -195,7 +195,7 @@ def split_prestashop_version(self, version):
         @rtpe: None|tuple
         '''
 
-        regex = r"^(?P<major>(1.)?[0-9]+)\.(?P<minor>[0-9]+)\.(?P<patch>[0-9x]+)(?P<prerelease>-(alpha|beta|rc)(?:\.\d+)?(?:\+\d+)?)?(?:-(?P<distribution>classic))?"
+        regex = r"^(?P<major>(1.)?[0-9]+)\.(?P<minor>[0-9]+)\.(?P<patch>[0-9x]+)(\-(?P<distribution_major>[0-9]+)\.(?P<distribution_minor>[0-9]+))?(?P<prerelease>-(alpha|beta|rc)(?:\.\d+)?(?:\+\d+)?)?(?:-(?P<distribution>classic))?"
 
         matches = re.search(regex, version)
 
@@ -222,7 +222,10 @@ def parse_version_from_string(self, version):
         @return: Return None if no position in the string matches the pattern otherwise a Match object.
         @rtpe: None|Match
         '''
-        regex = r"^(?P<version>(?:[0-9]+\.){0,3}(?:[0-9]+|nightly|x)(?:-(?:alpha|beta|rc)(?:\.\d+)?(?:\+\d+)?)?)(?:-(?P<distribution>classic))?(?:-(?P<php>\d+\.\d+))?(?:-(?P<container>fpm|apache))?$"
+        if "-classic" in version:
+            regex = r"^(?P<version>(?:[0-9]+\.){0,3}((?:[0-9]+|nightly|x))(?:-(?:[0-9]+\.[0-9]+))?(?:-(?:alpha|beta|rc)(?:\.\d+)?(?:\+\d+)?)?)(?:-(?P<distribution>classic))?(?:-(?P<php>\d+\.\d+))?(?:-(?P<container>fpm|apache))?$"
+        else:
+            regex = r"^(?P<version>(?:[0-9]+\.){0,3}((?:[0-9]+|nightly|x))(?:-(?:alpha|beta|rc)(?:\.\d+)?(?:\+\d+)?)?)(?:-(?P<distribution>classic))?(?:-(?P<php>\d+\.\d+))?(?:-(?P<container>fpm|apache))?$"
         return re.search(regex, version)
 
     def get_aliases(self):
diff --git a/tests/prestashop_docker/test_version_manager.py b/tests/prestashop_docker/test_version_manager.py
diff --git a/versions.py b/versions.py
