services/charts
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
146 Commits 2 Branches 0 Tags
096a98ce62656b29705b8c4823d9d074bd3e067f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ducoterra 096a98ce62 Merge update from Common 2021-11-02 15:47:58 -04:00
ducoterra d63796facc 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:47:58 -04:00
ducoterra 6e9aebdfc1 Merge update from Common 2021-11-02 15:47:56 -04:00
ducoterra c0c7b3e0b6 Squashed '.gitlab/' changes from 9eed509..731ada6 
731ada6 Merge branch 'make-update-fixes' into 'main'
c3e6d73 Switch to "subtree split" push strategy
3c91292 Make user stash their own damn changes
d86b505 Add PROJECT_NAME and VERSION
9d0c9c6 Update README with "common" remote
30fb8c2 Merge branch 'docker-buidlx-overhaul' into 'main'
fd96b3f Merge branch 'git-release' into 'main'
a6053ed Add make git-release
3563c5c Add make docker-release
40a217b Use buildx to create multi-arch images
5e2bc5f Switch to container-builder buildx platform

git-subtree-dir: .gitlab
git-subtree-split: 731ada6a3d
 2021-11-02 15:47:38 -04:00
ducoterra bd1a008bb0 Update pull-minecraft to not use remote. 2021-11-02 15:46:48 -04:00
ducoterra fe8db45abd Fix PROJECT_NAME variable 
PROJECT_NAME variable wasn't working. Fixed.
 2021-11-02 15:04:55 -04:00
ducoterra d580f3407c Merge update from Common 2021-11-02 11:57:26 -04:00
ducoterra 4ee4b7cefb Add make pull-minecraft 
Add command to update minecraft project subtree.
 2021-11-02 11:56:41 -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 6f553df13c Merge commit '99c243e9cdbe95f4439463500b6797e9ae6d7f17' 2021-11-01 22:44:14 -04:00
ducoterra 99c243e9cd Merge update from Common 2021-11-01 22:42:01 -04:00
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 05a22bfe3b Don't make-update after make-push 2021-11-01 21:47:00 -04:00
ducoterra 25ce278d58 Merge commit 'c747403ac42d6deb0c10863962ff630e438423ce' 2021-11-01 21:46:06 -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 13085be69a Squashed '.gitlab/' changes from b07a2c0..9eed509 
9eed509 Don't squash on pull

git-subtree-dir: .gitlab
git-subtree-split: 9eed50962c
 2021-11-01 20:42:52 -04:00
ducoterra 13a4740c14 Merge commit '13085be69aa1b30274f07c210042025395b9ccfd' 2021-11-01 20:42:52 -04:00
ducoterra 9eed50962c Don't squash on pull 
Don't squash updates on pull
 2021-11-01 20:32:27 -04:00
ducoterra 446da1ff0e Merge commit '9095d7d0b0b2be73012a0714bf0b65b1e6adc50e' 2021-11-01 10:07:09 -04:00
ducoterra 04243dc35a Squashed '.gitlab/' changes from 22a952d..b07a2c0 
b07a2c0 Run update after make-push

git-subtree-dir: .gitlab
git-subtree-split: b07a2c095b
 2021-11-01 10:06:11 -04:00
ducoterra ece42df00c erge commit '04243dc35a266039ab7e4fb6677f23efab8350a2' 2021-11-01 10:06:11 -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 a4d2e1f8fe 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 e7b07c7f84 Squashed '.gitlab/' changes from 2f76759..22a952d 
22a952d Remove warning from make-update
0f6eeb7 Add make-stash-drop command
f81d846 Only pop stash if changes
afed93f Add warning to make-update and make-push
6239af7 Ignore git stash pop failures

git-subtree-dir: .gitlab
git-subtree-split: 22a952dd53
 2021-11-01 10:05:13 -04:00
ducoterra 44b2766509 Merge commit 'e7b07c7f84dae74fc3442953db7585140efa8c6c' 2021-11-01 10:05:13 -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 57285aba52 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 d9d1c75126 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 1849624763 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 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 
2f76759 Add make-push command

git-subtree-dir: .gitlab
git-subtree-split: 2f767593ef
 2021-11-01 09:26:53 -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 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 
66b4fdb Ignore subtree pull failures

git-subtree-dir: .gitlab
git-subtree-split: 66b4fdb902
 2021-11-01 09:20:16 -04:00
ducoterra b7271796e2 Merge commit 'e5120ae618292da2cc90ebdc35e61c77a9f66258' 2021-11-01 09:20:16 -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 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 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 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 
da69418 Switch to url-based subtree with `make-update`

git-subtree-dir: .gitlab
git-subtree-split: da69418b0d
 2021-11-01 09:05:55 -04:00
ducoterra 052b8f836c Merge commit 'dd39e3335a3a92c34c86ef296c2cc651d8d3afa8' 2021-11-01 09:05:55 -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 3d29d92f8a Squashed '.gitlab/' changes from 8a52a21..ba12c92 
ba12c92 Remove docker-run
74a4a4e Transition to .gitlab prefix
3e8ca71 Add chart-release to truenas.makefile
4146777 Add helm.makefile

git-subtree-dir: .gitlab
git-subtree-split: ba12c923ba
 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 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 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: d249e35463
git-subtree-split: 8a52a21a39
 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: 7b7ef78bfc
git-subtree-split: 0d2235b6a3
 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 
8a52a21 Switch to multi-makefile strategy

git-subtree-dir: .gitlab
git-subtree-split: 8a52a21a39
 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
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 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