Compare revisions

renovate · lucha · renovate · lucha · renovate · lucha
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
+FROM composer:1.10.1
+
+ARG uid=1000
+ARG gid=1000
+
+RUN addgroup -g ${gid} dev \
+ && adduser -h /home/dev -D -G dev -u ${uid} dev
+
+USER dev
+
+ENTRYPOINT ["/bin/bash"]
+
+# vim:set syntax=dockerfile:
--- a/README.md
+++ b/README.md
@@ -119,3 +119,26 @@ In altre parole, se ne teniamo una copia in locale per comodità, questa verrà

 Questo due tipi di plugin sono un po' buffi: i mu-plugins sono distribuiti come i plugin normali, e purtroppo
 il repository ```wpackagist``` categorizza tutti come ```wordpress-plugin```. Bisogna quindi elencarli manualmente nell'elenco dei ```drop-in``` (vedi il file ```composer.json```). Simile la situazione dei plugin dropin, tipo ```hyperdb``` e ```r2db```, dove dobbiamo specificare a mano cosa fa messo dove.b```. 
+
+## Creare un container di sviluppo
+
+Si può creare un container per lo sviluppo in locale con docker
+
+```bash
+docker build \
+    --build-arg=uid=$(id -u) \
+    --build-arg=gid=$(id -g) \
+    -f Dockerfile.dev \
+    -t registry.git.autistici.org/noblogs/noblogs-composer-dev \
+    .
+```
+
+Per lo sviluppo poi
+
+```
+docker run \
+    --rm \
+    -v $PWD:$PWD \
+    -w $PWD \
+    -ti registry.git.autistici.org/noblogs/noblogs-composer-dev:latest 
+```
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,9 @@
        }
    ],
    "config": {
-         "gitlab-domains": ["git.autistici.org"]
+        "gitlab-domains": [
+            "git.autistici.org"
+        ]
    },
    "require": {
        "php": ">=7.1",
@@ -33,9 +35,9 @@
        "oomphinc/composer-installers-extender": "2.0.0",
        "cweagans/composer-patches": "1.7.1",
        "koodimonni/composer-dropin-installer": "1.3",
-        "johnpbloch/wordpress": "5.8.0",
+        "johnpbloch/wordpress": "5.8.1",
        "bjornjohansen/wplang": "0.1.1",
-        "wpackagist-plugin/disable-wordpress-updates": "1.6.7",
+        "wpackagist-plugin/disable-wordpress-updates": "1.6.8",
        "wpackagist-plugin/more-privacy-options": "4.6",
        "wpackagist-plugin/disable-emojis": "1.7.3",
        "wpackagist-plugin/wp-super-cache": "1.7.4",
@@ -81,11 +83,12 @@
        "npm-asset/scriptaculous-js": "1.9.0",
        "npm-asset/prototype-js-core": "1.7.3",
        "noblogs/r2db": "0.1.7",
+        "noblogs/ai-global-activity-plugin": "0.0.11",
        "noblogs/ai-buddypress-plugin": "0.1.1",
-        "noblogs/ai-mu-plugins": "0.3.0",
+        "noblogs/ai-mu-plugins": "0.3.1",
        "noblogs/noblogs-wp-ssl": "0.1.0",
        "noblogs/remove-gravatar": "0.1.1",
-        "noblogs/themes-child": "0.1.1",
+        "noblogs/themes-child": "0.2.0",
        "wpackagist-plugin/autopost-to-mastodon": "3.6.1",
        "wpackagist-plugin/bogo": "3.5.3",
        "wpackagist-plugin/classic-editor": "1.6.2",
@@ -100,15 +103,15 @@
        "wpackagist-plugin/rss-license": "0.1",
        "wpackagist-plugin/simply-exclude": "2.0.6.6",
        "wpackagist-plugin/soundcloud-shortcode": "3.0.2",
-        "wpackagist-plugin/squat-radar-calendar-integration": "2.0.7",
-        "wpackagist-plugin/two-factor": "0.7.0",
+        "wpackagist-plugin/squat-radar-calendar-integration": "2.0.8",
+        "wpackagist-plugin/two-factor": "0.7.1",
        "wpackagist-plugin/video-sidebar-widgets": "6.1",
        "wpackagist-plugin/wordpress-importer": "0.7",
        "wpackagist-plugin/wp-recaptcha-bp": "4.1",
        "wpackagist-plugin/wp2pgpmail": "1.28",
-        "wpackagist-plugin/buddypress": "7.3.0",
+        "wpackagist-plugin/buddypress": "9.1.1",
        "noblogs/noblogs-home": "0.1.4",
-        "wpackagist-plugin/katex": "2.2.1",
+        "wpackagist-plugin/katex": "2.2.2",
        "noblogs/eu-compliance": "0.1.0",
        "noblogs/nospam": "0.2.2",
        "noblogs/themes-misc": "0.1.2",
@@ -116,23 +119,60 @@
        "wpackagist-plugin/creative-commons": "^2021.04",
        "wpackagist-plugin/disable-remove-google-fonts": "1.3.1",
        "wpackagist-plugin/footnotes": "2.7.3",
-        "wpackagist-plugin/wpuntexturize": "2.2"
+        "wpackagist-plugin/wpuntexturize": "2.2",
+        "wpackagist-theme/spearhead": "^1.2",
+        "wpackagist-theme/blank-canvas": "^1.2",
+        "wpackagist-theme/seedlet": "^1.1"
    },    
    "extra": {
        "wordpress-install-dir": "app",
-	"installer-types": ["bower-asset", "npm-asset"],
+        "installer-types": [
+            "bower-asset",
+            "npm-asset"
+        ],
        "installer-paths": {
            "app/wp-content/db-plugins/{$name}/": [
                "stuttter/ludicrousdb"
            ],
-            "app/{$name}": ["type:wordpress-dropin"],
-	    "app/wp-content/mu-plugins/{$name}/": ["type:wordpress-muplugin"],
-            "app/wp-content/plugins/{$name}/": ["type:wordpress-plugin"],
-            "app/wp-content/themes/{$name}/": ["type:wordpress-theme"],
-	    "app/wp-includes/js/{$name}/": ["type:npm-asset", "type:bower-asset"]
+            "app/{$name}": [
+                "type:wordpress-dropin"
+            ],
+            "app/wp-content/mu-plugins/{$name}/": [
+                "type:wordpress-muplugin"
+            ],
+            "app/wp-content/plugins/{$name}/": [
+                "type:wordpress-plugin"
+            ],
+            "app/wp-content/themes/{$name}/": [
+                "type:wordpress-theme"
+            ],
+            "app/wp-includes/js/{$name}/": [
+                "type:npm-asset",
+                "type:bower-asset"
+            ]
        },
        "wordpress-language-dir": "app/wp-content/languages/",
-        "wordpress-languages": ["ar", "ca","cy","da_DK","de_DE","el", "en_GB", "es_ES","fi","fr_FR", "it_IT","ja", "nl_NL", "nn_NO","pt_PT","ru_RU","sk_SK", "sv_SE", "ro_RO"],
+        "wordpress-languages": [
+            "ar",
+            "ca",
+            "cy",
+            "da_DK",
+            "de_DE",
+            "el",
+            "en_GB",
+            "es_ES",
+            "fi",
+            "fr_FR",
+            "it_IT",
+            "ja",
+            "nl_NL",
+            "nn_NO",
+            "pt_PT",
+            "ru_RU",
+            "sk_SK",
+            "sv_SE",
+            "ro_RO"
+        ],
        "patches-file": "composer.patches.json",
        "composer-exit-on-patch-failure": true,
        "dropin-paths": {
@@ -147,9 +187,13 @@
                "package:noblogs/themes-child",
                "package:noblogs/themes-misc"
            ],
-            "app/wp-content": ["package:stuttter/ludicrousdb:ludicrousdb/drop-ins/db.php,ludicrousdb/drop-ins/db-error.php",
-				       "package:wpackagist-plugin/wp-super-cache:advanced-cache.php"],
-            "app": ["package:noblogs/r2db:db-config.php,nginx-map/wp-nginx-map-json.php,nginx-map/wp-nginx-map.php"]
+            "app/wp-content": [
+                "package:stuttter/ludicrousdb:ludicrousdb/drop-ins/db.php,ludicrousdb/drop-ins/db-error.php",
+                "package:wpackagist-plugin/wp-super-cache:advanced-cache.php"
+            ],
+            "app": [
+                "package:noblogs/r2db:db-config.php,nginx-map/wp-nginx-map-json.php,nginx-map/wp-nginx-map.php"
+            ]
        }
    }
 }
--- a/composer.lock
+++ b/composer.lock
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -130,6 +130,5 @@
        "wpackagist-theme/thematic": {
            "Footer credits": "patches/themes/0223-thematic-footer.patch"
        }
-	
    }
 }
No results found