From 3488072fcdbf8ad16206ad114e808ddeb3e1a156 Mon Sep 17 00:00:00 2001 From: Fu Cheng Date: Fri, 15 Dec 2023 10:06:11 +0800 Subject: [PATCH] Add version 2.4.5-p5 --- .github/workflows/docker-publish.yml | 1 + update.js | 6 ++- versions/2.4.5-p5/Dockerfile | 62 +++++++++++++++++++++++++++ versions/2.4.5-p5/auth.json | 8 ++++ versions/2.4.5-p5/docker-compose.yaml | 56 ++++++++++++++++++++++++ versions/2.4.5-p5/env | 22 ++++++++++ versions/2.4.5-p5/install-magento | 37 ++++++++++++++++ versions/2.4.5-p5/install-sampledata | 9 ++++ 8 files changed, 200 insertions(+), 1 deletion(-) create mode 100644 versions/2.4.5-p5/Dockerfile create mode 100644 versions/2.4.5-p5/auth.json create mode 100644 versions/2.4.5-p5/docker-compose.yaml create mode 100644 versions/2.4.5-p5/env create mode 100644 versions/2.4.5-p5/install-magento create mode 100644 versions/2.4.5-p5/install-sampledata diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 7dd98de2e..f0cae1091 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -30,6 +30,7 @@ jobs: matrix: version: - 2.4.6-p3 + - 2.4.5-p5 steps: - name: Checkout repository diff --git a/update.js b/update.js index adde80980..807b10677 100644 --- a/update.js +++ b/update.js @@ -9,7 +9,11 @@ const versions = [ phpVersion: "8.1", magento2Version: "2.4.6-p3", openSearchVersion: "2", - }, + },{ + phpVersion: "8.1", + magento2Version: "2.4.5-p5", + openSearchVersion: "1", + } ]; function getVersionDir(version) { diff --git a/versions/2.4.5-p5/Dockerfile b/versions/2.4.5-p5/Dockerfile new file mode 100644 index 000000000..759bb2ebb --- /dev/null +++ b/versions/2.4.5-p5/Dockerfile @@ -0,0 +1,62 @@ +FROM ghcr.io/alexcheng1982/docker-apache2-php8:8.1 + +LABEL maintainer="alexcheng1982@gmail.com" +LABEL php_version="8.1" +LABEL magento_version="2.4.5-p5" +LABEL description="Magento Open Source 2.4.5-p5 with PHP 8.1" + +ENV MAGENTO_VERSION 2.4.5-p5 +ENV INSTALL_DIR /var/www/html +ENV COMPOSER_HOME /var/www/.composer/ + +RUN curl -sS https://getcomposer.org/installer | php \ + && mv composer.phar /usr/local/bin/composer +COPY ./auth.json $COMPOSER_HOME + +RUN requirements="libpng++-dev libzip-dev libmcrypt-dev libmcrypt4 libcurl3-dev libfreetype6 libjpeg-turbo8 libjpeg-turbo8-dev libfreetype6-dev libicu-dev libxslt1-dev zip unzip libxml2 libonig-dev" \ + set -eux; \ + apt-get update; \ + apt-get install -y $requirements; \ + rm -rf /var/lib/apt/lists/* + +RUN set -eux; \ + docker-php-ext-install pdo_mysql; \ + docker-php-ext-configure gd --with-freetype --with-jpeg; \ + docker-php-ext-install gd; \ + docker-php-ext-install mbstring; \ + docker-php-ext-install zip; \ + docker-php-ext-install intl; \ + docker-php-ext-install xsl; \ + docker-php-ext-install soap; \ + docker-php-ext-install sockets; \ + docker-php-ext-install bcmath + +RUN yes '' | pecl install mcrypt-1.0.6 \ + && echo 'extension=mcrypt.so' > /usr/local/etc/php/conf.d/mcrypt.ini + +RUN chsh -s /bin/bash www-data + +RUN chown -R www-data:www-data /var/www + +RUN su www-data -c "composer create-project --repository-url=https://repo.magento.com/ magento/project-community-edition $INSTALL_DIR $MAGENTO_VERSION" + +RUN cd $INSTALL_DIR \ + && find var generated vendor pub/static pub/media app/etc -type f -exec chmod g+w {} + \ + && find var generated vendor pub/static pub/media app/etc -type d -exec chmod g+ws {} + \ + && chown -R :www-data . \ + && chmod u+x bin/magento + +COPY ./install-magento /usr/local/bin/install-magento +RUN chmod +x /usr/local/bin/install-magento + +COPY ./install-sampledata /usr/local/bin/install-sampledata +RUN chmod +x /usr/local/bin/install-sampledata + +RUN a2enmod rewrite +RUN echo "memory_limit=2048M" > /usr/local/etc/php/conf.d/memory-limit.ini + +RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + +WORKDIR $INSTALL_DIR + +VOLUME $INSTALL_DIR \ No newline at end of file diff --git a/versions/2.4.5-p5/auth.json b/versions/2.4.5-p5/auth.json new file mode 100644 index 000000000..8506a6847 --- /dev/null +++ b/versions/2.4.5-p5/auth.json @@ -0,0 +1,8 @@ + { + "http-basic": { + "repo.magento.com": { + "username": "5310458a34d580de1700dfe826ff19a1", + "password": "255059b03eb9d30604d5ef52fca7465d" + } + } +} \ No newline at end of file diff --git a/versions/2.4.5-p5/docker-compose.yaml b/versions/2.4.5-p5/docker-compose.yaml new file mode 100644 index 000000000..8833e1fb8 --- /dev/null +++ b/versions/2.4.5-p5/docker-compose.yaml @@ -0,0 +1,56 @@ +version: '3.0' +services: + web: + image: ghcr.io/alexcheng1982/docker-magento2:2.4.5-p5 + ports: + - "80:80" + links: + - db + - opensearch + depends_on: + - db + - opensearch + volumes: + - magento-data:/var/www/html + env_file: + - env + db: + image: mysql:8.0.0 + volumes: + - db-data:/var/lib/mysql + env_file: + - env + phpmyadmin: + image: phpmyadmin/phpmyadmin + ports: + - "8580:80" + links: + - db + depends_on: + - db + opensearch: + image: opensearchproject/opensearch:1 + environment: + - cluster.name=opensearch-cluster + - node.name=opensearch + - discovery.seed_hosts=opensearch + - cluster.initial_cluster_manager_nodes=opensearch + - bootstrap.memory_lock=true + - plugins.security.disabled=true + - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" + ulimits: + memlock: + soft: -1 + hard: -1 + nofile: + soft: 65536 + hard: 65536 + volumes: + - opensearch-data:/usr/share/opensearch/data + ports: + - 9200:9200 + - 9600:9600 +volumes: + magento-data: + db-data: + opensearch-data: \ No newline at end of file diff --git a/versions/2.4.5-p5/env b/versions/2.4.5-p5/env new file mode 100644 index 000000000..69c215f1c --- /dev/null +++ b/versions/2.4.5-p5/env @@ -0,0 +1,22 @@ +MYSQL_HOST=db +MYSQL_ROOT_PASSWORD=myrootpassword +MYSQL_USER=magento +MYSQL_PASSWORD=magento +MYSQL_DATABASE=magento + +MAGENTO_LANGUAGE=en_GB +MAGENTO_TIMEZONE=Pacific/Auckland +MAGENTO_DEFAULT_CURRENCY=NZD +MAGENTO_URL=http://local.magento +MAGENTO_BACKEND_FRONTNAME=admin +MAGENTO_USE_SECURE=0 +MAGENTO_BASE_URL_SECURE=0 +MAGENTO_USE_SECURE_ADMIN=0 + +MAGENTO_ADMIN_FIRSTNAME=Admin +MAGENTO_ADMIN_LASTNAME=MyStore +MAGENTO_ADMIN_EMAIL=amdin@example.com +MAGENTO_ADMIN_USERNAME=admin +MAGENTO_ADMIN_PASSWORD=magentorocks1 + +OPENSEARCH_HOST=opensearch \ No newline at end of file diff --git a/versions/2.4.5-p5/install-magento b/versions/2.4.5-p5/install-magento new file mode 100644 index 000000000..a59e0cffd --- /dev/null +++ b/versions/2.4.5-p5/install-magento @@ -0,0 +1,37 @@ +#!/usr/bin/env bash + +su www-data <