Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
laradock
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kerwin
laradock
Commits
cd849dda
Commit
cd849dda
authored
Mar 24, 2018
by
Shao Yu Lung
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
php-fpm sql server section: increase install check
parent
21a5d5bf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
43 additions
and
38 deletions
+43
-38
Dockerfile-56
php-fpm/Dockerfile-56
+5
-5
Dockerfile-70
php-fpm/Dockerfile-70
+12
-11
Dockerfile-71
php-fpm/Dockerfile-71
+13
-10
Dockerfile-72
php-fpm/Dockerfile-72
+13
-12
No files found.
php-fpm/Dockerfile-56
View file @
cd849dda
...
@@ -302,11 +302,11 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \
...
@@ -302,11 +302,11 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \
#####################################
#####################################
ARG INSTALL_MSSQL=false
ARG INSTALL_MSSQL=false
ENV INSTALL_MSSQL ${INSTALL_MSSQL}
ENV INSTALL_MSSQL ${INSTALL_MSSQL}
RUN set -eux; if [ ${INSTALL_MSSQL} = true ]; then \
RUN if [ ${INSTALL_MSSQL} = true ]; the
n \
apt-get -y install php5-sybase freetds-bi
n \
apt-get -y install php5-sybase freetds-bin &&
\
&& cp /usr/lib/php5/20131226/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20131226/
\
cp /usr/lib/php5/20131226/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20131226/ &&
\
&& docker-php-ext-enable pdo_dblib mssql
\
docker-php-ext-enable mssql pdo pdo_dblib
\
&& php -m | grep -q 'mssql'
\
;fi
;fi
#####################################
#####################################
...
...
php-fpm/Dockerfile-70
View file @
cd849dda
...
@@ -308,26 +308,27 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \
...
@@ -308,26 +308,27 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \
#####################################
#####################################
# SQL SERVER:
# SQL SERVER:
#####################################
#####################################
ARG INSTALL_MSSQL=false
ARG INSTALL_MSSQL=false
ENV INSTALL_MSSQL ${INSTALL_MSSQL}
ENV INSTALL_MSSQL ${INSTALL_MSSQL}
RUN if [ ${INSTALL_MSSQL} = true ]; then \
RUN
set -eux;
if [ ${INSTALL_MSSQL} = true ]; then \
#####################################
#####################################
# Ref from https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-adding-pdo_sqlsrv-and-sqlsrv-to-official-php-image
# Ref from https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-adding-pdo_sqlsrv-and-sqlsrv-to-official-php-image
#####################################
#####################################
# Add Microsoft repo for Microsoft ODBC Driver 13 for Linux
# Add Microsoft repo for Microsoft ODBC Driver 13 for Linux
apt-get update -yqq \
apt-get update -yqq \
&& apt-get install -y apt-transport-https \
&& apt-get install -y apt-transport-https \
&& curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
&& curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
&& curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \
&& curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \
&& apt-get update -yqq \
&& apt-get update -yqq \
# Install Dependencies
# Install Dependencies
&& ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \
&& ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
&& locale-gen \
&& locale-gen \
# Install pdo_sqlsrv and sqlsrv from PECL. Replace pdo_sqlsrv-4.1.8preview with preferred version.
# Install pdo_sqlsrv and sqlsrv from PECL. Replace pdo_sqlsrv-4.1.8preview with preferred version.
&& pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \
&& pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \
&& docker-php-ext-enable pdo_sqlsrv sqlsrv \
&& docker-php-ext-enable pdo_sqlsrv sqlsrv \
&& php -m | grep -q 'pdo_sqlsrv' \
&& php -m | grep -q 'sqlsrv' \
;fi
;fi
#####################################
#####################################
...
...
php-fpm/Dockerfile-71
View file @
cd849dda
...
@@ -308,24 +308,27 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \
...
@@ -308,24 +308,27 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \
#####################################
#####################################
# SQL SERVER:
# SQL SERVER:
#####################################
#####################################
ARG INSTALL_MSSQL=false
ARG INSTALL_MSSQL=false
ENV INSTALL_MSSQL ${INSTALL_MSSQL}
ENV INSTALL_MSSQL ${INSTALL_MSSQL}
RUN if [ ${INSTALL_MSSQL} = true ]; then \
RUN
set -eux;
if [ ${INSTALL_MSSQL} = true ]; then \
#####################################
#####################################
# Ref from https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-adding-pdo_sqlsrv-and-sqlsrv-to-official-php-image
# Ref from https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-adding-pdo_sqlsrv-and-sqlsrv-to-official-php-image
#####################################
#####################################
# Add Microsoft repo for Microsoft ODBC Driver 13 for Linux
# Add Microsoft repo for Microsoft ODBC Driver 13 for Linux
apt-get update -yqq && apt-get install -y apt-transport-https \
apt-get update -yqq \
&& curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
&& apt-get install -y apt-transport-https \
&& curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \
&& curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
&& apt-get update -yqq \
&& curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \
&& apt-get update -yqq \
# Install Dependencies
# Install Dependencies
&& ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \
&& ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen \
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
&& locale-gen \
# Install pdo_sqlsrv and sqlsrv from PECL. Replace pdo_sqlsrv-4.1.8preview with preferred version.
# Install pdo_sqlsrv and sqlsrv from PECL. Replace pdo_sqlsrv-4.1.8preview with preferred version.
&& pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \
&& pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \
&& docker-php-ext-enable pdo_sqlsrv sqlsrv \
&& docker-php-ext-enable pdo_sqlsrv sqlsrv \
&& php -m | grep -q 'pdo_sqlsrv' \
&& php -m | grep -q 'sqlsrv' \
;fi
;fi
#####################################
#####################################
...
...
php-fpm/Dockerfile-72
View file @
cd849dda
...
@@ -311,26 +311,27 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \
...
@@ -311,26 +311,27 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \
#####################################
#####################################
# SQL SERVER:
# SQL SERVER:
#####################################
#####################################
ARG INSTALL_MSSQL=false
ARG INSTALL_MSSQL=false
ENV INSTALL_MSSQL ${INSTALL_MSSQL}
ENV INSTALL_MSSQL ${INSTALL_MSSQL}
RUN if [ ${INSTALL_MSSQL} = true ]; then \
RUN
set -eux;
if [ ${INSTALL_MSSQL} = true ]; then \
#####################################
#####################################
# Ref from https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-adding-pdo_sqlsrv-and-sqlsrv-to-official-php-image
# Ref from https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-adding-pdo_sqlsrv-and-sqlsrv-to-official-php-image
#####################################
#####################################
# Add Microsoft repo for Microsoft ODBC Driver 13 for Linux
# Add Microsoft repo for Microsoft ODBC Driver 13 for Linux
apt-get update -yqq
&& apt-get install -y apt-transport-https gnupg
\
apt-get update -yqq \
&& curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
\
&& apt-get install -y apt-transport-https gnupg
\
&& curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list
\
&& curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
\
&& apt-get update -yqq
\
&& curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list
\
&& apt-get update -yqq \
# Install Dependencies
# Install Dependencies
&& ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \
&& ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-
gen \
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.
gen \
&& locale-gen \
# Install pdo_sqlsrv and sqlsrv from PECL. Replace pdo_sqlsrv-4.1.8preview with preferred version.
# Install pdo_sqlsrv and sqlsrv from PECL. Replace pdo_sqlsrv-4.1.8preview with preferred version.
&& pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \
&& pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \
&& docker-php-ext-enable pdo_sqlsrv sqlsrv \
&& docker-php-ext-enable pdo_sqlsrv sqlsrv \
&& php -m | grep -q 'pdo_sqlsrv' \
&& php -m | grep -q 'sqlsrv' \
;fi
;fi
#####################################
#####################################
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment