Merge pull request martin-helmich#34 from martin-helmich/feature/typo…

…3-10.2

Add support for TYPO3 10.2

.travis.yml

@@ -5,12 +5,13 @@ env:
   - TYPO3_VERSION=6.2
   - TYPO3_VERSION=7.6
   - TYPO3_VERSION=8.7
-  - TYPO3_VERSION=9.1
-  - TYPO3_VERSION=9.2
+  - TYPO3_VERSION=9.5
+  - TYPO3_VERSION=10.1
+  - TYPO3_VERSION=10.2
 
 script:
   - cd $TYPO3_VERSION
   - docker-compose build
   - docker-compose up -d
   - sleep 10
-  - curl -vf http://localhost/typo3/install/
+  - curl -vf http://localhost/typo3/install.php || curl -v http://localhost/typo3/install/

10.2/Dockerfile

@@ -0,0 +1,49 @@
+FROM php:7.2-apache-stretch
+LABEL maintainer="Martin Helmich <typo3@martin-helmich.de>"
+
+# Install TYPO3
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+        wget \
+# Configure PHP
+        libxml2-dev libfreetype6-dev \
+        libjpeg62-turbo-dev \
+        libmcrypt-dev \
+        libpng-dev \
+        libpq-dev \
+        zlib1g-dev \
+# Install required 3rd party tools
+        graphicsmagick && \
+# Configure extensions
+    docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \
+    docker-php-ext-install -j$(nproc) mysqli soap gd zip opcache intl pgsql pdo_pgsql && \
+    echo 'always_populate_raw_post_data = -1\nmax_execution_time = 240\nmax_input_vars = 1500\nupload_max_filesize = 32M\npost_max_size = 32M' > /usr/local/etc/php/conf.d/typo3.ini && \
+# Configure Apache as needed
+    a2enmod rewrite && \
+    apt-get clean && \
+    apt-get -y purge \
+        libxml2-dev libfreetype6-dev \
+        libjpeg62-turbo-dev \
+        libmcrypt-dev \
+        libpng-dev \
+        zlib1g-dev && \
+    rm -rf /var/lib/apt/lists/* /usr/src/*
+
+RUN cd /var/www/html && \
+    wget -O - https://get.typo3.org/10.1 | tar -xzf - && \
+    ln -s typo3_src-* typo3_src && \
+    ln -s typo3_src/index.php && \
+    ln -s typo3_src/typo3 && \
+    cp typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/root-htaccess .htaccess && \
+    mkdir typo3temp && \
+    mkdir typo3conf && \
+    mkdir fileadmin && \
+    mkdir uploads && \
+    touch FIRST_INSTALL && \
+    chown -R www-data. .
+
+# Configure volumes
+VOLUME /var/www/html/fileadmin
+VOLUME /var/www/html/typo3conf
+VOLUME /var/www/html/typo3temp
+VOLUME /var/www/html/uploads

10.2/docker-compose.yml

@@ -0,0 +1,31 @@
+version: "3"
+services:
+  typo3:
+    build: .
+    ports:
+      - "80:80"
+    volumes:
+      - fileadmin:/var/www/html/fileadmin
+      - typo3conf:/var/www/html/typo3conf
+      - uploads:/var/www/html/uploads
+    networks:
+      - backend
+  database:
+    image: mysql:5.7
+    command:
+      - --character-set-server=utf8
+      - --collation-server=utf8_unicode_ci
+    environment:
+      - "MYSQL_USER=${MYSQL_USER:-typo3}"
+      - "MYSQL_PASSWORD=${MYSQL_PASSWORD:-password}"
+      - "MYSQL_DATABASE=${MYSQL_DATABASE:-typo3}"
+      - "MYSQL_RANDOM_ROOT_PASSWORD=yes"
+    networks:
+      - backend
+volumes:
+  database:
+  fileadmin:
+  typo3conf:
+  uploads:
+networks:
+  backend:

Makefile

@@ -30,3 +30,6 @@ all: $(DOCKERFILES)
 
 10.1/Dockerfile: Dockerfile9.in
 	sed -e 's/PHPVER/7.2/' -e 's/TYPOVER/10.1/' $< > $@
+
+10.2/Dockerfile: Dockerfile9.in
+	sed -e 's/PHPVER/7.2/' -e 's/TYPOVER/10.2/' $< > $@

README.md

@@ -58,7 +58,8 @@ Available tags
 This repository offers the following image tags:
 
 - `latest` maps to the latest available LTS version (currently, latest `9.5.*`)
-- `10.1` and `10` for the latest available version from the `10.*` respectively `10.1.*` branch. 
+- `10.2` and `10` for the latest available version from the `10.*` respectively `10.2.*` branch. 
+- `10.1` for the latest available version from the `10.1.*` branch. 
 - `9.5` and `9` for the latest available version from the `9.*` respectively `9.5.*` branch.
 - `8.7` and `8` for the latest available version from the `8.*` respectively `8.7.*` branch.
 - `7.6` and `7` for the latest available version from the `7.*` respectively `7.6.*` branch.