Fix images (#84)

Author: BaDos

images/elasticsearch/7.11/Dockerfile

@@ -1,6 +1,8 @@
 FROM docker.elastic.co/elasticsearch/elasticsearch:7.11.2
 
-RUN yum -y install zip && \
+RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Linux-* && \
+    sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Linux-* && \
+    yum -y install zip && \
     zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
     yum remove -y zip && \
     yum -y clean all && \

images/elasticsearch/es/Dockerfile

@@ -1,6 +1,6 @@
 FROM docker.elastic.co/elasticsearch/elasticsearch:{%version%}
 
-RUN yum -y install zip && \
+RUN {%fix_repos%}yum -y install zip && \
     zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
     yum remove -y zip && \
     yum -y clean all && \

images/php/8.0-cli/Dockerfile

@@ -1,5 +1,5 @@
 # This file is automatically generated. Do not edit directly. #
-FROM php:8.0-cli
+FROM php:8.0.14-cli
 
 ARG COMPOSER_VERSION=2.1.14
 ARG MAGENTO_ROOT=/app

images/php/8.0-fpm/Dockerfile

@@ -1,5 +1,5 @@
 # This file is automatically generated. Do not edit directly. #
-FROM php:8.0-fpm
+FROM php:8.0.14-fpm
 
 ARG MAGENTO_ROOT=/app
 

images/php/8.1-cli/Dockerfile

@@ -1,5 +1,5 @@
 # This file is automatically generated. Do not edit directly. #
-FROM php:8.1-cli
+FROM php:8.1.1-cli
 
 ARG COMPOSER_VERSION=2.1.14
 ARG MAGENTO_ROOT=/app

images/php/8.1-fpm/Dockerfile

@@ -1,5 +1,5 @@
 # This file is automatically generated. Do not edit directly. #
-FROM php:8.1-fpm
+FROM php:8.1.1-fpm
 
 ARG MAGENTO_ROOT=/app
 

src/Command/Image/GenerateEs.php

@@ -103,6 +103,11 @@ protected function configure(): void
      */
     public function execute(InputInterface $input, OutputInterface $output): int
     {
+        $fixRepo = <<<FIX
+sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Linux-* && \
+    sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Linux-* && \
+    
+FIX;
         foreach ($this->versionMap as $version => $versionData) {
             $destination = $this->directoryList->getImagesRoot() . '/elasticsearch/' . $version;
             $dataDir = $this->directoryList->getImagesRoot() . '/elasticsearch/es/';
@@ -120,6 +125,7 @@ public function execute(InputInterface $input, OutputInterface $output): int
                     [
                         '{%version%}' => $versionData['real-version'],
                         '{%single_node%}' => $versionData['single-node'] ? self::SINGLE_NODE : '',
+                        '{%fix_repos%}' => ($version === '7.11') ? $fixRepo : '',
                     ]
                 )
             );

src/Command/Image/GeneratePhp.php

@@ -28,6 +28,14 @@ class GeneratePhp extends Command
     private const NAME = 'image:generate:php';
     private const SUPPORTED_VERSIONS = ['7.2', '7.3', '7.4', '8.0', '8.1'];
 
+    private const VERSION_MAP = [
+        '7.2' => '7.2',
+        '7.3' => '7.3',
+        '7.4' => '7.4',
+        '8.0' => '8.0.14',
+        '8.1' => '8.1.1'
+    ];
+
     private const EDITION_CLI = 'cli';
     private const EDITION_FPM = 'fpm';
     private const EDITIONS = [self::EDITION_CLI, self::EDITION_FPM];
@@ -296,7 +304,7 @@ private function buildDockerfile(string $dockerfile, string $phpVersion, string
             $this->filesystem->get($dockerfile),
             [
                 '{%note%}' => '# This file is automatically generated. Do not edit directly. #',
-                '{%version%}' => $phpVersion,
+                '{%version%}' => self::VERSION_MAP[$phpVersion],
                 '{%composer_version%}' => $this->semver::satisfies($phpVersion, '<8.0')
                     ? '1.10.22'
                     : '2.1.14',