Merge pull request 'fix/default-theme-name' (#1) from fix/default-theme-name into main

Reviewed-on: #1

.gitignore

@@ -1,10 +1,33 @@
-.env
+# ignora tudo do WP
+/webroot/*
+
+# permite wp-content
+!/webroot/wp-content/
+
+# ignora tudo dentro de wp-content
+/webroot/wp-content/*
+
+# permite as pastas (mas não o conteúdo delas)
+!/webroot/wp-content/plugins/
+!/webroot/wp-content/themes/
+!/webroot/wp-content/mu-plugins/
+
+/webroot/wp-content/plugins/*
+/webroot/wp-content/themes/*
+/webroot/wp-content/mu-plugins/*
+
+# permite o .gitkeep para que a pasta vazia seja versionada
+!/webroot/wp-content/plugins/.gitkeep
+!/webroot/wp-content/themes/.gitkeep
+!/webroot/wp-content/mu-plugins/.gitkeep
+
+# se no futuro quiser versionar algo específico:
+# !/webroot/wp-content/themes/seu-tema/
+# !/webroot/wp-content/themes/seu-tema/**
+
+# regras gerais
 .DS_Store
-*.sublime-project
+.env
-*.sublime-workspace
+vendor
-app/themes
+node_modules
-!app/themes/*.theme
+docker-compose.override.yml
-!app/themes/*.theme.tgz
-app/plugins
-!app/themes/*.plugins
-!app/themes/*.plugins.tgz

README.md

@@ -1,3 +1,3 @@
 # wordpress-stack
 
-Setup baseado em containers servindo Wordpress via FastCGI (php-fpm) e nginx como webproxy.
+Site WP para Hackeamos.Org

composer.json

@@ -2,8 +2,17 @@
   "name": "hackeamos-org/wp-project",
   "type": "project",
   "require": {
-    "php": ">=8.1",
+    "php": ">=8.1"
-    "hackeamos.org/hms-theme": "^1.0"
+  },
+  "scripts": {
+      "post-install-cmd": [
+          "./scripts/composer-loop.sh ./webroot/wp-content/themes install",
+          "./scripts/composer-loop.sh ./webroot/wp-content/plugins install"
+      ],
+      "post-update-cmd": [
+          "./scripts/composer-loop.sh ./webroot/wp-content/themes update",
+          "./scripts/composer-loop.sh ./webroot/wp-content/plugins update"
+      ]
   },
   "repositories": [
     {
@@ -16,13 +25,13 @@
     }
   ],
   "extra": {
-    "wordpress-install-dir": "app",
+    "wordpress-install-dir": "webroot",
     "installer-paths": {
-      "app/plugins/{$name}/": [
+      "webroot/plugins/{$name}/": [
         "type:wordpress-plugin",
         "type:wpackagist-plugin"
       ],
-      "app/themes/{$name}/": [
+      "webroot/themes/{$name}/": [
         "type:wordpress-theme",
         "type:wpackagist-theme"
       ]
@@ -33,4 +42,4 @@
       "composer/installers": true
     }
   }
-}
+}

composer.lock

@@ -0,0 +1,20 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "096c338104c6d323cd61176fe27bfa51",
+    "packages": [],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": {},
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=8.1"
+    },
+    "platform-dev": {},
+    "plugin-api-version": "2.9.0"
+}

docker-compose.override-sample.yml

@@ -0,0 +1,15 @@
+#
+# uncoment volumes below to bind specif plugins and themes from other paths into your project
+# copy this file as 'docker-compose.override.yml' for autoloading with docker-compose.yml
+#
+services:
+
+  reverse-proxy:
+#    volumes:
+#      - ../repo/wp-content/themes/my-theme:/var/www/html/wp-content/themes/my-theme
+#      - ../repo/wp-content/plugins/my-plugin:/var/www/html/wp-content/plugins/my-plugin
+
+  app:
+#    volumes:
+#      - ../repo/wp-content/themes/my-theme:/var/www/html/wp-content/themes/my-theme
+#      - ../repo/wp-content/plugins/my-plugin:/var/www/html/wp-content/plugins/my-plugin

docker-compose.yml

@@ -1,16 +1,16 @@
-name: wordpress
+name: ${WPSTACK_PROJECT_NAME:-wpstack}
 
 services:
 
   reverse-proxy:
-    container_name: reverse-proxy
+    container_name: ${WPSTACK_PROJECT_NAME:-wpstack}-reverse-proxy
     image: hackeamos/httpd
     build:
       context: './docker/nginx'
     depends_on:
       - app
     volumes:
-      - webroot:/var/www/html
+      - ./webroot:/var/www/html
     environment:
       WORDPRESS_SITEURL:    ${WPSTACK_PROTOCOL}://${WPSTACK_DOMAIN}/${WPSTACK_URLPATH:-}
       WORDPRESS_SITE_TYPE:  ${WPSTACK_MULTISITE:-regular}
@@ -23,21 +23,19 @@ services:
       - proxy-network
 
   app:
-    container_name: app
+    container_name: ${WPSTACK_PROJECT_NAME:-wpstack}-app
     image: hackeamos/wp
     build:
       context: .
       dockerfile: ./docker/wordpress/Dockerfile
     volumes:
-      - webroot:/var/www/html
+      - ./webroot:/var/www/html
-      - ./app/themes:/var/www/html/wp-content/themes
-      - ./app/plugins:/var/www/html/wp-content/plugins
-      - ./app/mu-plugins:/var/www/html/wp-content/mu-plugins
     environment:
       WORDPRESS_DB_HOST:      db
       WORDPRESS_DB_USER:      ${DB_USER}
       WORDPRESS_DB_NAME:      ${DB_NAME}
       WORDPRESS_DB_PASSWORD:  ${DB_PASS}
+      WORDPRESS_TABLE_PREFIX: ${DB_PREFIX:-wp_}
       WORDPRESS_SITEURL:      ${WPSTACK_PROTOCOL}://${WPSTACK_DOMAIN}/${WPSTACK_URLPATH:-}
       WORDPRESS_BLOGNAME:     ${WPSTACK_BLOGNAME:-}
       WORDPRESS_ADMIN_USER:   ${WPSTACK_ADMIN_USER:-admin}
@@ -54,10 +52,11 @@ services:
       - proxy-network
 
   db:
-    container_name: db
+    container_name: ${WPSTACK_PROJECT_NAME:-wpstack}-db
     image: mariadb
     volumes:
       - db_data:/var/lib/mysql
+      - ../db:/docker-entrypoint-initdb.d
     environment:
       MARIADB_RANDOM_ROOT_PASSWORD: true
       MARIADB_USER: ${DB_USER}
@@ -68,7 +67,6 @@ services:
       - proxy-network
 
 volumes:
-  webroot:
   db_data:
 
 networks:

docker/wordpress/Dockerfile

@@ -6,7 +6,6 @@ FROM wordpress:${WP_VERSION}-php${PHP_VERSION}-fpm-alpine
 
 # clean core from default themes and plugins
 RUN rm -rf /usr/src/wordpress/wp-content/themes/* && rm -rf /usr/src/wordpress/wp-content/plugins/*
-COPY app/* /usr/src/wordpress
 
 # install system dependencies
 RUN apk add --no-cache msmtp mysql-client;
@@ -15,11 +14,13 @@ RUN curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli
     mv wp-cli.phar /usr/local/bin/wp
 
 # install composer dependencies
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
 COPY composer.json composer.lock ./
-RUN --mount=type=secret,id=GITEA_TOKEN \
+RUN composer install \
-    export TOKEN=$(cat /run/secrets/GITEA_TOKEN) && \
+    --no-dev \
-    composer config --global auth.http-basic.seu-gitea.com token $TOKEN && \
+    --no-interaction \
-    composer install --no-dev --optimize-autoloader
+    --optimize-autoloader \
+    --no-scripts
 
 # modify docker entrypoint for running any .sh scripts found under /usr/local/bin/docker-entrypoint.d
 # scripts will run as www-data if endedd with .unpriv.sh or as root elsewhere
@@ -42,4 +43,7 @@ exec "\$@";
 EOF
 COPY docker/wordpress/scripts/docker-entrypoint.d/* /docker-entrypoint.d/
 
-RUN chmod +x /docker-entrypoint.d/*.sh
+RUN chmod +x /docker-entrypoint.d/*.sh
+
+# cleanup
+RUN rm /usr/bin/composer

docker/wordpress/scripts/docker-entrypoint.d/10-install-wordpress-unpriv.sh

@@ -23,5 +23,5 @@ if which wp && ! wp core is-installed; then
 fi
 
 if test "$(wp theme list --format=count)" = "0"; then
-    wp theme install ${WORDPRESS_DEFAULT_THEME:-twentytwentysix} --force --activate;
+    wp theme install ${WORDPRESS_DEFAULT_THEME:-twentytwentyfive} --force --activate;
 fi

package.json

@@ -0,0 +1,24 @@
+{
+  "name": "hackeamos.org",
+  "version": "0.0.1",
+  "description": "Site WP para Hackeamos.Org",
+  "keywords": [
+    "hackeamos.org",
+    "wordpress"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git@git.hackeamos.org:Hackeamos.Org/hms-wordpress.git"
+  },
+  "workspaces": [
+    "webroot/wp-content/themes/hms-themes",
+    "webroot/wp-content/plugins/plotar"
+  ],
+  "license": "GPL-3.0-or-later",
+  "author": "Hackeamos.Org",
+  "scripts": {
+    "build": "npm run build --workspaces --if-present",
+    "start": "npm run start --workspaces --if-present; npm run watch --workspaces --if-present",
+    "watch": "npm run start --workspaces --if-present; npm run watch --workspaces --if-present"
+  }
+}

sample.env

@@ -2,10 +2,12 @@ DB_HOST=db
 DB_USER=wordpress
 DB_NAME=wordpress
 DB_PASS=mysecretpassword
+WPSTACK_PROJECT_NAME=wpstack-example # rename your project
 WPSTACK_ADMIN_EMAIL=contato@example.com # use a valid email
 WPSTACK_PROTOCOL=https
 WPSTACK_DOMAIN=localhost
 WPSTACK_BLOGNAME=My WP Site
+WPSTACK_BLOGDESCRIPTION=My Wordpress Site by WP-Stack
 SMTP_HOST=mailpit
 SMTP_PORT=1025
 SMTP_AUTH=off

scripts/composer-loop.sh

@@ -0,0 +1,19 @@
+#! /bin/sh
+base_path="${1}";
+command="${2}";
+
+for item in $base_path/*; do
+   if test ! -d $item; then
+      #echo "\"${item}\" is not a directory";
+      continue;
+   fi
+
+   if test ! -f "${item}/composer.json"; then
+      #echo "\"${item}\" is not a composer package";
+      continue;
+   fi
+
+   cd ${item};
+   composer ${command};
+   cd -;
+done