0520668 Merge update from Common
4497566 Squashed '.gitlab/' changes from 731ada6..cf41f2e
2de53de Remove .common
a85a7aa Merge branch 'common-subtree'
a074005 Add '.gitlab/' from commit '731ada6a3d65b2347ccf204cfe09ee278a4f0594'
422f4d4 remove .gitlab subtree
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
a5aa0ca Automated release for version 1.0.2
65b3a84 make subtree "split" overhaul
d181d45 Overhaul for get-server v. 2.0.0
9eed509 Don't squash on pull
b07a2c0 Run update after make-push
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
2f76759 Add make-push command
66b4fdb Ignore subtree pull failures
da69418 Switch to url-based subtree with `make-update`
ba12c92 Remove docker-run
74a4a4e Transition to .gitlab prefix
3e8ca71 Add chart-release to truenas.makefile
4146777 Add helm.makefile
8a52a21 Switch to multi-makefile strategy
f187522 init
git-subtree-dir: minecraft
git-subtree-split: 05206686ad84ad388c98578becfc5cfe3a13fdb4
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
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.
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).
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.
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.
