Files

ducoterra db2b6d66e3 Squashed '.gitlab/' changes from fe577bf..465f46a

465f46a Merge branch 'add-docker-compose-targets' into 'main'
f6aed2c add docker-compose init, up, and down targets
88716ad populate default values for VERSION and IMAGE file when docker-init is run
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
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
REVERT: fe577bf remove old forge versions before unzipping
REVERT: 6c4354d Automated release for version 1.0.1
REVERT: 6fd156e genericize the container run commands by normalizing file names
REVERT: b776273 add update-version, remove get-server
REVERT: 4488fbf move values to helm/values.yaml
REVERT: dad1e4c sync versions to chart.yaml
REVERT: a171258 remove truenas chart stuff
REVERT: 84abbd4 Merge update from Common
REVERT: a13cfe6 Squashed '.gitlab/' changes from 6430416..16ee2f3
REVERT: 8b0a8fa setenv is deprecated
REVERT: 6213e7f pin FROM to use 8-jdk-bullseye
REVERT: 9dc2f0e switch to correct image in docker-compose
REVERT: b0991ea ignore versions folder where we keep pack zip files
REVERT: f8fc83b remove default values
REVERT: e2c677b add unzip and copy properties init container, don't mount properties
REVERT: d118b2d add the-1122-pack values
REVERT: a280110 Squashed '.gitlab/' changes from cf41f2e..6430416
REVERT: 6d11fde Merge update from Common
REVERT: 4497566 Squashed '.gitlab/' changes from 731ada6..cf41f2e
REVERT: 0520668 Merge update from Common
REVERT: 2de53de Remove .common
REVERT: a85a7aa Merge branch 'common-subtree'
REVERT: a074005 Add '.gitlab/' from commit '731ada6a3d65b2347ccf204cfe09ee278a4f0594'
REVERT: 422f4d4 remove .gitlab subtree
REVERT: a5aa0ca Automated release for version 1.0.2
REVERT: 65b3a84 make subtree "split" overhaul
REVERT: d181d45 Overhaul for get-server v. 2.0.0
REVERT: 0d2235b Merge branch 'common-makefile' into 'master'
REVERT: dbe0d47 Merge branch 'master' into 'common-makefile'
REVERT: c7c547c Switch to common Makefile
REVERT: a403f6f Merge commit '32cd04c7ec7aacf8e3a402e3aed310a6ea94b586' as '.common'
REVERT: 32cd04c Squashed '.common/' content from commit f187522
REVERT: 8d190e4 Add minecraft logo
REVERT: ba5ab53 Allow custom server versions
REVERT: a820e9a Allow custom server versions
REVERT: 9e788ee Add IMAGE and VERSION files
REVERT: d3b0f86 Switch to openjdk-latest and don't copy server.jar
REVERT: 2f7d4c7 Add Makefile
REVERT: aa253e6 Remove server.jar and docker-compose.yaml
REVERT: 773c1d6 Move install-specific values to a values folder
REVERT: dae5a09 Fix RAM issue with deploy
REVERT: 44053ab truenas compatibility update
REVERT: 807b186 set memory requirements to avoid sudden container death
REVERT: 99666ba add setenv
REVERT: 1b6b8bb update RAM for new cluster
REVERT: 95c7fa7 merge templates
REVERT: 7e0ff9e upgrade to 1.6.4
REVERT: 12fa8ec remove extra opts and remove threading
REVERT: 7d34b3a add charts for each server
REVERT: 95b0bd6 switch to configmap model
REVERT: ff2c9af servers to nvme
REVERT: 1dfb1f6 nvme for minecraft
REVERT: 3faf5c9 don't auto deploy
REVERT: 072bee6 update to 1.16.1
REVERT: e6a0429 fix port issue
REVERT: 7df518d set image
REVERT: ca4d1ee use tag in deploy
REVERT: 1ccc5cd fix tags
REVERT: 3ce71a6 add gitlab ci
REVERT: 151867f switch back to minecraft 1.15.2
REVERT: abc90be add images
REVERT: b727538 upgrade to 20w12a
REVERT: 17b0594 upgrade to 20w12a
REVERT: 9929e5d upgrade to 20w12a
REVERT: 00386c7 just copy files to mc_data
REVERT: 0c75d91 switch to ducoterra namespace
REVERT: 8bdae44 add README for backups
REVERT: 6264d75 set namespace to minecraft
REVERT: f59775d use a loadbalancer
REVERT: e54fdbe update IP
REVERT: 22987e0 comment horrible CMD
REVERT: 38b9dff add server.properties and update k8s with ram env
REVERT: da7cb2c add ram env
REVERT: 53e37ba switch to java 8 and only copy files that exist
REVERT: 0253598 add build script
REVERT: 095bbaa init

git-subtree-dir: .gitlab
git-subtree-split: 465f46ad48404c13c25d7e9a961d7a4ce7ee997a

2021-12-13 15:14:25 -05:00

287 B

Raw Blame History

Adding the "common" subtree as your .gitlab folder

# Add the subtree as a remote
git subtree add --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash --message "Add Common .gitlab Subtree"

# Now you can run the following to update
make make-update

287 B Raw Blame History

Adding the "common" subtree as your .gitlab folder

287 B

Raw Blame History