Compare commits
8 Commits
renovate/c
...
f9a9a37e1a
| Author | SHA1 | Date | |
|---|---|---|---|
| f9a9a37e1a | |||
| 0fbea0cb4e | |||
| 2992ad84da | |||
| f9c7c90d44 | |||
| cc0c0f2368 | |||
| 1d4dd08fc6 | |||
| 0d03516d04 | |||
| 4bce544d98 |
4
.babelrc
4
.babelrc
@ -1,5 +1,3 @@
|
||||
{
|
||||
"plugins": [
|
||||
"@babel/plugin-proposal-class-properties"
|
||||
]
|
||||
"plugins": ["@babel/plugin-proposal-class-properties"]
|
||||
}
|
||||
|
||||
@ -1,19 +1,3 @@
|
||||
{
|
||||
"env": {
|
||||
"browser": true,
|
||||
"es6": true
|
||||
},
|
||||
"extends": [
|
||||
"standard"
|
||||
],
|
||||
"globals": {
|
||||
"Atomics": "readonly",
|
||||
"SharedArrayBuffer": "readonly"
|
||||
},
|
||||
"parserOptions": {
|
||||
"ecmaVersion": 2018
|
||||
},
|
||||
"rules": {
|
||||
},
|
||||
"parser": "babel-eslint"
|
||||
}
|
||||
|
||||
43
.gitea/workflows/publish.yml
Normal file
43
.gitea/workflows/publish.yml
Normal file
@ -0,0 +1,43 @@
|
||||
name: Publish Docker Image
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- "main"
|
||||
|
||||
jobs:
|
||||
docker:
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Restore Docker Cache
|
||||
uses: actions/cache@v3
|
||||
id: docker-cache
|
||||
with:
|
||||
path: /usr/bin/docker
|
||||
key: ${{ runner.os }}-docker
|
||||
|
||||
- name: Install Docker (if not cached)
|
||||
if: steps.docker-cache.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
wget -q -O /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz \
|
||||
&& tar --extract --file /tmp/docker.tgz --directory /usr/bin --strip-components 1 --no-same-owner docker/docker \
|
||||
&& rm -rf /tmp/* &&
|
||||
echo "Done"
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v2
|
||||
|
||||
- name: Login to Repo
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
username: ${{ secrets.REPO_USERNAME }}
|
||||
password: ${{ secrets.REPO_TOKEN }}
|
||||
|
||||
- name: Build and Push
|
||||
uses: docker/build-push-action@v4
|
||||
with:
|
||||
push: true
|
||||
tags: fascinated/minetrack:latest
|
||||
@ -51,7 +51,7 @@ Minetrack can be built and run with Docker from this repository in several ways:
|
||||
|
||||
### Build and deploy directly with Docker
|
||||
|
||||
```
|
||||
```bash
|
||||
# build image with name minetrack and tag latest
|
||||
docker build . --tag minetrack:latest
|
||||
|
||||
@ -67,7 +67,7 @@ The published port can be changed by modifying the parameter argument, e.g.:
|
||||
|
||||
### Build and deploy with docker-compose
|
||||
|
||||
```
|
||||
```bash
|
||||
# build and start service
|
||||
docker-compose up --build
|
||||
|
||||
@ -79,7 +79,7 @@ docker-compose down
|
||||
|
||||
The following configuration enables Nginx to act as reverse proxy for a Minetrack instance that is available at port 8080 on localhost:
|
||||
|
||||
```
|
||||
```nginx
|
||||
server {
|
||||
server_name minetrack.example.net;
|
||||
listen 80;
|
||||
|
||||
@ -2,8 +2,18 @@
|
||||
|
||||
<html>
|
||||
<head>
|
||||
<link rel="stylesheet" href="../css/main.css" />
|
||||
<title>Minetrack</title>
|
||||
<meta charset="UTF-8" />
|
||||
|
||||
<!-- Discord Embed -->
|
||||
<meta content="Minetrack" property="og:title" />
|
||||
<meta
|
||||
content="Tracking minecraft servers since 2023"
|
||||
property="og:description"
|
||||
/>
|
||||
<meta content="https://mc.fascinated.cc/" property="og:url" />
|
||||
|
||||
<link rel="stylesheet" href="../css/main.css" />
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@300;700&display=swap"
|
||||
@ -11,11 +21,7 @@
|
||||
|
||||
<link rel="icon" type="image/svg+xml" href="../images/logo.svg" />
|
||||
|
||||
<meta charset="UTF-8" />
|
||||
|
||||
<script defer type="module" src="../js/main.js"></script>
|
||||
|
||||
<title>Minetrack</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
},
|
||||
"rates": {
|
||||
"pingAll": 15000,
|
||||
"connectTimeout": 2500
|
||||
"connectTimeout": 10000
|
||||
},
|
||||
"oldPingsCleanup": {
|
||||
"enabled": false,
|
||||
|
||||
@ -2,7 +2,9 @@ version: "3"
|
||||
|
||||
services:
|
||||
minetrack:
|
||||
build: https://git.fascinated.cc/Fascinated/Minetrack.git
|
||||
image: fascinated/minetrack:latest
|
||||
# or
|
||||
# build: https://git.fascinated.cc/Fascinated/Minetrack.git
|
||||
container_name: minetrack
|
||||
dns:
|
||||
- 8.8.8.8
|
||||
|
||||
@ -239,7 +239,6 @@ class Database {
|
||||
|
||||
// Record not found
|
||||
if (data[0] === undefined) {
|
||||
// eslint-disable-next-line node/no-callback-literal
|
||||
callback(false);
|
||||
return;
|
||||
}
|
||||
@ -248,7 +247,6 @@ class Database {
|
||||
const timestamp = data[0].timestamp;
|
||||
|
||||
// Allow null player counts and timestamps, the frontend will safely handle them
|
||||
// eslint-disable-next-line node/no-callback-literal
|
||||
callback(true, playerCount, timestamp);
|
||||
}
|
||||
);
|
||||
@ -272,10 +270,8 @@ class Database {
|
||||
// Allow null timestamps, the frontend will safely handle them
|
||||
// This allows insertion of free standing records without a known timestamp
|
||||
if (playerCount !== null) {
|
||||
// eslint-disable-next-line node/no-callback-literal
|
||||
callback(true, playerCount, timestamp);
|
||||
} else {
|
||||
// eslint-disable-next-line node/no-callback-literal
|
||||
callback(false);
|
||||
}
|
||||
}
|
||||
|
||||
@ -106,6 +106,7 @@ class PingController {
|
||||
|
||||
schedule() {
|
||||
setInterval(this.pingAll, config.rates.pingAll);
|
||||
// todo: make this a cron job?
|
||||
|
||||
this.pingAll();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user