Update

Author: oanhnn

.github/dependabot.yml

@@ -0,0 +1,31 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    target-branch: master
+    assignees:
+      - oanhnn
+    reviewers:
+      - oanhnn
+    schedule:
+      interval: weekly
+      day: monday
+      time: "12:00"
+      timezone: Asia/Ho_Chi_Minh
+    labels:
+      - dependencies
+
+  - package-ecosystem: docker
+    directory: /docker/wordpress
+    target-branch: master
+    assignees:
+      - oanhnn
+    reviewers:
+      - oanhnn
+    schedule:
+      interval: weekly
+      day: monday
+      time: "12:00"
+      timezone: Asia/Ho_Chi_Minh
+    labels:
+      - dependencies

Dockerrun.aws.json

@@ -16,7 +16,7 @@
   ],
   "containerDefinitions": [
     {
-      "name": "wp",
+      "name": "wordpress",
       "image": "wordpress:php8.1-fpm-alpine",
       "essential": true,
       "environment": [
@@ -61,9 +61,15 @@
       "name": "web",
       "image": "nginx:stable-alpine",
       "essential": true,
+      "environment": [
+        {
+          "name": "PHP_FPM_ENDPOINT",
+          "value": "wordpress:9000"
+        }
+      ],
       "memory": 256,
       "links": [
-        "wp"
+        "wordpress"
       ],
       "mountPoints": [
         {

README.md

@@ -6,8 +6,8 @@ An example for developing Wordpress sites with Docker and deploy to AWS Elastic
 
 - Bash shell
 - Git
-- Docker Engine 19.03.0+
-- Docker Compose 1.27.0+
+- Docker
+- Docker Compose plugin
 
 ## Project organisation
 
@@ -17,7 +17,7 @@ This is what each item is for:
 * `bin/` – Useful command-line scripts.
 * `data/` – MySQL dump files go here.
 * `docker/` – Files required by the Docker setup are in this directory.
-* `docker-compose.yml` – Development orchestration config file.
+* `compose.yml` – Development orchestration config file.
 * `Dockerrun.aws.json` - Elastic Beanstalk config file.
 
 ## Dev
@@ -29,7 +29,7 @@ $ git clone git@github.com:oanhnn/example-wordpress-with-docker.git project_dir
 $ cd project_dir
 $ cp .env.example .env
 $ mkdir app
-$ docker-compose up -d
+$ docker compose up -d
 ```
 
 #### Backup database

bin/backup-db.sh

@@ -7,7 +7,7 @@ ROOT_DIR="$( cd `dirname $0` ; cd .. ; pwd -P )"
 file="$ROOT_DIR/${1:-data/dump-$(date +%Y%m%d-%H%M%S).sql}"
 
 # Create dump file
-docker-compose exec mysql sh -c "MYSQL_PWD=\$MYSQL_PASSWORD mysqldump -u \$MYSQL_USER \$MYSQL_DATABASE" > $file
+docker compose exec mysql sh -c "MYSQL_PWD=\$MYSQL_PASSWORD mysqldump -u \$MYSQL_USER \$MYSQL_DATABASE" > $file
 
 # Remove password warning from the file
 sed -i "/mysqldump: Error:/d" $file

bin/change-url.sh

@@ -6,4 +6,4 @@ FROM_URL=$1
 TO_URL=$2
 
 # Replace LIVE_URL using WP-CLI in wp container
-docker-compose exec wp sh -c "wp --allow-root search-replace "$FROM_URL" "$TO_URL" --skip-columns=guid"
+docker compose exec wp sh -c "wp --allow-root search-replace "$FROM_URL" "$TO_URL" --skip-columns=guid"

bin/restore-db.sh

@@ -19,4 +19,4 @@ if [[ $file == *.gz ]]; then
 fi
 
 # Restore database to db container
-docker-compose exec -T mysql sh -c "MYSQL_PWD=\$MYSQL_PASSWORD mysql -u \$MYSQL_USER \$MYSQL_DATABASE" < $file
+docker compose exec -T mysql sh -c "MYSQL_PWD=\$MYSQL_PASSWORD mysql -u \$MYSQL_USER \$MYSQL_DATABASE" < $file

docker-compose.yml compose.ymldocker-compose.yml renamed to compose.yml

@@ -13,28 +13,32 @@ services:
       - mysqld
       - --character-set-server=utf8mb4
       - --collation-server=utf8mb4_unicode_ci
+    container_name: mysql
     environment:
       MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-rootpass}
       MYSQL_USER:          ${MYSQL_USER}
       MYSQL_PASSWORD:      ${MYSQL_PASSWORD}
       MYSQL_DATABASE:      ${MYSQL_DATABASE}
     networks:
       - mysql-net
+    # # Mount port for dev tools
     # ports:
     #   - 3306:3306
     restart: unless-stopped
     volumes:
       - mysql-vol:/var/lib/mysql
+      # # For initial database
       # - ./initdb:/docker-entrypoint-initdb.d:ro
     healthcheck:
-      test: MYSQL_PWD=$$MYSQL_PASSWORD mysqladmin -h $$HOSTNAME -P 3306 -u $$MYSQL_USER --silent ping
+      test: ["CMD-SHELL", "MYSQL_PWD=$$MYSQL_ROOT_PASSWORD mysqladmin ping -h localhost -u root -s"]
       start_period: 15s
       interval: 3s
       timeout: 3s
       retries: 5
 
-  wp:
+  wordpress:
     image: wordpress_app
+    container_name: wordpress
     build:
       context: ./docker/wordpress
       dockerfile: Dockerfile
@@ -67,16 +71,19 @@ services:
 
   web:
     image: nginx:stable-alpine
+    container_name: web
     depends_on:
-      - wp
+      - wordpress
+    environment:
+      PHP_FPM_ENDPOINT: wordpress:9000
     networks:
       - proxy-net
     restart: unless-stopped
     ports:
       - 80:80
     volumes:
       - ./docker/nginx/default.conf:/etc/nginx/templates/default.conf.template:ro
-      - ./app:/var/www/html
+      - ./app:/var/www/html:ro
     healthcheck:
       test: ["CMD", "curl", "-fs", "-o", "/dev/null", "http://localhost:80/_health/nginx"]
       start_period: 15s

docker/nginx/default.conf

@@ -1,5 +1,5 @@
 upstream php-fpm {
-    server wp:9000;
+    server ${PHP_FPM_ENDPOINT};
 }
 
 server {