services/charts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
79 Commits 2 Branches 0 Tags
2e7d3a2708fe7302924c9e79bdf55e862be76051
Commit Graph

79 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ducoterra
2e7d3a2708 Don't stash on make-update 
Make the developer handle their own stash. It's such a pain.
 2021-11-01 22:16:05 -04:00
ducoterra
87731ffd6e fixup into add git-release 2021-11-01 21:45:16 -04:00
ducoterra
2396536013 Add $(VERSION) var 
Add variable for the version.
 2021-11-01 21:42:14 -04:00
ducoterra
5ccfcf6b5a Add make git-release 
Add git-release command that will add everything not currently staged,
create a commit, and tag it with the current version.
 2021-11-01 21:41:30 -04:00
ducoterra
8c5d99ae3e Update docker-release with buildx commands 
Build for the local arch but push for amd64 and arm64. Use the custom
container-builder buildx platform. Also update the docker-compose file
on release.
 2021-11-01 21:41:24 -04:00
ducoterra
3e472ebe86 Add docker-release 
Add VERSION variable for use with docker-release. Creates a new docker
image automatically and a commit to go with it.
 2021-11-01 20:55:16 -04:00
ducoterra
446da1ff0e Merge commit '9095d7d0b0b2be73012a0714bf0b65b1e6adc50e' 2021-11-01 10:07:09 -04:00
ducoterra
b07a2c095b Run update after make-push 
To close things out we should re-run make-update to ensure changes are
pulled back into the repo we updated from.
 2021-11-01 10:05:43 -04:00
ducoterra
22a952dd53 Remove warning from make-update 
make-update isn't as destructive as it once was. It should be safe to
run as long as the developer is fixes any weird merge conflicts after
stash pop.
 2021-11-01 10:02:35 -04:00
ducoterra
0f6eeb776e Add make-stash-drop command 
Sometimes you can get stuck in a loop where git stash pop preserves the
stash commit. Dropping that commit if it's a STASH commit after an
update is totally fine.
 2021-11-01 10:01:12 -04:00
ducoterra
f81d846f31 Only pop stash if changes 
Only pop the stash if the most recent stash commit matches the STASH
name.
 2021-11-01 09:56:37 -04:00
ducoterra
afed93f58a 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
6239af7f74 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
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
1abb62322c Merge commit '07d08a3dd627080ae3dc2eab72554850b4ca7338' 2021-10-31 22:57:41 -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
533715966c Merge commit '10fe997cbae7b18fa306fbfb6bb0543b91a3c340' as '.gitlab' 2021-10-31 22:53:01 -04:00
ducoterra
fda8323c19 switch to no remote 2021-10-31 22:52:46 -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
ef33ab04d6 Change Makefile to use new .gitlab Makefile 
Switch to .gitlab Makefile
 2021-10-31 20:39:02 -04:00
ducoterra
9dd42f574a Add '.gitlab/' from commit '74a4a4e77f5fa40b486ae9b94a91e53b3ace5d65' 
git-subtree-dir: .gitlab
git-subtree-mainline: cf52f55957
git-subtree-split: 74a4a4e77f
 2021-10-31 20:36:21 -04:00
ducoterra
cf52f55957 remove old subtree 2021-10-31 20:36:07 -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
ducoterra
a16d810344 Merge commit '768b672b1f17fcb01580b6b27c715f5ce1ea2ab0' as '.gitlab' 2021-10-31 11:59:18 -04:00
ducoterra
768b672b1f Squashed '.gitlab/' content from commit f187522 
git-subtree-dir: .gitlab
git-subtree-split: f18752299d
 2021-10-31 11:58:38 -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