ducoterra
d9024f0847
Add warning to make-update and make-push
...
Add warning before make-update and make-push to alert developers that
running the commands might be destructive. Allow cancelling the command
up to 3 seconds before continuing. Also explain that merge conflicts
warrant a re-run of the command.
2021-11-01 09:38:00 -04:00
ducoterra
a9fbe159de
Merge commit '3041d56ba60133f724bfe37dfc9f6730dfc809b8'
2021-11-01 09:27:24 -04:00
ducoterra
3041d56ba6
Squashed '.gitlab/' changes from 66b4fdb..2f76759
...
2f767592f767593ef
2021-11-01 09:26:53 -04:00
ducoterra
669e95a9f1
Ignore git stash pop failures
...
In the event the stash is empty, don't run stash pop.
2021-11-01 09:23:36 -04:00
ducoterra
e5120ae618
Squashed '.gitlab/' changes from da69418..66b4fdb
...
66b4fdb66b4fdb902
2021-11-01 09:20:16 -04:00
ducoterra
b7271796e2
Merge commit 'e5120ae618292da2cc90ebdc35e61c77a9f66258'
2021-11-01 09:20:16 -04:00
ducoterra
3b8bbd3d1f
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
858ac5f132
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
dd39e3335a
Squashed '.gitlab/' changes from ba12c92..da69418
...
da69418da69418b0d
2021-11-01 09:05:55 -04:00
ducoterra
052b8f836c
Merge commit 'dd39e3335a3a92c34c86ef296c2cc651d8d3afa8'
2021-11-01 09:05:55 -04:00
ducoterra
3d29d92f8a
Squashed '.gitlab/' changes from 8a52a21..ba12c92
...
ba12c9274a4a4e3e8ca714146777ba12c923ba
2021-10-31 21:04:21 -04:00
ducoterra
efc5f3271c
Merge commit '3d29d92f8aee30354fb3d468285de4b6641e2a17'
2021-10-31 21:04:21 -04:00
ducoterra
34be418006
Include .gitlab Makefile
2021-10-31 21:00:17 -04:00
ducoterra
1cb23265fd
Merge commit 'ba12c923ba6644e8aadcc18b33feaacf61a8fb43'
2021-10-31 21:00:07 -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
3de29c8b5d
Merge commit '74a4a4e77f5fa40b486ae9b94a91e53b3ace5d65'
2021-10-31 20:35:09 -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
2d5a1f03bb
Automated release of chart minecraft: version 1.0.0.
2021-10-31 16:26:51 -04:00
ducoterra
0cbdd4d98e
Add '.gitlab/' from commit '8a52a21a398f3bb2840e76e26f065a7963c79efa'
...
git-subtree-dir: .gitlab
git-subtree-mainline: d249e354638a52a21a39
2021-10-31 15:12:47 -04:00
ducoterra
d249e35463
switch to named subtree
2021-10-31 15:12:17 -04:00
ducoterra
e6ef14a02e
Add 'minecraft/' from commit '0d2235b6a37b227f0affbbf32a3644b087b31684'
...
git-subtree-dir: minecraft
git-subtree-mainline: 7b7ef78bfc0d2235b6a3
2021-10-31 15:11:38 -04:00
ducoterra
7b7ef78bfc
Merge commit '536f0c84ae2c5272a8e1d9bb83839766d34f6d14'
2021-10-31 15:04:49 -04:00
ducoterra
536f0c84ae
Squashed '.gitlab/' changes from f187522..8a52a21
...
8a52a218a52a21a39
2021-10-31 15:04:49 -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
ducoterra
fd13582e8f
Merge commit '0cc825e2555b4eec700e3e88cc1eb322dd6268c1' as '.gitlab'
2021-10-31 15:01:49 -04:00
ducoterra
0cc825e255
Squashed '.gitlab/' content from commit f187522
...
git-subtree-dir: .gitlab
git-subtree-split: f18752299d
2021-10-31 15:01:49 -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
f35fbbcfcd
Add minecraft version 1.1.0
2021-10-30 21:20:54 -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
354a479396
Add minecraft 1.0.2 update
2021-08-29 15:28:43 -04:00
ducoterra
44053abdf8
truenas compatibility update
2021-08-29 15:24:11 -04:00
ducoterra
357b863cf3
Change minecraft update strategy
...
Kill old pods before adding new ones
2021-08-29 15:22:55 -04:00
ducoterra
ada7070b1b
add test train
2021-08-29 14:54:47 -04:00
ducoterra
40f11fe721
Upgrade minecraft chart to 1.0.1
2021-08-29 13:50:10 -04:00
ducoterra
8608539c3f
Add volume to test app
...
Volumes aren't working, adding a volume to test app to ensure volumes
mount correctly.
2021-08-29 12:54:31 -04:00
