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
4cf5f3ea
Commit
4cf5f3ea
authored
May 07, 2017
by
Winfried
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removing suffix for Aerospike and V8JS
parent
3a3e58de
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
37 additions
and
37 deletions
+37
-37
index.md
DOCUMENTATION/content/documentation/index.md
+4
-4
docker-compose.yml
docker-compose.yml
+3
-3
env-example
env-example
+3
-3
Dockerfile-56
php-fpm/Dockerfile-56
+3
-3
Dockerfile-70
php-fpm/Dockerfile-70
+3
-3
Dockerfile-71
php-fpm/Dockerfile-71
+3
-3
Dockerfile-56
workspace/Dockerfile-56
+4
-4
Dockerfile-70
workspace/Dockerfile-70
+7
-7
Dockerfile-71
workspace/Dockerfile-71
+7
-7
No files found.
DOCUMENTATION/content/documentation/index.md
View file @
4cf5f3ea
...
...
@@ -1239,11 +1239,11 @@ You are free to modify the `aliases.sh` as you see fit, adding your own aliases
<br>
a) open the `docker-compose.yml` file
<br>
b) search for the `INSTALL_AEROSPIKE
_EXTENSION
` argument under the Workspace Container
b) search for the `INSTALL_AEROSPIKE` argument under the Workspace Container
<br>
c) set it to `true`
<br>
d) search for the `INSTALL_AEROSPIKE
_EXTENSION
` argument under the PHP-FPM Container
d) search for the `INSTALL_AEROSPIKE` argument under the PHP-FPM Container
<br>
e) set it to `true`
...
...
@@ -1254,13 +1254,13 @@ It should be like this:
build:
context: ./workspace
args:
-
INSTALL_AEROSPIKE
_EXTENSION
=true
-
INSTALL_AEROSPIKE=true
...
php-fpm:
build:
context: ./php-fpm
args:
-
INSTALL_AEROSPIKE
_EXTENSION
=true
-
INSTALL_AEROSPIKE=true
...
```
...
...
docker-compose.yml
View file @
4cf5f3ea
...
...
@@ -23,8 +23,8 @@ services:
-
INSTALL_NODE=${WORKSPACE_INSTALL_NODE}
-
INSTALL_YARN=${WORKSPACE_INSTALL_YARN}
-
INSTALL_DRUSH=${WORKSPACE_INSTALL_DRUSH}
-
INSTALL_AEROSPIKE
_EXTENSION=${WORKSPACE_INSTALL_AEROSPIKE_EXTENSION
}
-
INSTALL_V8JS
_EXTENSION=${WORKSPACE_INSTALL_V8JS_EXTENSION
}
-
INSTALL_AEROSPIKE
=${WORKSPACE_INSTALL_AEROSPIKE
}
-
INSTALL_V8JS
=${WORKSPACE_INSTALL_V8JS
}
-
COMPOSER_GLOBAL_INSTALL=${WORKSPACE_COMPOSER_GLOBAL_INSTALL}
-
INSTALL_WORKSPACE_SSH=${WORKSPACE_INSTALL_WORKSPACE_SSH}
-
INSTALL_LARAVEL_ENVOY=${WORKSPACE_INSTALL_LARAVEL_ENVOY}
...
...
@@ -67,7 +67,7 @@ services:
-
INSTALL_MEMCACHED=${PHP_FPM_INSTALL_MEMCACHED}
-
INSTALL_OPCACHE=${PHP_FPM_INSTALL_OPCACHE}
-
INSTALL_EXIF=${PHP_FPM_INSTALL_EXIF}
-
INSTALL_AEROSPIKE
_EXTENSION=${PHP_FPM_INSTALL_AEROSPIKE_EXTENSION
}
-
INSTALL_AEROSPIKE
=${PHP_FPM_INSTALL_AEROSPIKE
}
-
INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI}
-
INSTALL_TOKENIZER=${PHP_FPM_INSTALL_TOKENIZER}
-
INSTALL_INTL=${PHP_FPM_INSTALL_INTL}
...
...
env-example
View file @
4cf5f3ea
...
...
@@ -36,8 +36,8 @@ WORKSPACE_INSTALL_MSSQL=false
WORKSPACE_INSTALL_NODE=false
WORKSPACE_INSTALL_YARN=false
WORKSPACE_INSTALL_DRUSH=false
WORKSPACE_INSTALL_AEROSPIKE
_EXTENSION
=false
WORKSPACE_INSTALL_V8JS
_EXTENSION
=false
WORKSPACE_INSTALL_AEROSPIKE=false
WORKSPACE_INSTALL_V8JS=false
WORKSPACE_COMPOSER_GLOBAL_INSTALL=false
WORKSPACE_INSTALL_WORKSPACE_SSH=false
WORKSPACE_INSTALL_LARAVEL_ENVOY=false
...
...
@@ -63,7 +63,7 @@ PHP_FPM_INSTALL_PHPREDIS=false
PHP_FPM_INSTALL_MEMCACHED=false
PHP_FPM_INSTALL_OPCACHE=false
PHP_FPM_INSTALL_EXIF=false
PHP_FPM_INSTALL_AEROSPIKE
_EXTENSION
=false
PHP_FPM_INSTALL_AEROSPIKE=false
PHP_FPM_INSTALL_MYSQLI=false
PHP_FPM_INSTALL_TOKENIZER=false
PHP_FPM_INSTALL_INTL=false
...
...
php-fpm/Dockerfile-56
View file @
4cf5f3ea
...
...
@@ -148,11 +148,11 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \
# PHP Aerospike:
#####################################
ARG INSTALL_AEROSPIKE
_EXTENSION
=false
ENV INSTALL_AEROSPIKE
_EXTENSION ${INSTALL_AEROSPIKE_EXTENSION
}
ARG INSTALL_AEROSPIKE=false
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
_EXTENSION
} = true ]; then \
RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
# Install the php aerospike extension
curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \
&& mkdir -p aerospike-client-php \
...
...
php-fpm/Dockerfile-70
View file @
4cf5f3ea
...
...
@@ -156,11 +156,11 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \
# PHP Aerospike:
#####################################
ARG INSTALL_AEROSPIKE
_EXTENSION
=false
ENV INSTALL_AEROSPIKE
_EXTENSION ${INSTALL_AEROSPIKE_EXTENSION
}
ARG INSTALL_AEROSPIKE=false
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
_EXTENSION
} = true ]; then \
RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
# Install the php aerospike extension
curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \
&& mkdir -p aerospike-client-php \
...
...
php-fpm/Dockerfile-71
View file @
4cf5f3ea
...
...
@@ -156,11 +156,11 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \
# PHP Aerospike:
#####################################
ARG INSTALL_AEROSPIKE
_EXTENSION
=false
ENV INSTALL_AEROSPIKE
_EXTENSION ${INSTALL_AEROSPIKE_EXTENSION
}
ARG INSTALL_AEROSPIKE=false
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
_EXTENSION
} = true ]; then \
RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
# Install the php aerospike extension
curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \
&& mkdir -p aerospike-client-php \
...
...
workspace/Dockerfile-56
View file @
4cf5f3ea
...
...
@@ -278,13 +278,13 @@ RUN if [ ${INSTALL_YARN} = true ]; then \
#####################################
USER root
ARG INSTALL_AEROSPIKE
_EXTENSION
=true
ENV INSTALL_AEROSPIKE
_EXTENSION ${INSTALL_AEROSPIKE_EXTENSION
}
ARG INSTALL_AEROSPIKE=true
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
_EXTENSION
} = true ]; then \
RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
# Install the php aerospike extension
curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \
&& mkdir -p aerospike-client-php \
...
...
@@ -298,7 +298,7 @@ RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = true ]; then \
&& rm /tmp/aerospike-client-php.tar.gz \
;fi
RUN if [ ${INSTALL_AEROSPIKE
_EXTENSION
} = false ]; then \
RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \
rm /etc/php/5.6/cli/conf.d/aerospike.ini \
;fi
...
...
workspace/Dockerfile-70
View file @
4cf5f3ea
...
...
@@ -278,13 +278,13 @@ RUN if [ ${INSTALL_YARN} = true ]; then \
#####################################
USER root
ARG INSTALL_AEROSPIKE
_EXTENSION
=true
ENV INSTALL_AEROSPIKE
_EXTENSION ${INSTALL_AEROSPIKE_EXTENSION
}
ARG INSTALL_AEROSPIKE=true
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
_EXTENSION
} = true ]; then \
RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
# Install the php aerospike extension
curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \
&& mkdir -p aerospike-client-php \
...
...
@@ -298,7 +298,7 @@ RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = true ]; then \
&& rm /tmp/aerospike-client-php.tar.gz \
;fi
RUN if [ ${INSTALL_AEROSPIKE
_EXTENSION
} = false ]; then \
RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \
rm /etc/php/7.0/cli/conf.d/aerospike.ini \
;fi
...
...
@@ -307,10 +307,10 @@ RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = false ]; then \
#####################################
USER root
ARG INSTALL_V8JS
_EXTENSION
=false
ENV INSTALL_V8JS
_EXTENSION ${INSTALL_V8JS_EXTENSION
}
ARG INSTALL_V8JS=false
ENV INSTALL_V8JS
${INSTALL_V8JS
}
RUN if [ ${INSTALL_V8JS
_EXTENSION
} = true ]; then \
RUN if [ ${INSTALL_V8JS} = true ]; then \
# Install the php V8JS extension
add-apt-repository -y ppa:pinepain/libv8-5.4 \
&& apt-get update -yqq \
...
...
workspace/Dockerfile-71
View file @
4cf5f3ea
...
...
@@ -274,13 +274,13 @@ RUN if [ ${INSTALL_YARN} = true ]; then \
#####################################
USER root
ARG INSTALL_AEROSPIKE
_EXTENSION
=true
ENV INSTALL_AEROSPIKE
_EXTENSION ${INSTALL_AEROSPIKE_EXTENSION
}
ARG INSTALL_AEROSPIKE=true
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
_EXTENSION
} = true ]; then \
RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
# Install the php aerospike extension
curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \
&& mkdir -p aerospike-client-php \
...
...
@@ -294,7 +294,7 @@ RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = true ]; then \
&& rm /tmp/aerospike-client-php.tar.gz \
;fi
RUN if [ ${INSTALL_AEROSPIKE
_EXTENSION
} = false ]; then \
RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \
rm /etc/php/7.1/cli/conf.d/aerospike.ini \
;fi
...
...
@@ -303,10 +303,10 @@ RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = false ]; then \
#####################################
USER root
ARG INSTALL_V8JS
_EXTENSION
=false
ENV INSTALL_V8JS
_EXTENSION ${INSTALL_V8JS_EXTENSION
}
ARG INSTALL_V8JS=false
ENV INSTALL_V8JS
${INSTALL_V8JS
}
RUN if [ ${INSTALL_V8JS
_EXTENSION
} = true ]; then \
RUN if [ ${INSTALL_V8JS} = true ]; then \
# Install the php V8JS extension
add-apt-repository -y ppa:pinepain/libv8-5.4 \
&& apt-get update -yqq \
...
...
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