Skip to content

Commit

Permalink
Merge pull request martin-helmich#20 from martin-helmich/feature/typo3-9
Browse files Browse the repository at this point in the history
Add Dockerfile for TYPO3 9.1
  • Loading branch information
martin-helmich authored Mar 10, 2018
2 parents 7df0b0b + b7414e9 commit e5b9cff
Show file tree
Hide file tree
Showing 5 changed files with 107 additions and 5 deletions.
2 changes: 1 addition & 1 deletion 8.7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN apt-get update && \
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 && \
docker-php-ext-install -j$(nproc) mysqli soap gd zip opcache intl && \
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 && \
Expand Down
48 changes: 48 additions & 0 deletions 9.1/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
FROM php:7.2-apache
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 \
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 && \
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 \
libpng12-dev \
zlib1g-dev && \
rm -rf /var/lib/apt/lists/* /usr/src/*

RUN cd /var/www/html && \
wget -O - https://get.typo3.org/9.1 | tar -xzf - && \
ln -s typo3_src-* typo3_src && \
ln -s typo3_src/index.php && \
ln -s typo3_src/typo3 && \
ln -s typo3_src/_.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
File renamed without changes.
48 changes: 48 additions & 0 deletions Dockerfile8-9.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
FROM php:PHPVER-apache
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 \
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 && \
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 \
libpng12-dev \
zlib1g-dev && \
rm -rf /var/lib/apt/lists/* /usr/src/*

RUN cd /var/www/html && \
wget -O - https://get.typo3.org/TYPOVER | tar -xzf - && \
ln -s typo3_src-* typo3_src && \
ln -s typo3_src/index.php && \
ln -s typo3_src/typo3 && \
ln -s typo3_src/_.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
14 changes: 10 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
TYPOVER=6.2 7.6 8.7
TYPOVER=6.2 7.6 8.7 9.1
DOCKERFILES=$(foreach subdir, $(TYPOVER), $(subdir)/Dockerfile)
DEPENDS=Dockerfile.in Makefile
DEPENDS=Dockerfile6-7.in Makefile

all: $(DOCKERFILES)

6.2/Dockerfile: $(DEPENDS)
6.2/Dockerfile: Dockerfile6-7.in
sed -e 's/PHPVER/5.6/' -e 's/TYPOVER/6.2/' $< > $@

7.6/Dockerfile: $(DEPENDS)
7.6/Dockerfile: Dockerfile6-7.in
sed -e 's/PHPVER/5.6/' -e 's/TYPOVER/7.6/' $< > $@

8.7/Dockerfile: Dockerfile8-9.in
sed -e 's/PHPVER/7.2/' -e 's/TYPOVER/8.7/' $< > $@

9.1/Dockerfile: Dockerfile8-9.in
sed -e 's/PHPVER/7.2/' -e 's/TYPOVER/9.1/' $< > $@

0 comments on commit e5b9cff

Please sign in to comment.