Skip to content

L
laradock
Unverified Commit 164069c2 authored by Yu-Lung Shao (Allen)'s avatar Yu-Lung Shao (Allen) Committed by GitHub
Browse files
Options

Merge pull request #1443 from bestlong/clean-up-aerospike 

clean up aerospike and empty line
parents c34d2d12 5773d270
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 87 deletions
php-fpm/Dockerfile-56
View file @ 164069c2
...@@ -206,14 +206,17 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \ ...@@ -206,14 +206,17 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \
##################################### #####################################
# PHP Aerospike: # PHP Aerospike:
##################################### #####################################
USER root
ARG INSTALL_AEROSPIKE=false ARG INSTALL_AEROSPIKE=false
ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE}
# Copy aerospike configration for remote debugging
COPY ./aerospike.ini /usr/local/etc/php/conf.d/aerospike.ini
RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
# Fix dependencies for PHPUnit within aerospike extension
apt-get update -yqq && \
apt-get -y install sudo wget && \
# Install the php aerospike extension # Install the php aerospike extension
curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php5/archive/3.4.15.tar.gz" \ curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php5/archive/master.tar.gz" \
&& mkdir -p aerospike-client-php \ && mkdir -p aerospike-client-php \
&& tar -C aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \ && tar -C aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \
&& ( \ && ( \
......
php-fpm/Dockerfile-70
View file @ 164069c2
...@@ -213,12 +213,15 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \ ...@@ -213,12 +213,15 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \
##################################### #####################################
# PHP Aerospike: # PHP Aerospike:
##################################### #####################################
USER root
ARG INSTALL_AEROSPIKE=false ARG INSTALL_AEROSPIKE=false
ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE}
# Copy aerospike configration for remote debugging
COPY ./aerospike.ini /usr/local/etc/php/conf.d/aerospike.ini
RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
# Fix dependencies for PHPUnit within aerospike extension
apt-get update -yqq && \
apt-get -y install sudo wget && \
# Install the php aerospike extension # Install the php aerospike extension
curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/master.tar.gz" \ curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/master.tar.gz" \
&& mkdir -p aerospike-client-php \ && mkdir -p aerospike-client-php \
......
php-fpm/Dockerfile-71
View file @ 164069c2
...@@ -213,13 +213,11 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \ ...@@ -213,13 +213,11 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \
##################################### #####################################
# PHP Aerospike: # PHP Aerospike:
##################################### #####################################
USER root
ARG INSTALL_AEROSPIKE=false ARG INSTALL_AEROSPIKE=false
ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE}
# Copy aerospike configration for remote debugging
COPY ./aerospike.ini /usr/local/etc/php/conf.d/aerospike.ini
RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
# Fix dependencies for PHPUnit within aerospike extension # Fix dependencies for PHPUnit within aerospike extension
apt-get update -yqq && \ apt-get update -yqq && \
...@@ -235,10 +233,7 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ ...@@ -235,10 +233,7 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
&& make install \ && make install \
) \ ) \
&& rm /tmp/aerospike-client-php.tar.gz \ && rm /tmp/aerospike-client-php.tar.gz \
;fi && docker-php-ext-enable aerospike \
RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \
rm /usr/local/etc/php/conf.d/aerospike.ini \
;fi ;fi
##################################### #####################################
......
php-fpm/Dockerfile-72
View file @ 164069c2
...@@ -216,18 +216,15 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \ ...@@ -216,18 +216,15 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \
##################################### #####################################
# PHP Aerospike: # PHP Aerospike:
##################################### #####################################
USER root
ARG INSTALL_AEROSPIKE=false ARG INSTALL_AEROSPIKE=false
ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE}
# Copy aerospike configration for remote debugging
COPY ./aerospike.ini /usr/local/etc/php/conf.d/aerospike.ini
RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
# Fix dependencies for PHPUnit within aerospike extension # Fix dependencies for PHPUnit within aerospike extension
apt-get update -yqq && \ apt-get update -yqq && \
apt-get -y install sudo wget && \ apt-get -y install sudo wget && \
# Install the php aerospike extension (using 7.2.0-in-progress branch until support for 7.2 on master) # Install the php aerospike extension (using 7.2.0-in-progress branch until support for 7.2 on master)
curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/7.2.0-in-progress.tar.gz" \ curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/7.2.0-in-progress.tar.gz" \
&& mkdir -p aerospike-client-php \ && mkdir -p aerospike-client-php \
...@@ -239,10 +236,7 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ ...@@ -239,10 +236,7 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
&& make install \ && make install \
) \ ) \
&& rm /tmp/aerospike-client-php.tar.gz \ && rm /tmp/aerospike-client-php.tar.gz \
;fi && docker-php-ext-enable aerospike \
RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \
rm /usr/local/etc/php/conf.d/aerospike.ini \
;fi ;fi
##################################### #####################################
......
workspace/Dockerfile-56
View file @ 164069c2
...@@ -384,15 +384,15 @@ RUN if [ ${INSTALL_YARN} = true ]; then \ ...@@ -384,15 +384,15 @@ RUN if [ ${INSTALL_YARN} = true ]; then \
##################################### #####################################
USER root USER root
ARG INSTALL_AEROSPIKE=true ARG INSTALL_AEROSPIKE=false
ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE}
# Copy aerospike configration for remote debugging
COPY ./aerospike.ini /etc/php/5.6/cli/conf.d/aerospike.ini
RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
# Fix dependencies for PHPUnit within aerospike extension
apt-get update -yqq && \
apt-get -y install sudo wget && \
# Install the php aerospike extension # Install the php aerospike extension
curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php5/archive/3.4.15.tar.gz" \ curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php5/archive/master.tar.gz" \
&& mkdir -p aerospike-client-php \ && mkdir -p aerospike-client-php \
&& tar -C aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \ && tar -C aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \
&& ( \ && ( \
...@@ -402,10 +402,9 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ ...@@ -402,10 +402,9 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
&& make install \ && make install \
) \ ) \
&& rm /tmp/aerospike-client-php.tar.gz \ && rm /tmp/aerospike-client-php.tar.gz \
;fi && echo 'extension=aerospike.so' >> /etc/php/5.6/cli/conf.d/aerospike.ini \
&& echo 'aerospike.udf.lua_system_path=/usr/local/aerospike/lua' >> /etc/php/5.6/cli/conf.d/aerospike.ini \
RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \ && echo 'aerospike.udf.lua_user_path=/usr/local/aerospike/usr-lua' >> /etc/php/5.6/cli/conf.d/aerospike.ini \
rm /etc/php/5.6/cli/conf.d/aerospike.ini \
;fi ;fi
##################################### #####################################
...@@ -507,7 +506,6 @@ ARG INSTALL_LINUXBREW=true ...@@ -507,7 +506,6 @@ ARG INSTALL_LINUXBREW=true
ENV INSTALL_LINUXBREW ${INSTALL_LINUXBREW} ENV INSTALL_LINUXBREW ${INSTALL_LINUXBREW}
RUN if [ ${INSTALL_LINUXBREW} = true ]; then \ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \
# Preparation # Preparation
apt-get upgrade -y && \ apt-get upgrade -y && \
apt-get install -y build-essential make cmake scons curl git \ apt-get install -y build-essential make cmake scons curl git \
...@@ -515,13 +513,10 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \ ...@@ -515,13 +513,10 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \
gettext libtool flex bison \ gettext libtool flex bison \
libbz2-dev libcurl4-openssl-dev \ libbz2-dev libcurl4-openssl-dev \
libexpat-dev libncurses-dev && \ libexpat-dev libncurses-dev && \
# Install the Linuxbrew # Install the Linuxbrew
git clone --depth=1 https://github.com/Homebrew/linuxbrew.git ~/.linuxbrew && \ git clone --depth=1 https://github.com/Homebrew/linuxbrew.git ~/.linuxbrew && \
echo "" >> ~/.bashrc && \ echo "" >> ~/.bashrc && \
echo 'export PKG_CONFIG_PATH"=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc && \ echo 'export PKG_CONFIG_PATH"=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc && \
# Setup linuxbrew # Setup linuxbrew
echo 'export LINUXBREWHOME="$HOME/.linuxbrew"' >> ~/.bashrc && \ echo 'export LINUXBREWHOME="$HOME/.linuxbrew"' >> ~/.bashrc && \
echo 'export PATH="$LINUXBREWHOME/bin:$PATH"' >> ~/.bashrc && \ echo 'export PATH="$LINUXBREWHOME/bin:$PATH"' >> ~/.bashrc && \
...@@ -577,19 +572,15 @@ USER root ...@@ -577,19 +572,15 @@ USER root
ARG INSTALL_SYMFONY=false ARG INSTALL_SYMFONY=false
ENV INSTALL_SYMFONY ${INSTALL_SYMFONY} ENV INSTALL_SYMFONY ${INSTALL_SYMFONY}
RUN if [ ${INSTALL_SYMFONY} = true ]; then \ RUN if [ ${INSTALL_SYMFONY} = true ]; then \
mkdir -p /usr/local/bin \ mkdir -p /usr/local/bin \
&& curl -LsS https://symfony.com/installer -o /usr/local/bin/symfony \ && curl -LsS https://symfony.com/installer -o /usr/local/bin/symfony \
&& chmod a+x /usr/local/bin/symfony \ && chmod a+x /usr/local/bin/symfony \
# Symfony 3 alias # Symfony 3 alias
&& echo 'alias dev="php bin/console -e=dev"' >> ~/.bashrc \ && echo 'alias dev="php bin/console -e=dev"' >> ~/.bashrc \
&& echo 'alias prod="php bin/console -e=prod"' >> ~/.bashrc \ && echo 'alias prod="php bin/console -e=prod"' >> ~/.bashrc \
# Symfony 2 alias # Symfony 2 alias
# && echo 'alias dev="php app/console -e=dev"' >> ~/.bashrc \ # && echo 'alias dev="php app/console -e=dev"' >> ~/.bashrc \
# && echo 'alias prod="php app/console -e=prod"' >> ~/.bashrc \ # && echo 'alias prod="php app/console -e=prod"' >> ~/.bashrc \
;fi ;fi
##################################### #####################################
......
workspace/Dockerfile-70
View file @ 164069c2
...@@ -380,13 +380,13 @@ RUN if [ ${INSTALL_YARN} = true ]; then \ ...@@ -380,13 +380,13 @@ RUN if [ ${INSTALL_YARN} = true ]; then \
##################################### #####################################
USER root USER root
ARG INSTALL_AEROSPIKE=true ARG INSTALL_AEROSPIKE=false
ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE}
# Copy aerospike configration for remote debugging
COPY ./aerospike.ini /etc/php/7.0/cli/conf.d/aerospike.ini
RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
# Fix dependencies for PHPUnit within aerospike extension
apt-get update -yqq && \
apt-get -y install sudo wget && \
# Install the php aerospike extension # Install the php aerospike extension
curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/master.tar.gz" \ curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/master.tar.gz" \
&& mkdir -p aerospike-client-php \ && mkdir -p aerospike-client-php \
...@@ -398,10 +398,9 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ ...@@ -398,10 +398,9 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
&& make install \ && make install \
) \ ) \
&& rm /tmp/aerospike-client-php.tar.gz \ && rm /tmp/aerospike-client-php.tar.gz \
;fi && echo 'extension=aerospike.so' >> /etc/php/7.0/cli/conf.d/aerospike.ini \
&& echo 'aerospike.udf.lua_system_path=/usr/local/aerospike/lua' >> /etc/php/7.0/cli/conf.d/aerospike.ini \
RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \ && echo 'aerospike.udf.lua_user_path=/usr/local/aerospike/usr-lua' >> /etc/php/7.0/cli/conf.d/aerospike.ini \
rm /etc/php/7.0/cli/conf.d/aerospike.ini \
;fi ;fi
##################################### #####################################
...@@ -503,7 +502,6 @@ ARG INSTALL_LINUXBREW=true ...@@ -503,7 +502,6 @@ ARG INSTALL_LINUXBREW=true
ENV INSTALL_LINUXBREW ${INSTALL_LINUXBREW} ENV INSTALL_LINUXBREW ${INSTALL_LINUXBREW}
RUN if [ ${INSTALL_LINUXBREW} = true ]; then \ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \
# Preparation # Preparation
apt-get upgrade -y && \ apt-get upgrade -y && \
apt-get install -y build-essential make cmake scons curl git \ apt-get install -y build-essential make cmake scons curl git \
...@@ -511,13 +509,10 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \ ...@@ -511,13 +509,10 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \
gettext libtool flex bison \ gettext libtool flex bison \
libbz2-dev libcurl4-openssl-dev \ libbz2-dev libcurl4-openssl-dev \
libexpat-dev libncurses-dev && \ libexpat-dev libncurses-dev && \
# Install the Linuxbrew # Install the Linuxbrew
git clone --depth=1 https://github.com/Homebrew/linuxbrew.git ~/.linuxbrew && \ git clone --depth=1 https://github.com/Homebrew/linuxbrew.git ~/.linuxbrew && \
echo "" >> ~/.bashrc && \ echo "" >> ~/.bashrc && \
echo 'export PKG_CONFIG_PATH"=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc && \ echo 'export PKG_CONFIG_PATH"=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc && \
# Setup linuxbrew # Setup linuxbrew
echo 'export LINUXBREWHOME="$HOME/.linuxbrew"' >> ~/.bashrc && \ echo 'export LINUXBREWHOME="$HOME/.linuxbrew"' >> ~/.bashrc && \
echo 'export PATH="$LINUXBREWHOME/bin:$PATH"' >> ~/.bashrc && \ echo 'export PATH="$LINUXBREWHOME/bin:$PATH"' >> ~/.bashrc && \
...@@ -595,19 +590,15 @@ USER root ...@@ -595,19 +590,15 @@ USER root
ARG INSTALL_SYMFONY=false ARG INSTALL_SYMFONY=false
ENV INSTALL_SYMFONY ${INSTALL_SYMFONY} ENV INSTALL_SYMFONY ${INSTALL_SYMFONY}
RUN if [ ${INSTALL_SYMFONY} = true ]; then \ RUN if [ ${INSTALL_SYMFONY} = true ]; then \
mkdir -p /usr/local/bin \ mkdir -p /usr/local/bin \
&& curl -LsS https://symfony.com/installer -o /usr/local/bin/symfony \ && curl -LsS https://symfony.com/installer -o /usr/local/bin/symfony \
&& chmod a+x /usr/local/bin/symfony \ && chmod a+x /usr/local/bin/symfony \
# Symfony 3 alias # Symfony 3 alias
&& echo 'alias dev="php bin/console -e=dev"' >> ~/.bashrc \ && echo 'alias dev="php bin/console -e=dev"' >> ~/.bashrc \
&& echo 'alias prod="php bin/console -e=prod"' >> ~/.bashrc \ && echo 'alias prod="php bin/console -e=prod"' >> ~/.bashrc \
# Symfony 2 alias # Symfony 2 alias
# && echo 'alias dev="php app/console -e=dev"' >> ~/.bashrc \ # && echo 'alias dev="php app/console -e=dev"' >> ~/.bashrc \
# && echo 'alias prod="php app/console -e=prod"' >> ~/.bashrc \ # && echo 'alias prod="php app/console -e=prod"' >> ~/.bashrc \
;fi ;fi
##################################### #####################################
......
workspace/Dockerfile-71
View file @ 164069c2
...@@ -379,14 +379,10 @@ USER root ...@@ -379,14 +379,10 @@ USER root
ARG INSTALL_AEROSPIKE=false ARG INSTALL_AEROSPIKE=false
ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE}
# Copy aerospike configration for remote debugging
COPY ./aerospike.ini /etc/php/7.1/cli/conf.d/aerospike.ini
RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
# Fix dependencies for PHPUnit within aerospike extension # Fix dependencies for PHPUnit within aerospike extension
apt-get update -yqq && \ apt-get update -yqq && \
apt-get -y install sudo wget && \ apt-get -y install sudo wget && \
# Install the php aerospike extension # Install the php aerospike extension
curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/master.tar.gz" \ curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/master.tar.gz" \
&& mkdir -p aerospike-client-php \ && mkdir -p aerospike-client-php \
...@@ -398,10 +394,9 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ ...@@ -398,10 +394,9 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
&& make install \ && make install \
) \ ) \
&& rm /tmp/aerospike-client-php.tar.gz \ && rm /tmp/aerospike-client-php.tar.gz \
;fi && echo 'extension=aerospike.so' >> /etc/php/7.1/cli/conf.d/aerospike.ini \
&& echo 'aerospike.udf.lua_system_path=/usr/local/aerospike/lua' >> /etc/php/7.1/cli/conf.d/aerospike.ini \
RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \ && echo 'aerospike.udf.lua_user_path=/usr/local/aerospike/usr-lua' >> /etc/php/7.1/cli/conf.d/aerospike.ini \
rm /etc/php/7.1/cli/conf.d/aerospike.ini \
;fi ;fi
##################################### #####################################
...@@ -512,7 +507,6 @@ ARG INSTALL_LINUXBREW=false ...@@ -512,7 +507,6 @@ ARG INSTALL_LINUXBREW=false
ENV INSTALL_LINUXBREW ${INSTALL_LINUXBREW} ENV INSTALL_LINUXBREW ${INSTALL_LINUXBREW}
RUN if [ ${INSTALL_LINUXBREW} = true ]; then \ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \
# Preparation # Preparation
apt-get upgrade -y && \ apt-get upgrade -y && \
apt-get install -y build-essential make cmake scons curl git \ apt-get install -y build-essential make cmake scons curl git \
...@@ -520,13 +514,10 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \ ...@@ -520,13 +514,10 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \
gettext libtool flex bison \ gettext libtool flex bison \
libbz2-dev libcurl4-openssl-dev \ libbz2-dev libcurl4-openssl-dev \
libexpat-dev libncurses-dev && \ libexpat-dev libncurses-dev && \
# Install the Linuxbrew # Install the Linuxbrew
git clone --depth=1 https://github.com/Homebrew/linuxbrew.git ~/.linuxbrew && \ git clone --depth=1 https://github.com/Homebrew/linuxbrew.git ~/.linuxbrew && \
echo "" >> ~/.bashrc && \ echo "" >> ~/.bashrc && \
echo 'export PKG_CONFIG_PATH"=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc && \ echo 'export PKG_CONFIG_PATH"=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc && \
# Setup linuxbrew # Setup linuxbrew
echo 'export LINUXBREWHOME="$HOME/.linuxbrew"' >> ~/.bashrc && \ echo 'export LINUXBREWHOME="$HOME/.linuxbrew"' >> ~/.bashrc && \
echo 'export PATH="$LINUXBREWHOME/bin:$PATH"' >> ~/.bashrc && \ echo 'export PATH="$LINUXBREWHOME/bin:$PATH"' >> ~/.bashrc && \
...@@ -606,19 +597,15 @@ USER root ...@@ -606,19 +597,15 @@ USER root
ARG INSTALL_SYMFONY=false ARG INSTALL_SYMFONY=false
ENV INSTALL_SYMFONY ${INSTALL_SYMFONY} ENV INSTALL_SYMFONY ${INSTALL_SYMFONY}
RUN if [ ${INSTALL_SYMFONY} = true ]; then \ RUN if [ ${INSTALL_SYMFONY} = true ]; then \
mkdir -p /usr/local/bin \ mkdir -p /usr/local/bin \
&& curl -LsS https://symfony.com/installer -o /usr/local/bin/symfony \ && curl -LsS https://symfony.com/installer -o /usr/local/bin/symfony \
&& chmod a+x /usr/local/bin/symfony \ && chmod a+x /usr/local/bin/symfony \
# Symfony 3 alias # Symfony 3 alias
&& echo 'alias dev="php bin/console -e=dev"' >> ~/.bashrc \ && echo 'alias dev="php bin/console -e=dev"' >> ~/.bashrc \
&& echo 'alias prod="php bin/console -e=prod"' >> ~/.bashrc \ && echo 'alias prod="php bin/console -e=prod"' >> ~/.bashrc \
# Symfony 2 alias # Symfony 2 alias
# && echo 'alias dev="php app/console -e=dev"' >> ~/.bashrc \ # && echo 'alias dev="php app/console -e=dev"' >> ~/.bashrc \
# && echo 'alias prod="php app/console -e=prod"' >> ~/.bashrc \ # && echo 'alias prod="php app/console -e=prod"' >> ~/.bashrc \
;fi ;fi
##################################### #####################################
......
workspace/Dockerfile-72
View file @ 164069c2
...@@ -379,16 +379,12 @@ USER root ...@@ -379,16 +379,12 @@ USER root
ARG INSTALL_AEROSPIKE=false ARG INSTALL_AEROSPIKE=false
ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE}
# Copy aerospike configration for remote debugging
COPY ./aerospike.ini /etc/php/7.2/cli/conf.d/aerospike.ini
RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
# Fix dependencies for PHPUnit within aerospike extension # Fix dependencies for PHPUnit within aerospike extension
apt-get update -yqq && \ apt-get update -yqq && \
apt-get -y install sudo wget && \ apt-get -y install sudo wget && \
# Install the php aerospike extension (using 7.2.0-in-progress branch until support for 7.2 on master)
# Install the php aerospike extension curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/7.2.0-in-progress.tar.gz" \
curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/master.tar.gz" \
&& mkdir -p aerospike-client-php \ && mkdir -p aerospike-client-php \
&& tar -C aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \ && tar -C aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \
&& ( \ && ( \
...@@ -398,10 +394,9 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ ...@@ -398,10 +394,9 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
&& make install \ && make install \
) \ ) \
&& rm /tmp/aerospike-client-php.tar.gz \ && rm /tmp/aerospike-client-php.tar.gz \
;fi && echo 'extension=aerospike.so' >> /etc/php/7.2/cli/conf.d/aerospike.ini \
&& echo 'aerospike.udf.lua_system_path=/usr/local/aerospike/lua' >> /etc/php/7.2/cli/conf.d/aerospike.ini \
RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \ && echo 'aerospike.udf.lua_user_path=/usr/local/aerospike/usr-lua' >> /etc/php/7.2/cli/conf.d/aerospike.ini \
rm /etc/php/7.2/cli/conf.d/aerospike.ini \
;fi ;fi
##################################### #####################################
...@@ -507,7 +502,6 @@ ARG INSTALL_LINUXBREW=false ...@@ -507,7 +502,6 @@ ARG INSTALL_LINUXBREW=false
ENV INSTALL_LINUXBREW ${INSTALL_LINUXBREW} ENV INSTALL_LINUXBREW ${INSTALL_LINUXBREW}
RUN if [ ${INSTALL_LINUXBREW} = true ]; then \ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \
# Preparation # Preparation
apt-get upgrade -y && \ apt-get upgrade -y && \
apt-get install -y build-essential make cmake scons curl git \ apt-get install -y build-essential make cmake scons curl git \
...@@ -515,13 +509,10 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \ ...@@ -515,13 +509,10 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \
gettext libtool flex bison \ gettext libtool flex bison \
libbz2-dev libcurl4-openssl-dev \ libbz2-dev libcurl4-openssl-dev \
libexpat-dev libncurses-dev && \ libexpat-dev libncurses-dev && \
# Install the Linuxbrew # Install the Linuxbrew
git clone --depth=1 https://github.com/Homebrew/linuxbrew.git ~/.linuxbrew && \ git clone --depth=1 https://github.com/Homebrew/linuxbrew.git ~/.linuxbrew && \
echo "" >> ~/.bashrc && \ echo "" >> ~/.bashrc && \
echo 'export PKG_CONFIG_PATH"=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc && \ echo 'export PKG_CONFIG_PATH"=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc && \
# Setup linuxbrew # Setup linuxbrew
echo 'export LINUXBREWHOME="$HOME/.linuxbrew"' >> ~/.bashrc && \ echo 'export LINUXBREWHOME="$HOME/.linuxbrew"' >> ~/.bashrc && \
echo 'export PATH="$LINUXBREWHOME/bin:$PATH"' >> ~/.bashrc && \ echo 'export PATH="$LINUXBREWHOME/bin:$PATH"' >> ~/.bashrc && \
...@@ -601,19 +592,15 @@ USER root ...@@ -601,19 +592,15 @@ USER root
ARG INSTALL_SYMFONY=false ARG INSTALL_SYMFONY=false
ENV INSTALL_SYMFONY ${INSTALL_SYMFONY} ENV INSTALL_SYMFONY ${INSTALL_SYMFONY}
RUN if [ ${INSTALL_SYMFONY} = true ]; then \ RUN if [ ${INSTALL_SYMFONY} = true ]; then \
mkdir -p /usr/local/bin \ mkdir -p /usr/local/bin \
&& curl -LsS https://symfony.com/installer -o /usr/local/bin/symfony \ && curl -LsS https://symfony.com/installer -o /usr/local/bin/symfony \
&& chmod a+x /usr/local/bin/symfony \ && chmod a+x /usr/local/bin/symfony \
# Symfony 3 alias # Symfony 3 alias
&& echo 'alias dev="php bin/console -e=dev"' >> ~/.bashrc \ && echo 'alias dev="php bin/console -e=dev"' >> ~/.bashrc \
&& echo 'alias prod="php bin/console -e=prod"' >> ~/.bashrc \ && echo 'alias prod="php bin/console -e=prod"' >> ~/.bashrc \
# Symfony 2 alias # Symfony 2 alias
# && echo 'alias dev="php app/console -e=dev"' >> ~/.bashrc \ # && echo 'alias dev="php app/console -e=dev"' >> ~/.bashrc \
# && echo 'alias prod="php app/console -e=prod"' >> ~/.bashrc \ # && echo 'alias prod="php app/console -e=prod"' >> ~/.bashrc \
;fi ;fi
##################################### #####################################
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment