Merge remote-tracking branch 'origin/base'

.devcontainer/devcontainer.json

@@ -1,3 +1,14 @@
 {
-  "image": "ghcr.io/bigbrotherteam/bigbrother/php"
+  "dockerComposeFile": "../docker-compose.yml",
+  "workspaceFolder": "/usr/local/src/BigBrother",
+  "service": "vscode",
+  "shutdownAction": "stopCompose",
+  "postCreateCommand": "apt-get -y install docker docker-compose",
+  "settings": {
+    "terminal.integrated.shell.linux": "/bin/bash"
+  },
+  "extensions": [
+    "editorconfig.editorconfig",
+    "felixfbecker.php-intellisense"
+  ]
 }

.github/workflows/build.yml

@@ -4,7 +4,7 @@ jobs:
   docker:
     name: build docker image
     runs-on: ubuntu-latest
-    if: ${{ github.repository_owner == 'BigBrotherTeam' }}
+    if: ${{ github.repository_owner == 'BigBrotherTeam' && github.ref == 'refs/head/base' }}
     strategy:
       matrix:
         php:
@@ -66,7 +66,7 @@ jobs:
 
       - name: upload artifact
         uses: actions/upload-artifact@v2
-        if: ${{ matrix.php == '7.4.13' }}
+        if: ${{ matrix.php == '7.4.13' && github.ref != 'refs/heads/base' }}
         with:
           name: BigBrother.phar
           path: build/BigBrother.phar

.gitignore

@@ -1,4 +1,9 @@
 
+data/
+plugins/
+
 build/
 vendor/
 resources/revision
+
+composer.lock

.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+  "files.exclude": {
+    ".git": true,
+    "data": true,
+    "plugins": true,
+    "build": true,
+    "vendor": true
+  }
+}

.vscode/tasks.json

@@ -4,7 +4,7 @@
     {
       "label": "build",
       "type": "shell",
-      "command": "composer build",
+      "command": "composer build && cp -f build/BigBrother.phar plugins/BigBrother.phar && docker-compose restart pmmp",
       "group": {
         "kind": "build",
         "isDefault": true

Dockerfile

@@ -1,11 +1,10 @@
 FROM php:7-zts
 
 RUN apt update
-RUN apt-get install -y git curl libyaml-dev libzip-dev
+RUN apt-get install -y git curl unzip libyaml-dev
 
 RUN docker-php-ext-install sockets
 RUN docker-php-ext-install bcmath
-RUN docker-php-ext-install zip
 
 RUN pecl install channel://pecl.php.net/yaml-2.0.4
 RUN docker-php-ext-enable yaml

docker-compose.yml

@@ -0,0 +1,20 @@
+version: '3'
+services:
+  vscode:
+    image: ghcr.io/bigbrotherteam/bigbrother/php
+    command: sleep infinity
+    working_dir: /usr/local/src/BigBrother
+    volumes:
+      - .:/usr/local/src/BigBrother
+      - /var/run/docker.sock:/var/run/docker.sock
+
+  pmmp:
+    image: pmmp/pocketmine-mp
+    user: root
+    volumes:
+      - ./data:/data
+      - ./plugins:/plugins
+    ports:
+      - 19132:19132/tcp
+      - 19132:19132/udp
+      - 25565:25565/tcp