Move dev scripts and docker config under dev directory
[MAILPOET-3919]
This commit is contained in:
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.1 KiB |
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.1 KiB |
@@ -26,7 +26,7 @@ RUN apt-get update \
|
|||||||
apt-get clean && \
|
apt-get clean && \
|
||||||
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||||
|
|
||||||
COPY docker/php.ini /usr/local/etc/php/conf.d/php_user.ini
|
COPY dev/php.ini /usr/local/etc/php/conf.d/php_user.ini
|
||||||
|
|
||||||
# msmtp config
|
# msmtp config
|
||||||
RUN printf "account default\nhost smtp\nport 1025" > /etc/msmtprc
|
RUN printf "account default\nhost smtp\nport 1025" > /etc/msmtprc
|
||||||
@@ -34,7 +34,7 @@ RUN printf "account default\nhost smtp\nport 1025" > /etc/msmtprc
|
|||||||
# xdebug config
|
# xdebug config
|
||||||
ENV XDEBUGINI_PATH=/usr/local/etc/php/conf.d/xdebug.ini
|
ENV XDEBUGINI_PATH=/usr/local/etc/php/conf.d/xdebug.ini
|
||||||
RUN echo "zend_extension="`find /usr/local/lib/php/extensions/ -iname 'xdebug.so'` > $XDEBUGINI_PATH
|
RUN echo "zend_extension="`find /usr/local/lib/php/extensions/ -iname 'xdebug.so'` > $XDEBUGINI_PATH
|
||||||
COPY docker/php74/xdebug.ini /tmp/xdebug.ini
|
COPY dev/php74/xdebug.ini /tmp/xdebug.ini
|
||||||
RUN cat /tmp/xdebug.ini >> $XDEBUGINI_PATH
|
RUN cat /tmp/xdebug.ini >> $XDEBUGINI_PATH
|
||||||
|
|
||||||
# allow .htaccess files (between <Directory /var/www/> and </Directory>, which is WordPress installation)
|
# allow .htaccess files (between <Directory /var/www/> and </Directory>, which is WordPress installation)
|
@@ -24,7 +24,7 @@ RUN apt-get update \
|
|||||||
apt-get clean && \
|
apt-get clean && \
|
||||||
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||||
|
|
||||||
COPY docker/php.ini /usr/local/etc/php/conf.d/php_user.ini
|
COPY dev/php.ini /usr/local/etc/php/conf.d/php_user.ini
|
||||||
|
|
||||||
# msmtp config
|
# msmtp config
|
||||||
RUN printf "account default\nhost smtp\nport 1025" > /etc/msmtprc
|
RUN printf "account default\nhost smtp\nport 1025" > /etc/msmtprc
|
||||||
@@ -35,7 +35,7 @@ RUN git clone -b "3.0.2" --depth 1 https://github.com/xdebug/xdebug.git /usr/src
|
|||||||
&& docker-php-ext-configure xdebug --enable-xdebug-dev \
|
&& docker-php-ext-configure xdebug --enable-xdebug-dev \
|
||||||
&& docker-php-ext-install xdebug \
|
&& docker-php-ext-install xdebug \
|
||||||
&& mkdir /tmp/debug
|
&& mkdir /tmp/debug
|
||||||
COPY docker/xdebug.ini /tmp/xdebug.ini
|
COPY dev/xdebug.ini /tmp/xdebug.ini
|
||||||
RUN cat /tmp/xdebug.ini >> $XDEBUGINI_PATH
|
RUN cat /tmp/xdebug.ini >> $XDEBUGINI_PATH
|
||||||
|
|
||||||
# php extensions
|
# php extensions
|
@@ -24,7 +24,7 @@ RUN apt-get update \
|
|||||||
apt-get clean && \
|
apt-get clean && \
|
||||||
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||||
|
|
||||||
COPY docker/php.ini /usr/local/etc/php/conf.d/php_user.ini
|
COPY dev/php.ini /usr/local/etc/php/conf.d/php_user.ini
|
||||||
|
|
||||||
# msmtp config
|
# msmtp config
|
||||||
RUN printf "account default\nhost smtp\nport 1025" > /etc/msmtprc
|
RUN printf "account default\nhost smtp\nport 1025" > /etc/msmtprc
|
||||||
@@ -35,7 +35,7 @@ RUN git clone -b "3.1.1" --depth 1 https://github.com/xdebug/xdebug.git /usr/src
|
|||||||
&& docker-php-ext-configure xdebug --enable-xdebug-dev \
|
&& docker-php-ext-configure xdebug --enable-xdebug-dev \
|
||||||
&& docker-php-ext-install xdebug \
|
&& docker-php-ext-install xdebug \
|
||||||
&& mkdir /tmp/debug
|
&& mkdir /tmp/debug
|
||||||
COPY docker/xdebug.ini /tmp/xdebug.ini
|
COPY dev/xdebug.ini /tmp/xdebug.ini
|
||||||
RUN cat /tmp/xdebug.ini >> $XDEBUGINI_PATH
|
RUN cat /tmp/xdebug.ini >> $XDEBUGINI_PATH
|
||||||
|
|
||||||
# php extensions
|
# php extensions
|
2
do
2
do
@@ -28,7 +28,7 @@ if [ "$1" = "" -o "$1" = "--help" ]; then
|
|||||||
syntax
|
syntax
|
||||||
|
|
||||||
elif [ "$1" = "setup" ]; then
|
elif [ "$1" = "setup" ]; then
|
||||||
./initial-setup.sh
|
./dev/initial-setup.sh
|
||||||
|
|
||||||
elif [ "$1" = "start" ]; then
|
elif [ "$1" = "start" ]; then
|
||||||
docker-compose up -d
|
docker-compose up -d
|
||||||
|
@@ -7,14 +7,14 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- 8888:80
|
- 8888:80
|
||||||
volumes:
|
volumes:
|
||||||
- ./docker/dashboard:/usr/share/nginx/html:ro
|
- ./dev/dashboard:/usr/share/nginx/html:ro
|
||||||
|
|
||||||
db:
|
db:
|
||||||
container_name: mp-db
|
container_name: mp-db
|
||||||
image: mysql:5.7
|
image: mysql:5.7
|
||||||
volumes:
|
volumes:
|
||||||
- my-datavolume:/var/lib/mysql
|
- my-datavolume:/var/lib/mysql
|
||||||
- ./docker/create_test_db.sh:/docker-entrypoint-initdb.d/10-create_test_db.sh
|
- ./dev/database/create_test_db.sh:/docker-entrypoint-initdb.d/10-create_test_db.sh
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: somewordpress
|
MYSQL_ROOT_PASSWORD: somewordpress
|
||||||
MYSQL_DATABASE: wordpress
|
MYSQL_DATABASE: wordpress
|
||||||
@@ -26,7 +26,7 @@ services:
|
|||||||
container_name: mp-wp
|
container_name: mp-wp
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: docker/php80/Dockerfile
|
dockerfile: dev/php80/Dockerfile
|
||||||
args:
|
args:
|
||||||
UID: ${UID:-1000}
|
UID: ${UID:-1000}
|
||||||
GID: ${GID:-1000}
|
GID: ${GID:-1000}
|
||||||
@@ -56,7 +56,7 @@ services:
|
|||||||
container_name: mp-test-wp
|
container_name: mp-test-wp
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: docker/php80/Dockerfile
|
dockerfile: dev/php80/Dockerfile
|
||||||
args:
|
args:
|
||||||
UID: ${UID:-1000}
|
UID: ${UID:-1000}
|
||||||
GID: ${GID:-1000}
|
GID: ${GID:-1000}
|
||||||
@@ -96,7 +96,7 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "8081:8080"
|
- "8081:8080"
|
||||||
volumes:
|
volumes:
|
||||||
- "./docker/php.ini:/usr/local/etc/php/conf.d/custom.ini"
|
- "./dev/php.ini:/usr/local/etc/php/conf.d/custom.ini"
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
my-datavolume:
|
my-datavolume:
|
||||||
|
@@ -27,7 +27,7 @@ Alternatively, you can add `XDEBUG_TRIGGER: yes` to the `wordpress` service in `
|
|||||||
## 💾 NFS volume sharing for Mac
|
## 💾 NFS volume sharing for Mac
|
||||||
NFS volumes can bring more stability and performance on Docker for Mac. To setup NFS volume sharing run:
|
NFS volumes can bring more stability and performance on Docker for Mac. To setup NFS volume sharing run:
|
||||||
```shell
|
```shell
|
||||||
sudo sh mac-nfs-setup.sh
|
sudo sh dev/mac-nfs-setup.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
Then create a Docker Compose override file with NFS settings and restart containers:
|
Then create a Docker Compose override file with NFS settings and restart containers:
|
||||||
|
Reference in New Issue
Block a user