Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
SCROLL_REGISTRY_API_KEY: ${{ secrets.SCROLL_REGISTRY_API_KEY }}
SCROLL_REGISTRY_API_SECRET: ${{ secrets.SCROLL_REGISTRY_API_SECRET }}
SCROLL_REGISTRY_BUCKET: ${{ secrets.SCROLL_REGISTRY_BUCKET_STAGING }}
DRUID_CLI_VERSION: v0.1.246
DRUID_CLI_VERSION: v0.1.247
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/prebuild-lsm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ jobs:
matrix:
target: ${{ fromJson(needs.resolve-targets.outputs.targets) }}
env:
DRUID_CLI_VERSION: v0.1.246
DRUID_RUNTIME_IMAGE: artifacts.druid.gg/druid-team/druid:v0.1.246
DRUID_STEAM_RUNTIME_IMAGE: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
DRUID_CLI_VERSION: v0.1.247
DRUID_RUNTIME_IMAGE: artifacts.druid.gg/druid-team/druid:v0.1.247
DRUID_STEAM_RUNTIME_IMAGE: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
PREBUILD_DOCKER_PLATFORM: linux/amd64
steps:
- uses: actions/checkout@v3
Expand Down
190 changes: 95 additions & 95 deletions .github/workflows/release.yml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions generate-scrolls.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ func main() {
}
coldstarterImage := os.Getenv("DRUID_COLDSTARTER_IMAGE")
if coldstarterImage == "" {
coldstarterImage = "artifacts.druid.gg/druid-team/druid:v0.1.246"
coldstarterImage = "artifacts.druid.gg/druid-team/druid:v0.1.247"
}
steamImage := os.Getenv("DRUID_STEAM_RUNTIME_IMAGE")
if steamImage == "" {
steamImage = "artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd"
steamImage = "artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd"
}

//iterate through artifacts and generate scroll.yaml files
Expand Down
2 changes: 1 addition & 1 deletion scripts/prebuild/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ func selectSpecs(raw string) ([]prebuildSpec, error) {
}

func allSpecs() []prebuildSpec {
steamImage := getenv("DRUID_STEAM_RUNTIME_IMAGE", "artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd")
steamImage := getenv("DRUID_STEAM_RUNTIME_IMAGE", "artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd")
specs := []prebuildSpec{
{Target: "pwserver", Artifact: "artifacts.druid.gg/druid-team/scroll-lgsm:pwserver-prebuild", Source: "./scrolls/lgsm/pwserver", Image: steamImage, Ports: []string{"main=8211/udp", "rcon=25575"}, MinDisk: "7Gi", MinRAM: "2Gi", MinCPU: "0.5", Category: "palworld", Smart: true, PackMeta: true},
{Target: "arkserver", Artifact: "artifacts.druid.gg/druid-team/scroll-lgsm:arkserver-prebuild", Source: "./scrolls/lgsm/arkserver", Image: steamImage, Ports: []string{"main=7777/udp", "query=27015/udp", "rcon=27020"}, MinDisk: "25Gi", MinRAM: "7Gi", MinCPU: "0.5", Category: "ark", Smart: true, PackMeta: true},
Expand Down
4 changes: 2 additions & 2 deletions scripts/prebuild/prebuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ targets="${1:-all-steam}"
: "${SCROLL_REGISTRY_USER:?SCROLL_REGISTRY_USER is required}"
: "${SCROLL_REGISTRY_PASSWORD:?SCROLL_REGISTRY_PASSWORD is required}"

export DRUID_RUNTIME_IMAGE="${DRUID_RUNTIME_IMAGE:-artifacts.druid.gg/druid-team/druid:v0.1.246}"
export DRUID_STEAM_RUNTIME_IMAGE="${DRUID_STEAM_RUNTIME_IMAGE:-artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd}"
export DRUID_RUNTIME_IMAGE="${DRUID_RUNTIME_IMAGE:-artifacts.druid.gg/druid-team/druid:v0.1.247}"
export DRUID_STEAM_RUNTIME_IMAGE="${DRUID_STEAM_RUNTIME_IMAGE:-artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd}"
export PREBUILD_DOCKER_PLATFORM="${PREBUILD_DOCKER_PLATFORM:-linux/amd64}"

echo "Targets: ${targets}"
Expand Down
2 changes: 1 addition & 1 deletion scripts/push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ registry_host="${registry_host%%/*}"

namespace="${SCROLL_REGISTRY_PR_NAMESPACE:-druid-team-experimental}"
runtime_namespace="${SCROLL_REGISTRY_RUNTIME_NAMESPACE:-druid-team}"
runtime_image="${DRUID_SCROLL_RUNTIME_IMAGE:-${registry_host}/${runtime_namespace}/druid:v0.1.246}"
runtime_image="${DRUID_SCROLL_RUNTIME_IMAGE:-${registry_host}/${runtime_namespace}/druid:v0.1.247}"
roots="${SCROLL_PR_ROOTS:-}"

yaml_value() {
Expand Down
4 changes: 2 additions & 2 deletions scrolls/lgsm/.build/versions/cs2server/chunks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ chunks:
path: log
- name: postinstall
path: postinstall.sh
- name: postinstall-template
path: postinstall.sh.scroll_template
- name: patch-lgsm-permissions
path: patch-lgsm-permissions.sh
- name: serverfiles
path: serverfiles
chunks:
Expand Down

This file was deleted.

24 changes: 12 additions & 12 deletions scrolls/lgsm/arkserver/scroll.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ commands:
run: restart
procedures:
- id: coldstart
image: artifacts.druid.gg/druid-team/druid:v0.1.246
image: artifacts.druid.gg/druid-team/druid:v0.1.247
expectedPorts:
- name: query
keepAliveTraffic: 10kb/5m
Expand All @@ -86,7 +86,7 @@ commands:
command:
- druid-coldstarter
- id: start
image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
expectedPorts:
- name: query
keepAliveTraffic: 10kb/5m
Expand All @@ -105,14 +105,14 @@ commands:
- install
procedures:
- ignore_failure: true
image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
mounts:
- path: "/server"
working_dir: "/server"
command:
- ./arkserver
- update
- image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
- image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
mounts:
- path: "/server"
working_dir: "/server"
Expand All @@ -122,7 +122,7 @@ commands:
stop:
run: always
procedures:
- image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
- image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
mounts:
- path: "/server"
working_dir: "/server"
Expand All @@ -131,14 +131,14 @@ commands:
- stop
restart:
procedures:
- image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
- image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
mounts:
- path: "/server"
working_dir: "/server"
command:
- echo
- Restarting server...
- image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
- image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
mounts:
- path: "/server"
working_dir: "/server"
Expand All @@ -148,35 +148,35 @@ commands:
install:
run: once
procedures:
- image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
- image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
mounts:
- path: "/server"
working_dir: "/server"
command:
- echo
- Installing LGSM...
- image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
- image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
mounts:
- path: "/server"
working_dir: "/server"
command:
- sh
- install-lgsm.sh
- image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
- image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
mounts:
- path: "/server"
working_dir: "/server"
command:
- ./linuxgsm.sh
- arkserver
- image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
- image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
mounts:
- path: "/server"
working_dir: "/server"
command:
- sh
- patch-lgsm-permissions.sh
- image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
- image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
mounts:
- path: "/server"
working_dir: "/server"
Expand Down
26 changes: 13 additions & 13 deletions scrolls/lgsm/cs2server/scroll.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ commands:
run: restart
procedures:
- id: coldstart
image: artifacts.druid.gg/druid-team/druid:v0.1.246
image: artifacts.druid.gg/druid-team/druid:v0.1.247
expectedPorts:
- name: main
keepAliveTraffic: 10kb/5m
Expand All @@ -94,7 +94,7 @@ commands:
command:
- druid-coldstarter
- id: start
image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
expectedPorts:
- name: main
keepAliveTraffic: 10kb/5m
Expand All @@ -111,14 +111,14 @@ commands:
- install
procedures:
- ignore_failure: true
image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
mounts:
- path: "/server"
working_dir: "/server"
command:
- ./cs2server
- update
- image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
- image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
mounts:
- path: "/server"
working_dir: "/server"
Expand All @@ -128,7 +128,7 @@ commands:
stop:
run: always
procedures:
- image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
- image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
mounts:
- path: "/server"
working_dir: "/server"
Expand All @@ -137,14 +137,14 @@ commands:
- stop
restart:
procedures:
- image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
- image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
mounts:
- path: "/server"
working_dir: "/server"
command:
- echo
- Restarting server...
- image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
- image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
mounts:
- path: "/server"
working_dir: "/server"
Expand All @@ -154,42 +154,42 @@ commands:
install:
run: once
procedures:
- image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
- image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
mounts:
- path: "/server"
working_dir: "/server"
command:
- echo
- Installing LGSM...
- image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
- image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
mounts:
- path: "/server"
working_dir: "/server"
command:
- sh
- install-lgsm.sh
- image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
- image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
mounts:
- path: "/server"
working_dir: "/server"
command:
- ./linuxgsm.sh
- cs2server
- image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
- image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
mounts:
- path: "/server"
working_dir: "/server"
command:
- sh
- patch-lgsm-permissions.sh
- image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
- image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
mounts:
- path: "/server"
working_dir: "/server"
command:
- ./cs2server
- auto-install
- image: artifacts.druid.gg/druid-team/druid:v0.1.246-steamcmd
- image: artifacts.druid.gg/druid-team/druid:v0.1.247-steamcmd
mounts:
- path: "/server"
working_dir: "/server"
Expand Down
Loading
Loading