services/minecraft_vanilla
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95 Commits 2 Branches 10 Tags
c1ca80b09b4645888e550efb0a2700b2ec1f1645
Commit Graph
90 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ducoterra d9485d2fdf Merge update from Common 2021-12-13 12:58:41 -05:00
ducoterra 8096a291e6 Squashed '.gitlab/' changes from cf41f2e..16ee2f3 
16ee2f3 Merge branch 'various-docker-fixes' into 'main'
5b3e196 fix docker build and remove release
4bf9d45 Merge branch 'prefix-docker-commands' into 'main'
91b77b3 don't reset head after subtree pull, it breaks things
66b4362 prefix all docker commands with docker-
ba2827a Merge branch 'allow-specify-branch' into 'main'
4de5558 ignore .gitlab
71ff227 Allow pulling specific branch with BRANCH_NAME
6430416 Merge branch 'add-helm-and-kube' into 'main'
bce675f Add install, upgrade, and uninstall for helm
1532f30 Add kubectl.makefile

git-subtree-dir: .gitlab
git-subtree-split: 16ee2f3ddcc1235cb4a6b7a38c82d52859e8408f
 2021-12-13 12:58:40 -05:00
ducoterra 4a80310c33 setenv is deprecated 2021-12-13 12:58:05 -05:00
ducoterra d77bfb210a add testcraft and camcraft values 2021-12-13 12:57:58 -05:00
ducoterra 1f7af65220 quote server version 2021-12-13 12:57:42 -05:00
ducoterra 44975664b6 Squashed '.gitlab/' changes from 731ada6..cf41f2e 
cf41f2e Merge branch 'remove-push' into 'main'
ef81c95 Remove unused commands
81c19cc Don't use remote common
ea1e248 Update subtree add README
756cc8c Remove make-push
a4b7e34 Squash subtree on pull
524c5be Fix PROJECT_NAME variable
47dea48 Add automated commit to chart-release

git-subtree-dir: .gitlab
git-subtree-split: cf41f2e7768da3a340b86debcddc949b588448c7
 2021-11-02 15:48:46 -04:00
ducoterra 05206686ad Merge update from Common 2021-11-02 15:48:46 -04:00
ducoterra 2de53def19 Remove .common 2021-11-02 12:46:40 -04:00
ducoterra a85a7aa84f Merge branch 'common-subtree' 2021-11-02 12:45:47 -04:00
ducoterra a07400506a Add '.gitlab/' from commit '731ada6a3d65b2347ccf204cfe09ee278a4f0594' 
git-subtree-dir: .gitlab
git-subtree-mainline: 422f4d49bd
git-subtree-split: 731ada6a3d
 2021-11-02 11:59:31 -04:00
ducoterra 422f4d49bd remove .gitlab subtree 2021-11-02 11:59:08 -04:00
Reese 731ada6a3d Merge branch 'make-update-fixes' into 'main' 
Update README with "common" remote

See merge request services/common!4
 2021-11-02 15:50:30 +00:00
ducoterra c3e6d733c6 Switch to "subtree split" push strategy 
Split the subtree into a new branch before pushing to common. This
creates a new branch automatically and ensures no weird histories get
committed to common.
 2021-11-02 11:48:15 -04:00
ducoterra 3c91292fea Make user stash their own damn changes 
Stashing is so annoying to deal with in a scripted way. Just force the
user to stash their own changes. Only subtree pull if it's possible.
 2021-11-02 11:47:29 -04:00
ducoterra d86b5052a8 Add PROJECT_NAME and VERSION 
Add PROJECT_NAME and VERSION variables to Makefile.
 2021-11-02 11:46:53 -04:00
ducoterra 9d0c9c6388 Update README with "common" remote 
Add instructions for adding subtree using a remote called "common". You
need the remote to properly contribute back upstream from a child
project.
 2021-11-02 11:45:57 -04:00
Reese 30fb8c2171 Merge branch 'docker-buidlx-overhaul' into 'main' 
Switch to container-builder buildx platform

See merge request services/common!2
 2021-11-02 15:44:36 +00:00
Reese fd96b3f3a3 Merge branch 'git-release' into 'main' 
Add make git-release

See merge request services/common!3
 2021-11-02 15:44:26 +00:00
ducoterra a6053ed3f0 Add make git-release 
Add command which makes an automated release from the VERSION file.
Commits and tags everything not staged in the repo.
 2021-11-02 10:25:18 -04:00
ducoterra 3563c5c2aa Add make docker-release 
Add docker-release command which updates the image tag in the
docker-compose.yaml and runs a `make push`.
 2021-11-02 10:23:53 -04:00
ducoterra 40a217b585 Use buildx to create multi-arch images 
clear and set the buildx context on push. Then use --push with buildx
build to push the multi-arch images immediately after creating them.
This gets around the need to store them locally (which won't work for
something like an M1 mac).
 2021-11-02 10:22:48 -04:00
ducoterra 5e2bc5f872 Switch to container-builder buildx platform 
Continue using buildx with a new container builder name
"container-builder".
 2021-11-02 10:19:21 -04:00
ducoterra a5aa0cacbe Automated release for version 1.0.2 2021-11-02 10:08:38 -04:00
ducoterra 65b3a84e96 make subtree "split" overhaul 
In order to create cleaner histories we should be using subtree split
and push in order to preview the changes as an MR before pushing to
main.
 2021-11-02 10:07:50 -04:00
ducoterra d181d452e8 Overhaul for get-server v. 2.0.0 
Since get-server downloads its own jarfile this commit overhauls a lot
of the minecraft deploy to match the new strategy. It also updates the
README and adds makefile targets for a few new commands.
 2021-11-02 10:05:01 -04:00
ducoterra 9eed50962c Don't squash on pull 
Don't squash updates on pull
 2021-11-01 20:32:27 -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 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
ducoterra f59775dfa8 use a loadbalancer 2020-01-12 20:18:28 -05:00
ducoterra e54fdbe59b update IP 2020-01-12 19:52:21 -05:00
ducoterra 22987e0a56 comment horrible CMD 2020-01-07 08:42:32 -05:00
ducoterra 38b9dffe68 add server.properties and update k8s with ram env 2020-01-07 08:40:51 -05:00
ducoterra da7cb2cd0b add ram env 2020-01-07 08:39:53 -05:00
ducoterra 53e37bae89 switch to java 8 and only copy files that exist 2020-01-07 08:39:41 -05:00
ducoterra 0253598d80 add build script 2020-01-07 08:39:18 -05:00
ducoterra 095bbaab95 init 2019-12-31 22:54:23 -05:00