summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew <pugmatt@gmail.com>2021-02-08 12:16:44 -0500
committerGitHub <noreply@github.com>2021-02-08 12:16:44 -0500
commit1562db83878457f6d3f6e203994f3b86f6fb3821 (patch)
tree45810f78ff2fc989b3432466782b003202e98c23
parentd11f1d825bc9338687d5b84499151bbb4b2cbd0e (diff)
parent9affb53921e351ad25c877d48d09755be972547a (diff)
downloadBedrockConnect-1562db83878457f6d3f6e203994f3b86f6fb3821.tar.gz
BedrockConnect-1562db83878457f6d3f6e203994f3b86f6fb3821.tar.bz2
BedrockConnect-1562db83878457f6d3f6e203994f3b86f6fb3821.zip
Merge pull request #157 from SeniorHeld/patch-1
using openjdk:11
-rw-r--r--docker/Dockerfile10
-rw-r--r--docker/README.md10
-rw-r--r--docker/custom-servers/Dockerfile6
-rw-r--r--docker/custom-servers/README.md5
-rw-r--r--docker/custom-servers/custom_servers.json14
-rw-r--r--docker/custom-servers/docker-compose.yml9
-rw-r--r--docker/docker-compose.yml6
7 files changed, 54 insertions, 6 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f01c64b..ca8157d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
-FROM hypriot/rpi-java
-RUN mkdir /brc
-COPY BedrockConnect-1.0-SNAPSHOT.jar /brc
-WORKDIR /brc
+FROM openjdk:11
+RUN mkdir -p /docker/brc
+ADD https://github.com/Pugmatt/BedrockConnect/releases/latest/download/BedrockConnect-1.0-SNAPSHOT.jar /docker/brc
+WORKDIR /docker/brc
EXPOSE 19132/udp
-CMD ["java", "-Xms1G", "-Xmx1G", "-jar", "BedrockConnect-1.0-SNAPSHOT.jar", "nodb=true"]
+CMD ["java", "-Xms256M", "-Xmx256M", "-jar", "BedrockConnect-1.0-SNAPSHOT.jar", "nodb=true"]
diff --git a/docker/README.md b/docker/README.md
index 0bacf58..a95f227 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,5 +1,13 @@
-# BedrockConnect on Docker on Raspberry Pi
+# BedrockConnect on Docker
+- Install `docker` and `docker-compose`
+- Simply run `docker-compose up -d`
+
+##For custom server config
+[README](custom-servers/README.md)
+
+
+### OUTDATED
- Put the `Dockerfile` and the `BedrockConnect-1.0-SNAPSHOT.jar` in one directory
- Configure the `CMD` line in the `Dockerfile` to fit your needs
- run `docker build -t bedrock-connect .`
diff --git a/docker/custom-servers/Dockerfile b/docker/custom-servers/Dockerfile
new file mode 100644
index 0000000..eea6a5f
--- /dev/null
+++ b/docker/custom-servers/Dockerfile
@@ -0,0 +1,6 @@
+FROM openjdk:11
+RUN mkdir -p /app
+ADD https://github.com/Pugmatt/BedrockConnect/releases/latest/download/BedrockConnect-1.0-SNAPSHOT.jar /app
+WORKDIR /app
+EXPOSE 19132/udp
+CMD ["java", "-Xms512M", "-Xmx512M", "-jar", "BedrockConnect-1.0-SNAPSHOT.jar", "nodb=true", "custom_servers=/app/custom_servers.json"]
diff --git a/docker/custom-servers/README.md b/docker/custom-servers/README.md
new file mode 100644
index 0000000..8e976fc
--- /dev/null
+++ b/docker/custom-servers/README.md
@@ -0,0 +1,5 @@
+# BedrockConnect on Docker
+
+- Install `docker` and `docker-compose`
+- Edit `custom_servers.json` to fit your needs
+- Run `docker-compose up -d` \ No newline at end of file
diff --git a/docker/custom-servers/custom_servers.json b/docker/custom-servers/custom_servers.json
new file mode 100644
index 0000000..67699e9
--- /dev/null
+++ b/docker/custom-servers/custom_servers.json
@@ -0,0 +1,14 @@
+[
+ {
+ "name": "My Custom Server 1",
+ "iconUrl": "https://i.imgur.com/3BmFZRE.png",
+ "address": "mc1.example.com",
+ "port": 19132
+ },
+ {
+ "name": "My Custom Server 2",
+ "iconUrl": "https://i.imgur.com/3BmFZRE.png",
+ "address": "mc2.example.com",
+ "port": 19132
+ }
+] \ No newline at end of file
diff --git a/docker/custom-servers/docker-compose.yml b/docker/custom-servers/docker-compose.yml
new file mode 100644
index 0000000..fa09c9a
--- /dev/null
+++ b/docker/custom-servers/docker-compose.yml
@@ -0,0 +1,9 @@
+version: "2"
+services:
+ app:
+ build: .
+ restart: always
+ ports:
+ - "19132:19132/udp"
+ volumes:
+ - ./custom_servers.json:/app/custom_servers.json
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
new file mode 100644
index 0000000..0ff6c5f
--- /dev/null
+++ b/docker/docker-compose.yml
@@ -0,0 +1,6 @@
+version: "2"
+services:
+ app:
+ build: .
+ ports:
+ - "19132:19132/udp"