8b0a8fab1f
setenv is deprecated
2021-12-13 12:06:38 -05:00
6213e7face
pin FROM to use 8-jdk-bullseye
2021-12-13 12:04:10 -05:00
9dc2f0eee7
switch to correct image in docker-compose
2021-12-13 12:00:31 -05:00
b0991eadef
ignore versions folder where we keep pack zip files
2021-12-13 12:00:07 -05:00
f8fc83bf3a
remove default values
2021-12-13 11:59:01 -05:00
e2c677b960
add unzip and copy properties init container, don't mount properties
2021-12-13 11:58:54 -05:00
d118b2d011
add the-1122-pack values
2021-12-13 11:58:32 -05:00
6d11fde3e6
Merge update from Common
2021-12-05 22:21:09 -05:00
a280110e97
Squashed '.gitlab/' changes from cf41f2e..6430416
...
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: 64304160b9a4bb369bd89019e887d65b4e206896
2021-12-05 22:21:09 -05:00
05206686ad
Merge update from Common
2021-11-02 15:48:46 -04:00
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
2de53def19
Remove .common
2021-11-02 12:46:40 -04:00
a85a7aa84f
Merge branch 'common-subtree'
2021-11-02 12:45:47 -04:00
a07400506a
Add '.gitlab/' from commit '731ada6a3d65b2347ccf204cfe09ee278a4f0594'
...
git-subtree-dir: .gitlab
git-subtree-mainline: 422f4d49bd731ada6a3d
2021-11-02 11:59:31 -04:00
422f4d49bd
remove .gitlab subtree
2021-11-02 11:59:08 -04:00
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
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
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
d86b5052a8
Add PROJECT_NAME and VERSION
...
Add PROJECT_NAME and VERSION variables to Makefile.
2021-11-02 11:46:53 -04:00
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
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
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
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
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
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
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
a5aa0cacbe
Automated release for version 1.0.2
2021-11-02 10:08:38 -04:00
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
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
9eed50962c
Don't squash on pull
...
Don't squash updates on pull
2021-11-01 20:32:27 -04:00
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
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
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
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
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
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
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
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
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
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
74a4a4e77f
Transition to .gitlab prefix
...
Expect repo to be subtree'd as ".gitlab"
2021-10-31 20:33:47 -04:00
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
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
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
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
dbe0d47f99
Merge branch 'master' into 'common-makefile'
...
# Conflicts:
# helm/questions.yaml
2021-10-31 03:05:11 +00:00
c7c547c80f
Switch to common Makefile
...
Rather than writing our own Makefile use the common one.
2021-10-30 22:46:34 -04:00
a403f6f068
Merge commit '32cd04c7ec7aacf8e3a402e3aed310a6ea94b586' as '.common'
2021-10-30 22:43:08 -04:00
32cd04c7ec
Squashed '.common/' content from commit f187522
...
git-subtree-dir: .common
git-subtree-split: f18752299d
2021-10-30 22:43:08 -04:00
8d190e478f
Add minecraft logo
...
Add minecraft logo for use by nextcloud.
2021-10-30 22:32:59 -04:00
ducoterra