From f3bcbbd6ba8b904fe6d5b6bf7cda60d9d2f18b50 Mon Sep 17 00:00:00 2001 From: SurDaft - Jack Stupple Date: Sun, 6 Feb 2022 00:57:23 +0000 Subject: [PATCH 1/5] Rename stat (since 1.17) --- minecraft_exporter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft_exporter.py b/minecraft_exporter.py index c768ea0..5459c00 100644 --- a/minecraft_exporter.py +++ b/minecraft_exporter.py @@ -271,7 +271,7 @@ class MinecraftCollector(object): damage_taken.add_sample('damage_taken',value=value,labels={'player':name}) elif stat == "minecraft:damage_dealt": damage_dealt.add_sample('damage_dealt',value=value,labels={'player':name}) - elif stat == "minecraft:play_one_minute": + elif stat == "minecraft:play_time": player_playtime.add_sample('player_playtime',value=value,labels={'player':name}) elif stat == "minecraft:walk_one_cm": cm_traveled.add_sample("cm_traveled",value=value,labels={'player':name,'method':"walking"}) From 55acfc182dd80d6e3ea5f9392aad4c948652687b Mon Sep 17 00:00:00 2001 From: SurDaft - Jack Stupple Date: Sun, 20 Feb 2022 13:40:59 +0000 Subject: [PATCH 2/5] Create docker-image.yml --- .github/workflows/docker-image.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 0000000..077ed68 --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,26 @@ +name: Docker Image CI + +on: + workflow_dispatch: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - name: Publish Docker Image + # You may pin to the exact commit or the version. + # uses: elgohr/Publish-Docker-Github-Action@191af57e15535d28b83589e3b5f0c31e76aa8733 + uses: elgohr/Publish-Docker-Github-Action@3.04 + with: + # The name of the image you would like to push + name: surdaft/minecraft-exporter + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + registry: ghcr.io From c56894ca12ca9e769626785dc69f885cab165328 Mon Sep 17 00:00:00 2001 From: Jack Stupple Date: Mon, 21 Feb 2022 08:06:39 +0000 Subject: [PATCH 3/5] Ignore test world --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1c1bada --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +# for testing +world From dc6be5857b4664baafae0ed92ab8f3fac01c6a7a Mon Sep 17 00:00:00 2001 From: Jack Stupple Date: Mon, 21 Feb 2022 08:08:34 +0000 Subject: [PATCH 4/5] Ensure docker file uses context of the current source application --- docker-compose.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index cb439b4..a7b1c74 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,7 +1,8 @@ version: '3.1' services: minecraft-exporter: - image: 'joshi425/minecraft_exporter' + build: + context: . environment: RCON_HOST: RCON_PORT: @@ -9,4 +10,4 @@ services: ports: - 9700:8000 volumes: - - /path/to/minecraft/world:/world:ro + - ./world:/world:ro From a8f5554608f82abeef4a4b126c8eade9bdb2191e Mon Sep 17 00:00:00 2001 From: Jack Stupple Date: Mon, 21 Feb 2022 08:11:40 +0000 Subject: [PATCH 5/5] Add examples checkout master uses --- .github/workflows/docker-image.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 077ed68..01c9646 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -14,6 +14,7 @@ jobs: runs-on: ubuntu-latest steps: + - uses: actions/checkout@master - name: Publish Docker Image # You may pin to the exact commit or the version. # uses: elgohr/Publish-Docker-Github-Action@191af57e15535d28b83589e3b5f0c31e76aa8733