version from gitlab

Author: bukowa

.env

@@ -11,7 +11,7 @@ MYSQL_DATABASE=root
 #=========================#
 WORDPRESS_PORT=9344
 PHPMYADMIN_PORT=9335
-
+MYSQL_PORT=9336
 #=========================#
       # >--LIVE--< #
 #=========================#

.gitignore

@@ -2,5 +2,4 @@
 .terraform*
 terraform.tfstate
 terraform.tfstate.backup
-var
 terraform.tfvars

.gitlab-ci.yml

@@ -0,0 +1,70 @@
+image: quay.io/project-wordpress/docker:18.04-compose
+
+services:
+  - docker:18.04-dind
+
+#cache: &cache
+#  key: ${CI_COMMIT_REF_SLUG}
+#  paths:
+#    - ./var/
+
+#variables:
+#    DOCKER_HOST: tcp://localhost:2375
+#    DOCKER_DRIVER: overlay2
+
+test:
+  stage: test
+#  cache:
+#    <<: *cache
+
+  before_script:
+    - source .env
+    - echo "127.0.0.1 ${DOMAIN_NAME}" | tee -a /etc/hosts
+    - chmod +x ./run_tests.sh
+#    - export gid=82
+#    - export uid=82
+#    - export user=www-data
+#    - addgroup --gid "$gid" "$user" \
+#      && adduser \
+#      --disabled-password \
+#      --gecos "" \
+#      --home "$(pwd)" \
+#      --ingroup "$user" \
+#      --no-create-home \
+#      --uid "$uid" \
+#      "$user"
+#    - chown -R 82:82 ./var
+  script:
+    - ./run_tests.sh
+  after_script:
+    - docker ps
+    - docker stats --no-stream
+    - ls -al ./var/www/html/wp-content
+    - ls -al ./var/www/html/
+    - docker-compose logs
+#
+#docker-build-master:
+#  stage: build
+#  image: docker:18.04
+#  before_script:
+#    - docker login -u "$CI_REGISTRY_user" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+#  variables:
+#    MYSQL_IMAGE: $CI_REGISTRY_IMAGE/mysql:latest
+#    WORDPRESS_IMAGE: $CI_REGISTRY_IMAGE/wordpress:latest
+#    WPCLI_IMAGE: $CI_REGISTRY_IMAGE/wp-cli:latest
+#    NGINX_IMAGE: $CI_REGISTRY_IMAGE/nginx:latest
+#  script:
+#    - docker pull $MYSQL_IMAGE || true
+#    - docker pull $WORDPRESS_IMAGE || true
+#    - docker pull $WPCLI_IMAGE || true
+#    - docker pull $NGINX_IMAGE || true
+#    - docker build --cache-from $MYSQL_IMAGE -t $MYSQL_IMAGE ./mysql/
+#    - docker build --cache-from $WORDPRESS_IMAGE -t $WORDPRESS_IMAGE ./wordpress/
+#    - docker build --cache-from $WPCLI_IMAGE -t $WPCLI_IMAGE ./wp-cli/
+#    - docker build --cache-from $NGINX_IMAGE -t $NGINX_IMAGE ./nginx/
+#    - docker push $MYSQL_IMAGE
+#    - docker push $WORDPRESS_IMAGE
+#    - docker push $WPCLI_IMAGE
+#    - docker push $NGINX_IMAGE
+#  only:
+#    - master

COMMANDS.md

@@ -0,0 +1,59 @@
+@madmath03 
+With this command you can still connect to all stacks if you have consistent naming, just change `$NAME` 
+````bash
+NAME=wpdev && docker run --rm -it \
+--volumes-from="${NAME}_wordpress_1" \
+--network="${NAME}_default" \
+-e WORDPRESS_HOST=wordpress:9000 \
+-u 33 \
+test \
+\
+/bin/bash
+Success: WordPress is up to date.
+````
+
+Or if you have non-consistent naming place `.env` file in your `docker-compose.yaml` folder, `docker-compose` will read it automatically:
+````bash
+---------- 420 buk 345233  236 Jan 26 14:06 .env
+---------- 420 buk 345233  124 Jan 26 14:06 docker-compose.yaml
+````
+````env
+# .env
+NETWORK_NAME=mynetwork
+WORDPRESS_CONTAINER=mycontainer
+````
+````yaml
+# docker-compose.yaml
+networks:
+  test:
+    name: $NETWORK_NAME
+
+services:
+
+  wordpress:
+    container_name: $WORDPRESS_CONTAINER
+    networks:
+      - test
+
+  mysql:
+    networks:
+      - test
+````
+And then run:
+```bash
+source .env && \
+docker run -it \
+--volumes-from="${WORDPRESS_CONTAINER}" \
+--network="${NETWORK_NAME}" \
+wordpress:cli-php7.4 \
+\
+/bin/bash -c "wp core update"
+```
+
+To use `name` in `networks` you have  to use `docker-compose >= 3.4` 
+Also, keep in mind:
+
+> Values in the shell take precedence over those specified in the .env file. If you set TAG to a different value in your shell, the substitution in image uses that instead
+
+
+* See https://docs.docker.com/v17.12/compose/environment-variables/#set-environment-variables-with-docker-compose-run

LIVEEDIT.md

@@ -0,0 +1,8 @@
+1. Install Live Edit plugin.
+2. If you want to use your extensions in chrome, you have to use [chrome extension](https://chrome.google.com/webstore/detail/jetbrains-ide-support/hmhgeddbohgjknpmjagkdomcpobmllji?hl=en) (see picture 1 "User JetBrains IDE Support")
+
+![alt text](help/phpstorm64_KCvQaoAueV.png)
+![alt text](help/phpstorm64_8gyuPN29dM.png)
+![alt text](help/phpstorm64_X4S09Qre5h.png)
+
+3. `docker-compose up` to run your application.

Makefile

@@ -44,6 +44,9 @@ copy-db:
 	BACKUP_FILE=$(shell make db-export | tail -1);\
 	cp ./var/backups/$$BACKUP_FILE ./mysql/docker-entrypoint-initdb.d
 
+.PHONY: wp
+wp:
+	${DEV} run wp-cli $(args)
 #file=connect
 #folder=./tests/python
 #args="localhost ${WORDPRESS_PORT} / 200"
@@ -60,6 +63,10 @@ tests:
 crawl-local:
 	make folder=./tests/python file=crawl test args="http://localhost:${WORDPRESS_PORT}"
 
+.PHONY: wp-cli-up
+wp-cli-up:	## wp-cli up build
+	${DEV} up --build wp-cli
+
 .PHONY: help
 help:
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z0-9_-]+:.*?## / {printf "\033[36m%-16s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)

README.md

@@ -3,51 +3,74 @@
 
 Local stack for developing [`wordpress`](https://wordpress.org/)
 
-Future goal of this project is to bring painless developing experience alongside production ready containers ready to be deploy to plain `docker` or `kubernetes` via `CI/CD` pipelines.
-```bash
-CONTAINER ID        NAME                  CPU %               MEM USAGE / LIMIT    MEM %               NET I/O             BLOCK I/O           PIDS
-
-da0e07d3dcb3        nginx_1        0.00%               2.82MiB / 7.79GiB    0.04%               490kB / 1.01MB      0B / 0B             3
+There is a lot of files, but you may be interested only in few of them, don't worry!
 
-4875a813d4a0        wordpress_1    0.00%               12.78MiB / 7.79GiB   0.16%               603kB / 576kB       0B / 32.8kB         3
-
-7f5cefd9d559        phpmyadmin_1   0.00%               9.32MiB / 7.79GiB    0.12%               210B / 0B           0B / 0B             6
+### Usage:
+* You can add plugins and themes that you want to be installed automatically in [wpdev.yaml](./var/config/wpdev.yaml) (for now only official plugins and themes can be installed this way using slug)
+* Edit [.env](./.env) file to your needs (you may want to change ports if you are working on few project at a time )
+* Default themes and plugins that are bundled with wordpress are deleted.
 
-16ce9c05cc74        mysql_1        0.25%               83.1MiB / 7.79GiB    1.04%               146kB / 611kB       0B / 58.2MB         41
+To start execute this command:
+```bash
+docker-compose up
+```
+* `wordpress` will be live at
+```bash
+http://localhost:$WORDPRESS_PORT
+```
+* `phpmyadmin` will be live at
+```bash
+http://localhost:$PHPMYADMIN_PORT
+```
+```bash
+wordpress_1   | Complete! WordPress has been successfully copied to /var/www/html
+wordpress_1   | [28-Jan-2020 13:05:22] NOTICE: fpm is running, pid 1
+wordpress_1   | [28-Jan-2020 13:05:22] NOTICE: ready to handle connections
+wp-cli_1      | wait-for-it: wordpress:9000 is available after 37 seconds
+wp-cli_1      | Developing...
+wp-cli_1      | declare -x WORDPRESS_PORT="9344"
+wp-cli_1      | Installing wordpress...
+mysql_1       | mbind: Operation not permitted
+wp-cli_1      | Success: WordPress installed successfully.
+wp-cli_1      | Installing plugins...
+wp-cli_1      | Installing themes...
+wp-cli_1      | Deleting plugins
+wp-cli_1      | Deleted 'hello' plugin.
+wp-cli_1      | Success: Deleted 1 of 1 plugins.
+wp-cli_1      | Deleted 'akismet' plugin.
+wp-cli_1      | Success: Deleted 1 of 1 plugins.
+wp-cli_1      | Deleting themes
+wp-cli_1      | Deleted 'twentynineteen' theme.
+wp-cli_1      | Success: Deleted 1 of 1 themes.
+wp-cli_1      | Deleted 'twentyseventeen' theme.
+wp-cli_1      | Success: Deleted 1 of 1 themes.
+wp-cli_1      | Deleted 'twentysixteen' theme.
+wp-cli_1      | Success: Deleted 1 of 1 themes.
+wp-cli_1      | Installing `theme`
+wp-cli_1      | Unpacking the package...
+wp-cli_1      | Installing the theme...
+wp-cli_1      | Theme installed successfully.
+wp-cli_1      | Success: Installed 1 of 1 themes.
+wp-cli_1      | Activating all plugins...
+wp-cli_1      | Success: No plugins installed.
+wp-cli_1      | Activating `theme`
+wp-cli_1      | Success: Switched to 'theme' theme.
+wp-cli_1      | Rewriting permalinks
+wp-cli_1      | Success: Rewrite structure set.
+mysql_1       | mbind: Operation not permitted
+wp-cli_1      | Success: Rewrite rules flushed.
+wp-cli_1      | Visit http://localhost:9344/wp-login.php
 ```
 ## Info
-* please get involved if you can
+* theres `run_tests.sh` or `.gitlab-ci.yml` that can be used to run your tests
 * tests are parsing your site and checking if everything responds with status code `200`, to change that behaviour see [this file](./tests/python/crawl.py)
 * static files are handled by `nginx`
 * wp-cli will handle changing `SITE_URL` based on your `.env` settings
-* this stack can be easy deployed live using `make deploy`
 
 ### Requirements:
 * [docker](https://www.docker.com/)
 * [docker-compose](https://docs.docker.com/compose/)
 
-### Usage:
-* Edit [.env](./.env) file to your needs and run:
-```bash
-docker-compose up
-```
-* Wordpress will be automatically installed your site should be live at `
-http://localhost:$WORDPRESS_PORT`
-```bash
-wordpress_1   | Complete! WordPress has been successfully copied to /var/www/html
-wordpress_1   | [25-Jan-2020 22:46:56] NOTICE: fpm is running, pid 1
-wordpress_1   | [25-Jan-2020 22:46:56] NOTICE: ready to handle connections
-wp-cli_1      | wait-for-it: wordpress:9000 is available after 35 seconds
-wp-cli_1      | Developing...
-wp-cli_1      | Installing wordpress...
-wp-cli_1      | Success: WordPress installed successfully.
-wp-cli_1      | Visit http://localhost:9344
-wpdev_wp-cli_1 exited with code 0
-```
-* phpmyadmin will be live at
-```bash
-http://localhost:$PHPMYADMIN_PORT
-```
 * to backup your database into `./var/backups` run:
 ```bash
 make db-export
@@ -57,11 +80,11 @@ make db-export
 make copy-db
 ```
 ## Tests
-* while running `make tests` or directly calling `run_tests.sh` live deployment will be tested too, it means that your host should resolve `$DOMAIN_NAME` from `.env` file
 * to run a simle crawling test checking for status code 200 on your local development run
     ```bash
     make crawl-local
     ```
+
   ```bash
     PARSED
     {
@@ -142,11 +165,8 @@ make copy-db
 # todo & needs fixing
 * design db migration schemas and production database separation
 * make http benchmarking
-* lower mysql ram usage (currently 80MiB)
-* urls like `localhost:9333/asdASDa/435/345/345/345` redirect to `homepage` why?
-* modify `wp-cli` to allow custom setup (activating plugins etc.)
+* lower mysql and wordpress ram usage (currently 20MiB and 80MiB but after installing theme up to 300MiB and 400MiB?????)
 * allow `crawl.py` allowed rules to be specified in a file
 * create solid `nginx` configuration
 * test file permissions and sensitive files
 * mysql 8.0.18 gives `mbind: Operation not permitted`
-* test db import export

docker-compose.override.yaml

@@ -23,6 +23,7 @@ services:
     volumes:
       - "./var/www/html:/var/www/html"
       - "./var/backups:/backups"
+      - "./var/config/:/apps/config/"
 
   phpmyadmin:
     depends_on:

docker-compose.yaml

@@ -3,7 +3,6 @@ version: '3.6'
 services:
 
   nginx:
-    restart: unless-stopped
     depends_on:
       - wordpress
     build:
@@ -12,7 +11,6 @@ services:
       - "./var/www/html:/var/www/html"
 
   wordpress:
-    restart: unless-stopped
     depends_on:
       - mysql
     build:
@@ -22,16 +20,19 @@ services:
       WORDPRESS_DB_USER: "root"
       WORDPRESS_DB_PASSWORD: ${MYSQL_ROOT_PASSWORD}
       WORDPRESS_DB_NAME: ${MYSQL_DATABASE}
+      WORDPRESS_DEBUG: 1
+      WORDPRESS_CONFIG_EXTRA: |
+        define( 'UPLOADS', 'wp-content/uploads' );
     volumes:
       - "./var/www/html:/var/www/html"
 
   mysql:
-    restart: unless-stopped
     build:
       context: ./mysql
+    ports:
+      - ${MYSQL_PORT}:3306
     environment:
       MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
       MYSQL_DATABASE: ${MYSQL_DATABASE}
     volumes:
       - "./var/mysql:/var/lib/mysql"
-      - "./var/backups:/backups"