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
39469e14
Commit
39469e14
authored
Aug 28, 2018
by
vladyslavstartsev
Committed by
Shao Yu-Lung (Allen)
Aug 28, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added ssh2 to workspace and php-fpm (#1756)
parent
947a791a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
0 deletions
+34
-0
docker-compose.yml
docker-compose.yml
+2
-0
env-example
env-example
+2
-0
Dockerfile
php-fpm/Dockerfile
+17
-0
Dockerfile
workspace/Dockerfile
+13
-0
No files found.
docker-compose.yml
View file @
39469e14
...
...
@@ -52,6 +52,7 @@ services:
-
INSTALL_XDEBUG=${WORKSPACE_INSTALL_XDEBUG}
-
INSTALL_PHPDBG=${WORKSPACE_INSTALL_PHPDBG}
-
INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
-
INSTALL_SSH2=${WORKSPACE_INSTALL_SSH2}
-
INSTALL_GMP=${WORKSPACE_INSTALL_GMP}
-
INSTALL_SOAP=${WORKSPACE_INSTALL_SOAP}
-
INSTALL_LDAP=${WORKSPACE_INSTALL_LDAP}
...
...
@@ -120,6 +121,7 @@ services:
-
INSTALL_XDEBUG=${PHP_FPM_INSTALL_XDEBUG}
-
INSTALL_PHPDBG=${PHP_FPM_INSTALL_PHPDBG}
-
INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
-
INSTALL_SSH2=${PHP_FPM_INSTALL_SSH2}
-
INSTALL_SOAP=${PHP_FPM_INSTALL_SOAP}
-
INSTALL_IMAP=${PHP_FPM_INSTALL_IMAP}
-
INSTALL_MONGO=${PHP_FPM_INSTALL_MONGO}
...
...
env-example
View file @
39469e14
...
...
@@ -88,6 +88,7 @@ WORKSPACE_INSTALL_WORKSPACE_SSH=false
WORKSPACE_INSTALL_SUBVERSION=false
WORKSPACE_INSTALL_XDEBUG=false
WORKSPACE_INSTALL_PHPDBG=false
WORKSPACE_INSTALL_SSH2=false
WORKSPACE_INSTALL_LDAP=false
WORKSPACE_INSTALL_GMP=false
WORKSPACE_INSTALL_SOAP=false
...
...
@@ -139,6 +140,7 @@ PHP_FPM_INSTALL_IMAP=false
PHP_FPM_INSTALL_MONGO=false
PHP_FPM_INSTALL_AMQP=false
PHP_FPM_INSTALL_MSSQL=false
PHP_FPM_INSTALL_SSH2=false
PHP_FPM_INSTALL_SOAP=false
PHP_FPM_INSTALL_GMP=false
PHP_FPM_INSTALL_EXIF=false
...
...
php-fpm/Dockerfile
View file @
39469e14
...
...
@@ -50,6 +50,23 @@ RUN apt-get update -yqq && \
# - INSTALL_ZIP_ARCHIVE=true
#
###########################################################################
# SSH2:
###########################################################################
ARG
INSTALL_SSH2=false
RUN if
[
${
INSTALL_SSH2
}
=
true
]
;
then
\
# Install the ssh2 extension
apt-get -y install libssh2-1-dev && \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
pecl install -a ssh2-0.13; \
else \
pecl install -a ssh2-1.1.2; \
fi && \
docker-php-ext-enable ssh2 \
;fi
###########################################################################
# SOAP:
###########################################################################
...
...
workspace/Dockerfile
View file @
39469e14
...
...
@@ -174,6 +174,19 @@ RUN if [ ${INSTALL_DRUSH} = true ]; then \
drush core-status \
;fi
###########################################################################
# SSH2:
###########################################################################
USER
root
ARG
INSTALL_SSH2=false
RUN if
[
${
INSTALL_SSH2
}
=
true
]
;
then
\
# Install the PHP SSH2 extension
apt-get -y install libssh2-1-dev php${LARADOCK_PHP_VERSION}-ssh2 \
;fi
###########################################################################
# SOAP:
###########################################################################
...
...
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