108 Commits

Author SHA1 Message Date
ducoterra
2f767593ef Add make-push command
Add command to update the subtree from a child repo. This pushes to the
main branch of the common repo with only the relevant commits.
2021-11-01 09:20:11 -04:00
ducoterra
66b4fdb902 Ignore subtree pull failures
Rather than potentially leaving the developer in a state where `git
stash pop` wasn't run, ignore failures in git subtree and let the
developer fix issues and re-run the command. This makes `make-update`
more idempotent.
2021-11-01 09:13:15 -04:00
ducoterra
da69418b0d Switch to url-based subtree with make-update
Add new `make-update` make command to update the .gitlab subtree.
2021-10-31 22:56:47 -04:00
ducoterra
ba12c923ba Remove docker-run
Docker-run was only useful in very specific projects. Projects should
either define their own "run" in their Makefile, add a
docker-compose.yaml, or specify instructions in the README.
2021-10-31 20:59:29 -04:00
ducoterra
74a4a4e77f Transition to .gitlab prefix
Expect repo to be subtree'd as ".gitlab"
2021-10-31 20:33:47 -04:00
ducoterra
3e8ca71358 Add chart-release to truenas.makefile
Add chart-release to add a subtree chart to the charts releases in the
charts repo.
2021-10-31 20:22:20 -04:00
ducoterra
4146777f85 Add helm.makefile
Add helm.makefile with a helm-release command to make a helm release.
2021-10-31 20:21:08 -04:00
ducoterra
8a52a21a39 Switch to multi-makefile strategy
Instead of putting everything in one makefile switch to a folder called
"make" with multiple makefiles. Move the original makefile to
"docker.makefile" and add kaniko and truenas to fill in later.
2021-10-31 15:03:59 -04:00
Reese
0d2235b6a3 Merge branch 'common-makefile' into 'master'
Allow custom server versions

See merge request services/minecraft_vanilla!1
2021-10-31 03:05:14 +00:00
Reese
dbe0d47f99 Merge branch 'master' into 'common-makefile'
# Conflicts:
#   helm/questions.yaml
2021-10-31 03:05:11 +00:00
ducoterra
c7c547c80f Switch to common Makefile
Rather than writing our own Makefile use the common one.
2021-10-30 22:46:34 -04:00
ducoterra
a403f6f068 Merge commit '32cd04c7ec7aacf8e3a402e3aed310a6ea94b586' as '.common' 2021-10-30 22:43:08 -04:00
ducoterra
32cd04c7ec Squashed '.common/' content from commit f187522
git-subtree-dir: .common
git-subtree-split: f18752299d
2021-10-30 22:43:08 -04:00
ducoterra
8d190e478f Add minecraft logo
Add minecraft logo for use by nextcloud.
2021-10-30 22:32:59 -04:00
ducoterra
ba5ab53bdb Allow custom server versions
Allow user to specify server version. Download on server init.
2021-10-30 22:32:52 -04:00
ducoterra
f18752299d init 2021-10-30 22:28:20 -04:00
ducoterra
a820e9a297 Allow custom server versions
Allow user to specify server version. Download on server init.
2021-10-30 21:14:00 -04:00
ducoterra
9e788ee711 Add IMAGE and VERSION files
Makefile requires IMAGE and VERSION files available to build and push.
2021-10-30 21:02:40 -04:00
ducoterra
d3b0f86f40 Switch to openjdk-latest and don't copy server.jar
No longer copying server.jar since we expected it to exist already.
Build using the latest version of openjdk.
2021-10-30 21:02:01 -04:00
ducoterra
2f7d4c7f83 Add Makefile
Add Makefile with build, run, and push commands.
2021-10-30 21:01:43 -04:00
ducoterra
aa253e6688 Remove server.jar and docker-compose.yaml
Remove unused files.
2021-10-30 21:01:22 -04:00
ducoterra
773c1d6020 Move install-specific values to a values folder
To keep things tidy all the various values files have been moved to a
directory named "values".
2021-10-30 20:59:10 -04:00
ducoterra
dae5a097e9 Fix RAM issue with deploy
A deploy was running the same max ram for both the pod and the java
app. This led to issues where the java app would use its max ram and the
pod would think it was out of memory. It would kill the pod and the
minecraft server with it, often not saving the last few minutes of
progress.

Now the deploy runs 1GiB extra ram than the java app.
2021-09-11 14:08:38 -04:00
ducoterra
44053abdf8 truenas compatibility update 2021-08-29 15:24:11 -04:00
ducoterra
807b1866a8 set memory requirements to avoid sudden container death 2021-02-20 12:16:05 -05:00
ducoterra
99666bab94 add setenv 2021-02-05 21:47:13 -05:00
ducoterra
1b6b8bb281 update RAM for new cluster 2021-02-05 21:42:48 -05:00
ducoterra
95c7fa79f3 merge templates 2020-11-27 15:30:43 -05:00
ducoterra
7e0ff9e416 upgrade to 1.6.4 2020-11-21 15:29:21 -05:00
ducoterra
12fa8ecdbe remove extra opts and remove threading 2020-07-19 17:14:58 -04:00
ducoterra
7d34b3a36c add charts for each server 2020-07-17 13:48:19 -04:00
ducoterra
95b0bd6852 switch to configmap model 2020-07-11 17:50:43 -04:00
ducoterra
ff2c9affb5 servers to nvme 2020-07-10 12:15:55 -04:00
ducoterra
1dfb1f6202 nvme for minecraft 2020-06-28 18:05:52 -04:00
ducoterra
3faf5c9d95 don't auto deploy 2020-06-26 23:49:19 -04:00
ducoterra
072bee6e27 update to 1.16.1 2020-06-26 23:36:39 -04:00
ducoterra
e6a042948b fix port issue 2020-06-15 21:43:34 -04:00
ducoterra
7df518d7db set image 2020-05-16 17:40:04 -04:00
ducoterra
ca4d1eeb45 use tag in deploy 2020-05-16 12:47:04 -04:00
ducoterra
1ccc5cda35 fix tags 2020-05-16 12:43:30 -04:00
ducoterra
3ce71a6682 add gitlab ci 2020-05-16 12:19:36 -04:00
ducoterra
151867fd49 switch back to minecraft 1.15.2 2020-05-10 17:16:01 -04:00
ducoterra
abc90be8e4 add images 2020-03-25 17:18:21 -04:00
ducoterra
b727538912 upgrade to 20w12a 2020-03-20 18:05:42 -04:00
ducoterra
17b05945aa upgrade to 20w12a 2020-03-20 18:05:36 -04:00
ducoterra
9929e5d2b4 upgrade to 20w12a 2020-03-20 18:05:29 -04:00
ducoterra
00386c7834 just copy files to mc_data 2020-03-20 18:05:19 -04:00
ducoterra
0c75d914c1 switch to ducoterra namespace 2020-03-15 12:23:57 -04:00
ducoterra
8bdae44e23 add README for backups 2020-02-05 14:53:22 -05:00
ducoterra
6264d75f96 set namespace to minecraft 2020-01-18 11:15:00 -05:00