From dac59817f547ce8d49fa01433f977f6a93f8a288 Mon Sep 17 00:00:00 2001
From: Claudio Ferraro <54107647+jbclaudio@users.noreply.github.com>
Date: Fri, 22 Mar 2024 11:22:44 +0100
Subject: [PATCH] Add support for PHP 8.1 + 8.2 and Ubuntu 22.04

---
 7.0/Dockerfile | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++
 8.0/Dockerfile | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++
 README.md      |  2 ++
 3 files changed, 158 insertions(+)
 create mode 100644 7.0/Dockerfile
 create mode 100644 8.0/Dockerfile

diff --git a/7.0/Dockerfile b/7.0/Dockerfile
new file mode 100644
index 0000000..ce432a0
--- /dev/null
+++ b/7.0/Dockerfile
@@ -0,0 +1,78 @@
+FROM ubuntu:22.04
+
+ENV TZ=UTC
+
+RUN export LC_ALL=C.UTF-8
+RUN DEBIAN_FRONTEND=noninteractive
+RUN rm /bin/sh && ln -s /bin/bash /bin/sh
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+RUN apt-get update
+RUN apt-get install -y \
+    sudo \
+    autoconf \
+    autogen \
+    language-pack-en-base \
+    wget \
+    zip \
+    unzip \
+    curl \
+    rsync \
+    ssh \
+    openssh-client \
+    git \
+    build-essential \
+    apt-utils \
+    software-properties-common \
+    nasm \
+    libjpeg-dev \
+    libpng-dev \
+    libpng16-16
+
+RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
+
+# PHP
+RUN LC_ALL=en_US.UTF-8 add-apt-repository ppa:ondrej/php && apt-get update && apt-get install -y php8.2
+RUN apt-get install -y \
+    php8.2-curl \
+    php8.2-gd \
+    php8.2-dev \
+    php8.2-xml \
+    php8.2-bcmath \
+    php8.2-mysql \
+    php8.2-pgsql \
+    php8.2-mbstring \
+    php8.2-zip \
+    php8.2-bz2 \
+    php8.2-sqlite \
+    php8.2-soap \
+    php8.2-intl \
+    php8.2-imap \
+    php8.2-imagick \
+    php-memcached
+RUN command -v php
+
+# Composer
+RUN curl -sS https://getcomposer.org/installer | php
+RUN mv composer.phar /usr/local/bin/composer && \
+    chmod +x /usr/local/bin/composer && \
+    composer self-update
+RUN command -v composer
+
+# Node.js
+RUN curl -sL https://deb.nodesource.com/setup_12.x -o nodesource_setup.sh
+RUN bash nodesource_setup.sh
+RUN apt-get install nodejs -y
+RUN npm install npm@6 -g
+RUN command -v node
+RUN command -v npm
+
+# Other
+RUN mkdir ~/.ssh
+RUN touch ~/.ssh_config
+
+# Display versions installed
+RUN php -v
+RUN composer --version
+RUN node -v
+RUN npm -v
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
new file mode 100644
index 0000000..c707bb6
--- /dev/null
+++ b/8.0/Dockerfile
@@ -0,0 +1,78 @@
+FROM ubuntu:22.04
+
+ENV TZ=UTC
+
+RUN export LC_ALL=C.UTF-8
+RUN DEBIAN_FRONTEND=noninteractive
+RUN rm /bin/sh && ln -s /bin/bash /bin/sh
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+RUN apt-get update
+RUN apt-get install -y \
+    sudo \
+    autoconf \
+    autogen \
+    language-pack-en-base \
+    wget \
+    zip \
+    unzip \
+    curl \
+    rsync \
+    ssh \
+    openssh-client \
+    git \
+    build-essential \
+    apt-utils \
+    software-properties-common \
+    nasm \
+    libjpeg-dev \
+    libpng-dev \
+    libpng16-16
+
+RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
+
+# PHP
+RUN LC_ALL=en_US.UTF-8 add-apt-repository ppa:ondrej/php && apt-get update && apt-get install -y php8.3
+RUN apt-get install -y \
+    php8.3-curl \
+    php8.3-gd \
+    php8.3-dev \
+    php8.3-xml \
+    php8.3-bcmath \
+    php8.3-mysql \
+    php8.3-pgsql \
+    php8.3-mbstring \
+    php8.3-zip \
+    php8.3-bz2 \
+    php8.3-sqlite \
+    php8.3-soap \
+    php8.3-intl \
+    php8.3-imap \
+    php8.3-imagick \
+    php-memcached
+RUN command -v php
+
+# Composer
+RUN curl -sS https://getcomposer.org/installer | php
+RUN mv composer.phar /usr/local/bin/composer && \
+    chmod +x /usr/local/bin/composer && \
+    composer self-update
+RUN command -v composer
+
+# Node.js
+RUN curl -sL https://deb.nodesource.com/setup_12.x -o nodesource_setup.sh
+RUN bash nodesource_setup.sh
+RUN apt-get install nodejs -y
+RUN npm install npm@6 -g
+RUN command -v node
+RUN command -v npm
+
+# Other
+RUN mkdir ~/.ssh
+RUN touch ~/.ssh_config
+
+# Display versions installed
+RUN php -v
+RUN composer --version
+RUN node -v
+RUN npm -v
diff --git a/README.md b/README.md
index 290caa6..7860439 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 # Docker image for Continuous Integration
 
 ## Available tags
+- [`8.0` (_Dockerfile_)](https://github.com/vyuldashev/docker-ci-php-node/blob/master/8.0/Dockerfile)
+- [`7.0` (_Dockerfile_)](https://github.com/vyuldashev/docker-ci-php-node/blob/master/7.0/Dockerfile)
 - [`6.0` (_Dockerfile_)](https://github.com/vyuldashev/docker-ci-php-node/blob/master/6.0/Dockerfile)
 - [`5.0` (_Dockerfile_)](https://github.com/vyuldashev/docker-ci-php-node/blob/master/5.0/Dockerfile)
 - [`4.0` (_Dockerfile_)](https://github.com/vyuldashev/docker-ci-php-node/blob/master/4.0/Dockerfile)