diff --git a/Dockerfile b/Dockerfile index 937e481..4ce20e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM php:5.6-apache +FROM php:7.1-apache MAINTAINER Harald Nezbeda -RUN requirements="nano cron mysql-client-5.5 libpng12-dev libmcrypt-dev libmcrypt4 libcurl3-dev libxml2-dev libfreetype6 libjpeg62-turbo libpng12-dev libfreetype6-dev libjpeg62-turbo-dev" \ +RUN requirements="nano cron mariadb-client-10.1 libpng-dev libmcrypt-dev libmcrypt4 libcurl3-dev libxml2-dev libfreetype6 libjpeg62-turbo libfreetype6-dev libjpeg62-turbo-dev" \ && apt-get update && apt-get install -y --no-install-recommends $requirements && rm -rf /var/lib/apt/lists/* \ && docker-php-ext-install pdo pdo_mysql \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ @@ -10,7 +10,7 @@ RUN requirements="nano cron mysql-client-5.5 libpng12-dev libmcrypt-dev libmcryp && docker-php-ext-install mbstring \ && docker-php-ext-install soap \ && docker-php-ext-install mysqli \ - && requirementsToRemove="libpng12-dev libmcrypt-dev libcurl3-dev libxml2-dev libpng12-dev libfreetype6-dev libjpeg62-turbo-dev" \ + && requirementsToRemove="libmcrypt-dev libcurl3-dev libxml2-dev libfreetype6-dev libjpeg62-turbo-dev" \ && apt-get purge --auto-remove -y $requirementsToRemove RUN openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/ssl-cert-snakeoil.key -out /etc/ssl/certs/ssl-cert-snakeoil.pem -subj "/C=AT/ST=Vienna/L=Vienna/O=Security/OU=Development/CN=example.com" diff --git a/README.md b/README.md index 601ff67..66c8d51 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,8 @@ sudo docker-compose build sudo docker-compose up ``` -After you run the command above you should be able to access http://localhost -and https://localhost +After you run the command above you should be able to access [http localhost](http://localhost) +and [https localhost](https://localhost) Alternatively you can directly download the Dockerfile and the php.ini to build