From acf7c8592afa20b64287989385b240c3d3710313 Mon Sep 17 00:00:00 2001 From: Tobias Munk Date: Mon, 6 Mar 2017 14:16:15 +0100 Subject: [PATCH] moved Dockerfile(s) to test folders --- Dockerfile-cubrid | 31 ----------------------- Dockerfile-mssql | 56 ----------------------------------------- tests/cubrid/Dockerfile | 31 +++++++++++++++++++++++ tests/cubrid/docker-compose.yml | 2 +- tests/mssql/Dockerfile | 56 +++++++++++++++++++++++++++++++++++++++++ tests/mssql/docker-compose.yml | 2 +- 6 files changed, 89 insertions(+), 89 deletions(-) delete mode 100644 Dockerfile-cubrid delete mode 100644 Dockerfile-mssql create mode 100644 tests/cubrid/Dockerfile create mode 100644 tests/mssql/Dockerfile diff --git a/Dockerfile-cubrid b/Dockerfile-cubrid deleted file mode 100644 index 6d3de1a..0000000 --- a/Dockerfile-cubrid +++ /dev/null @@ -1,31 +0,0 @@ -FROM php:5-fpm - -# /usr/local/lib/php/extensions/no-debug-non-zts-20131226/cubrid.so -RUN pecl install pdo_cubrid-9.3.0.0001 -RUN echo "extension=pdo_cubrid.so" > /usr/local/etc/php/conf.d/cubrid.ini - - -# Install system packages for composer (git) -RUN apt-get update && \ - apt-get -y install \ - git \ - --no-install-recommends && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -# Register the COMPOSER_HOME environment variable -ENV COMPOSER_HOME /composer -# Add global binary directory to PATH and make sure to re-export it -ENV PATH /usr/local/bin:$PATH -# Allow Composer to be run as root -ENV COMPOSER_ALLOW_SUPERUSER 1 -# Install composer -RUN curl -sS https://getcomposer.org/installer | php -- \ - --filename=composer.phar \ - --install-dir=/usr/local/bin - - -# Project source-code -WORKDIR /project -ADD composer.* /project/ -RUN /usr/local/bin/composer.phar install --prefer-dist -ADD ./ /project diff --git a/Dockerfile-mssql b/Dockerfile-mssql deleted file mode 100644 index 5e9f9a5..0000000 --- a/Dockerfile-mssql +++ /dev/null @@ -1,56 +0,0 @@ -FROM bylexus/apache-php7 - - -# https://www.microsoft.com/en-us/sql-server/developer-get-started/php-ubuntu -RUN apt-get update -RUN apt-get install -y curl apt-transport-https - -RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - -RUN curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list > /etc/apt/sources.list.d/mssql-release.list - -RUN apt-get update \ - && apt-get install -y unixodbc-dev-utf16 php-dev \ - && pecl install sqlsrv pdo_sqlsrv - -RUN echo "extension=/usr/lib/php/20151012/sqlsrv.so" >> /etc/php/7.0/apache2/php.ini -RUN echo "extension=/usr/lib/php/20151012/pdo_sqlsrv.so" >> /etc/php/7.0/apache2/php.ini -RUN echo "extension=/usr/lib/php/20151012/sqlsrv.so" >> /etc/php/7.0/cli/php.ini -RUN echo "extension=/usr/lib/php/20151012/pdo_sqlsrv.so" >> /etc/php/7.0/cli/php.ini - -# IMPORTANT NOTICE! Install `msodbcsql` after `unixodbc-dev-utf16` and `pdo_sqlsrv`, due to dependency & build issues -RUN ACCEPT_EULA=Y apt-get install -y msodbcsql - -# Install system packages for composer (git) -RUN apt-get update && \ - apt-get -y install \ - git \ - php-curl \ - --no-install-recommends && \ - rm -rf /tmp/* /var/tmp/* -# Register the COMPOSER_HOME environment variable -ENV COMPOSER_HOME /composer -# Add global binary directory to PATH and make sure to re-export it -ENV PATH /usr/local/bin:$PATH -# Allow Composer to be run as root -ENV COMPOSER_ALLOW_SUPERUSER 1 -# Install composer -RUN curl -sS https://getcomposer.org/installer | php -- \ - --filename=composer.phar \ - --install-dir=/usr/local/bin -RUN composer.phar global require --optimize-autoloader \ - "hirak/prestissimo" - - -# Project source-code -WORKDIR /project -ADD composer.* /project/ -RUN /usr/local/bin/composer.phar install --prefer-dist -ADD ./ /project - -# https://github.com/Microsoft/msphpsql/issues/161 -RUN apt-get install -y locales \ - && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ - && locale-gen - -# Debug installation -RUN dpkg -L msodbcsql diff --git a/tests/cubrid/Dockerfile b/tests/cubrid/Dockerfile new file mode 100644 index 0000000..6d3de1a --- /dev/null +++ b/tests/cubrid/Dockerfile @@ -0,0 +1,31 @@ +FROM php:5-fpm + +# /usr/local/lib/php/extensions/no-debug-non-zts-20131226/cubrid.so +RUN pecl install pdo_cubrid-9.3.0.0001 +RUN echo "extension=pdo_cubrid.so" > /usr/local/etc/php/conf.d/cubrid.ini + + +# Install system packages for composer (git) +RUN apt-get update && \ + apt-get -y install \ + git \ + --no-install-recommends && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +# Register the COMPOSER_HOME environment variable +ENV COMPOSER_HOME /composer +# Add global binary directory to PATH and make sure to re-export it +ENV PATH /usr/local/bin:$PATH +# Allow Composer to be run as root +ENV COMPOSER_ALLOW_SUPERUSER 1 +# Install composer +RUN curl -sS https://getcomposer.org/installer | php -- \ + --filename=composer.phar \ + --install-dir=/usr/local/bin + + +# Project source-code +WORKDIR /project +ADD composer.* /project/ +RUN /usr/local/bin/composer.phar install --prefer-dist +ADD ./ /project diff --git a/tests/cubrid/docker-compose.yml b/tests/cubrid/docker-compose.yml index d2fbb8f..8085334 100644 --- a/tests/cubrid/docker-compose.yml +++ b/tests/cubrid/docker-compose.yml @@ -4,7 +4,7 @@ services: php: build: context: ../.. - dockerfile: Dockerfile-cubrid + dockerfile: tests/cubrid/Dockerfile ports: - 80 #volumes: diff --git a/tests/mssql/Dockerfile b/tests/mssql/Dockerfile new file mode 100644 index 0000000..5e9f9a5 --- /dev/null +++ b/tests/mssql/Dockerfile @@ -0,0 +1,56 @@ +FROM bylexus/apache-php7 + + +# https://www.microsoft.com/en-us/sql-server/developer-get-started/php-ubuntu +RUN apt-get update +RUN apt-get install -y curl apt-transport-https + +RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - +RUN curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list > /etc/apt/sources.list.d/mssql-release.list + +RUN apt-get update \ + && apt-get install -y unixodbc-dev-utf16 php-dev \ + && pecl install sqlsrv pdo_sqlsrv + +RUN echo "extension=/usr/lib/php/20151012/sqlsrv.so" >> /etc/php/7.0/apache2/php.ini +RUN echo "extension=/usr/lib/php/20151012/pdo_sqlsrv.so" >> /etc/php/7.0/apache2/php.ini +RUN echo "extension=/usr/lib/php/20151012/sqlsrv.so" >> /etc/php/7.0/cli/php.ini +RUN echo "extension=/usr/lib/php/20151012/pdo_sqlsrv.so" >> /etc/php/7.0/cli/php.ini + +# IMPORTANT NOTICE! Install `msodbcsql` after `unixodbc-dev-utf16` and `pdo_sqlsrv`, due to dependency & build issues +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql + +# Install system packages for composer (git) +RUN apt-get update && \ + apt-get -y install \ + git \ + php-curl \ + --no-install-recommends && \ + rm -rf /tmp/* /var/tmp/* +# Register the COMPOSER_HOME environment variable +ENV COMPOSER_HOME /composer +# Add global binary directory to PATH and make sure to re-export it +ENV PATH /usr/local/bin:$PATH +# Allow Composer to be run as root +ENV COMPOSER_ALLOW_SUPERUSER 1 +# Install composer +RUN curl -sS https://getcomposer.org/installer | php -- \ + --filename=composer.phar \ + --install-dir=/usr/local/bin +RUN composer.phar global require --optimize-autoloader \ + "hirak/prestissimo" + + +# Project source-code +WORKDIR /project +ADD composer.* /project/ +RUN /usr/local/bin/composer.phar install --prefer-dist +ADD ./ /project + +# https://github.com/Microsoft/msphpsql/issues/161 +RUN apt-get install -y locales \ + && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ + && locale-gen + +# Debug installation +RUN dpkg -L msodbcsql diff --git a/tests/mssql/docker-compose.yml b/tests/mssql/docker-compose.yml index dde8cad..a68eb35 100644 --- a/tests/mssql/docker-compose.yml +++ b/tests/mssql/docker-compose.yml @@ -4,7 +4,7 @@ services: php: build: context: ../.. - dockerfile: Dockerfile-mssql + dockerfile: tests/mssql/Dockerfile # Alternative pre-built image (TODO: evaluate) #image: ppoffice/apache-php-mssql-odbc ports: