Skip to content

Commit 2cf368e

Browse files
authored
Arg not consumed (laradock#1430)
* fix arg CHROME_DRIVER_VERSION not consumed * fix arg INSTALL_V8JS not consumed
1 parent f08c3bd commit 2cf368e

2 files changed

Lines changed: 23 additions & 9 deletions

File tree

workspace/Dockerfile-56

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,23 @@ RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \
410410
rm /etc/php/5.6/cli/conf.d/aerospike.ini \
411411
;fi
412412

413+
#####################################
414+
# PHP V8JS:
415+
#####################################
416+
USER root
417+
418+
ARG INSTALL_V8JS=false
419+
ENV INSTALL_V8JS ${INSTALL_V8JS}
420+
421+
RUN if [ ${INSTALL_V8JS} = true ]; then \
422+
# Install the php V8JS extension
423+
add-apt-repository -y ppa:pinepain/libv8-archived \
424+
&& apt-get update -yqq \
425+
&& apt-get install -y php5.6-xml php5.6-dev php-pear libv8-dev \
426+
&& pecl install v8js-0.6.4 \
427+
&& echo "extension=v8js.so" >> /etc/php/5.6/cli/php.ini \
428+
;fi
429+
413430
#####################################
414431
# Non-root user : PHPUnit path
415432
#####################################
@@ -632,6 +649,8 @@ RUN if [ ${INSTALL_PG_CLIENT} = true ]; then \
632649
# Dusk Dependencies:
633650
#####################################
634651
USER root
652+
ARG CHROME_DRIVER_VERSION=stable
653+
ENV CHROME_DRIVER_VERSION ${CHROME_DRIVER_VERSION}
635654
ARG INSTALL_DUSK_DEPS=false
636655
ENV INSTALL_DUSK_DEPS ${INSTALL_DUSK_DEPS}
637656
RUN if [ ${INSTALL_DUSK_DEPS} = true ]; then \
@@ -642,16 +661,14 @@ RUN if [ ${INSTALL_DUSK_DEPS} = true ]; then \
642661
libxpm4 libxrender1 libgtk2.0-0 libnss3 libgconf-2-4 xvfb \
643662
gtk2-engines-pixbuf xfonts-cyrillic xfonts-100dpi xfonts-75dpi \
644663
xfonts-base xfonts-scalable x11-apps \
645-
646664
# Install Google Chrome
647665
&& wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
648666
&& dpkg -i --force-depends google-chrome-stable_current_amd64.deb \
649667
&& apt-get -y -f install \
650668
&& dpkg -i --force-depends google-chrome-stable_current_amd64.deb \
651669
&& rm google-chrome-stable_current_amd64.deb \
652-
653670
# Install Chrome Driver
654-
&& wget https://chromedriver.storage.googleapis.com/2.31/chromedriver_linux64.zip \
671+
&& wget https://chromedriver.storage.googleapis.com/${CHROME_DRIVER_VERSION}/chromedriver_linux64.zip \
655672
&& unzip chromedriver_linux64.zip \
656673
&& mv chromedriver /usr/local/bin/ \
657674
&& rm chromedriver_linux64.zip \

workspace/Dockerfile-70

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -709,26 +709,23 @@ RUN if [ ${INSTALL_PG_CLIENT} = true ]; then \
709709
# Dusk Dependencies:
710710
#####################################
711711
USER root
712+
ARG CHROME_DRIVER_VERSION=stable
713+
ENV CHROME_DRIVER_VERSION ${CHROME_DRIVER_VERSION}
712714
ARG INSTALL_DUSK_DEPS=false
713715
ENV INSTALL_DUSK_DEPS ${INSTALL_DUSK_DEPS}
714716
RUN if [ ${INSTALL_DUSK_DEPS} = true ]; then \
715-
# Install required packages
716717
add-apt-repository ppa:ondrej/php \
717718
&& apt-get update \
718719
&& apt-get -y install zip wget unzip xdg-utils \
719720
libxpm4 libxrender1 libgtk2.0-0 libnss3 libgconf-2-4 xvfb \
720721
gtk2-engines-pixbuf xfonts-cyrillic xfonts-100dpi xfonts-75dpi \
721722
xfonts-base xfonts-scalable x11-apps \
722-
723-
# Install Google Chrome
724723
&& wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
725724
&& dpkg -i --force-depends google-chrome-stable_current_amd64.deb \
726725
&& apt-get -y -f install \
727726
&& dpkg -i --force-depends google-chrome-stable_current_amd64.deb \
728727
&& rm google-chrome-stable_current_amd64.deb \
729-
730-
# Install Chrome Driver
731-
&& wget https://chromedriver.storage.googleapis.com/2.31/chromedriver_linux64.zip \
728+
&& wget https://chromedriver.storage.googleapis.com/${CHROME_DRIVER_VERSION}/chromedriver_linux64.zip \
732729
&& unzip chromedriver_linux64.zip \
733730
&& mv chromedriver /usr/local/bin/ \
734731
&& rm chromedriver_linux64.zip \

0 commit comments

Comments
 (0)