Merge pull request #170 from dxw/chore/update-docker-network

Chore/update docker network

.github/workflows/theme.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php-versions: ['7.4','8.2']
+        php-versions: ['8.2']
     steps:
       - uses: actions/checkout@v4.2.2
       - name: Setup PHP

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 volumes:
   mysql_data:
 
@@ -9,19 +7,6 @@ services:
     ports:
       - "1080:1080"
 
-  beanstalk:
-    image: schickling/beanstalkd
-    ports:
-      - "11300:11300"
-
-  beanstalkd_console:
-    image: agaveapi/beanstalkd-console
-    ports:
-      - "2080:80"
-    environment:
-      BEANSTALKD_HOST: beanstalk
-      BEANSTALKD_PORT: 11300
-
   mysql:
     image: mariadb:10
     ports:
@@ -33,13 +18,12 @@ services:
       MYSQL_ROOT_PASSWORD: foobar
 
   wordpress:
-    image: thedxw/wpc-wordpress
+    image: thedxw/wpc-wordpress:php8.2
     ports:
       - "80:80"
     links:
       - mysql
       - mailcatcher
-      - beanstalk
     volumes:
       - .:/usr/src/app
       - ./wp-content:/var/www/html/wp-content

script/bootstrap

@@ -4,22 +4,22 @@ set -e
 THEME_DIRECTORY="./wp-content/themes/theme"
 
 if ! type "docker" > /dev/null 2>&1; then
-  echo "\033[96mWarning:\033[0m Please install Docker: https://docs.docker.com/docker-for-mac/install/"
+  printf "\033[96mWarning:\033[0m Please install Docker: https://docs.docker.com/docker-for-mac/install/"
   exit 1
 fi
 
 if ! type "docker-compose" > /dev/null 2>&1; then
-  echo "\033[96mWarning:\033[0m Please install Docker Compose: https://docs.docker.com/docker-for-mac/install/"
+  printf "\033[96mWarning:\033[0m Please install Docker Compose: https://docs.docker.com/docker-for-mac/install/"
   exit 1
 fi
 
 if ! type "php" > /dev/null 2>&1; then
-  echo "\033[96mWarning:\033[0m Please install PHP, one method is 'brew install php'"
+  printf "\033[96mWarning:\033[0m Please install PHP, one method is 'brew install php'"
   exit 1
 fi
 
 if ! type "composer" > /dev/null 2>&1; then
-  echo "\033[96mWarning:\033[0m Please install Composer, 'brew install composer' or https://getcomposer.org/download/"
+  printf "\033[96mWarning:\033[0m Please install Composer, 'brew install composer' or https://getcomposer.org/download/"
   exit 1
 fi
 

setup/internal.sh

@@ -29,7 +29,7 @@ do
     # TODO: Uncomment for multisite
     #wp plugin activate "$plugin" --network
   else
-      echo "\033[96mWarning:\033[0m Plugin '$plugin' could not be found. Have you installed it?"
+    printf "\033[96mWarning:\033[0m Plugin '%s' could not be found. Have you installed it?" "$plugin"
   fi
 done
 
@@ -39,7 +39,7 @@ then
   #wp theme enable --network $theme
   wp theme activate $theme
 else
-  echo "\033[96mWarning:\033[0m Theme '$theme' could not be found. Have you installed it?"
+  printf "\033[96mWarning:\033[0m Theme '%s' could not be found. Have you installed it?" "$theme"
 fi
 
 import() {

wp-content/themes/theme/composer.json

@@ -13,7 +13,7 @@
     ],
     "config": {
       "platform": {
-        "php": "7.4"
+        "php": "8.2"
       }
     },
     "require-dev": {
@@ -32,7 +32,7 @@
         "post-update-cmd": "vendor/bin/phar-install"
     },
     "require": {
-        "php": "^7.2",
+        "php": "^8.2",
         "dxw/pagination": "^1.0",
         "dxw/iguana": "^1.0",
         "dxw/iguana-theme": "^1.0",