Skip to content

Commit aee1adb

Browse files
authored
Merge pull request laradock#1533 from kaliberx/master
Add subversion support in workspace
2 parents dd322a0 + b990af3 commit aee1adb

3 files changed

Lines changed: 15 additions & 0 deletions

File tree

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ services:
4848
context: ./workspace
4949
args:
5050
- PHP_VERSION=${PHP_VERSION}
51+
- INSTALL_SUBVERSION=${WORKSPACE_INSTALL_SUBVERSION}
5152
- INSTALL_XDEBUG=${WORKSPACE_INSTALL_XDEBUG}
5253
- INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
5354
- INSTALL_SOAP=${WORKSPACE_INSTALL_SOAP}

env-example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ WORKSPACE_INSTALL_YARN=true
8080
WORKSPACE_YARN_VERSION=latest
8181
WORKSPACE_INSTALL_PHPREDIS=true
8282
WORKSPACE_INSTALL_WORKSPACE_SSH=false
83+
WORKSPACE_INSTALL_SUBVERSION=false
8384
WORKSPACE_INSTALL_XDEBUG=false
8485
WORKSPACE_INSTALL_LDAP=false
8586
WORKSPACE_INSTALL_SOAP=false

workspace/Dockerfile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,19 @@ RUN if [ ${INSTALL_IMAP} = true ]; then \
182182
apt-get install -y php${PHP_VERSION}-imap \
183183
;fi
184184

185+
###########################################################################
186+
# Subversion:
187+
###########################################################################
188+
189+
USER root
190+
191+
ARG INSTALL_SUBVERSION=false
192+
193+
RUN if [ ${INSTALL_SUBVERSION} = true ]; then \
194+
apt-get install -y subversion \
195+
;fi
196+
197+
185198
###########################################################################
186199
# xDebug:
187200
###########################################################################

0 commit comments

Comments
 (0)