Skip to content

Commit

Permalink
Renamed the docker folder to podman as that's what should be used
Browse files Browse the repository at this point in the history
  • Loading branch information
hhyyrylainen committed Nov 1, 2023
1 parent 41e66ed commit 19fa433
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ package-lock.json
/fast_build_mode.json

*.temp_check
/docker/*.tar.xz
*.tar.xz
/Scripts/patrons.json
/Scripts/translators.json
/steam_appid.txt
Expand Down
2 changes: 1 addition & 1 deletion Scripts/ContainerTool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public ContainerTool(Program.ContainerOptions options) : base(options)
}

protected override string ExportFileNameBase => "godot-ci";
protected override string ImagesAndConfigsFolder => "docker";
protected override string ImagesAndConfigsFolder => "podman";
protected override (string BuildRelativeFolder, string? TargetToStopAt) DefaultImageToBuild => ("ci", null);
protected override string ImageNameBase => "thrive/godot-ci";

Expand Down
2 changes: 1 addition & 1 deletion doc/updating_godot_version.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ to be changed in the following files:

- `doc/setup_instructions.md`
- `Scripts/GodotVersion.cs`
- `docker/ci/Dockerfile`
- `podman/ci/Dockerfile`

The CI system needs to also be updated (`CIConfiguration.yml`). That
can only be done by Thrive team members. Instructions for that can be
Expand Down
14 changes: 7 additions & 7 deletions export_presets.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ runnable=true
custom_features=""
export_filter="all_resources"
include_filter="*.json, *.txt, *.yml"
exclude_filter="test/*, builds/*, build/*, build-debug/*, *mono_crash*, fast_build_mode.json, docker/*, Scripts/*, doc/steam*, steam*, RevolutionaryGamesCommon/*"
exclude_filter="test/*, builds/*, build/*, build-debug/*, *mono_crash*, fast_build_mode.json, podman/*, Scripts/*, doc/steam*, steam*, RevolutionaryGamesCommon/*"
export_path="builds/Thrive.x86_64"
script_export_mode=1
script_encryption_key=""
Expand All @@ -31,7 +31,7 @@ runnable=true
custom_features=""
export_filter="all_resources"
include_filter="*.json, *.txt, *.yml"
exclude_filter="test/*, builds/*, build/*, build-debug/*, *mono_crash*, fast_build_mode.json, docker/*, Scripts/*, doc/steam*, steam*, RevolutionaryGamesCommon/*"
exclude_filter="test/*, builds/*, build/*, build-debug/*, *mono_crash*, fast_build_mode.json, podman/*, Scripts/*, doc/steam*, steam*, RevolutionaryGamesCommon/*"
export_path="builds/Thrive.exe"
script_export_mode=1
script_encryption_key=""
Expand Down Expand Up @@ -74,7 +74,7 @@ runnable=false
custom_features=""
export_filter="all_resources"
include_filter="*.json, *.txt, *.yml"
exclude_filter="test/*, builds/*, build/*, build-debug/*, *mono_crash*, fast_build_mode.json, docker/*, Scripts/*, doc/steam*, steam*, RevolutionaryGamesCommon/*"
exclude_filter="test/*, builds/*, build/*, build-debug/*, *mono_crash*, fast_build_mode.json, podman/*, Scripts/*, doc/steam*, steam*, RevolutionaryGamesCommon/*"
export_path="builds/Thrive.exe"
script_export_mode=1
script_encryption_key=""
Expand Down Expand Up @@ -117,7 +117,7 @@ runnable=true
custom_features=""
export_filter="all_resources"
include_filter="*.json, *.txt, *.yml"
exclude_filter="test/*, builds/*, build/*, build-debug/*, *mono_crash*, fast_build_mode.json, docker/*, Scripts/*, doc/steam*, steam*, RevolutionaryGamesCommon/*"
exclude_filter="test/*, builds/*, build/*, build-debug/*, *mono_crash*, fast_build_mode.json, podman/*, Scripts/*, doc/steam*, steam*, RevolutionaryGamesCommon/*"
export_path="builds/Thrive.zip"
script_export_mode=1
script_encryption_key=""
Expand Down Expand Up @@ -191,7 +191,7 @@ runnable=false
custom_features="steam"
export_filter="all_resources"
include_filter="*.json, doc/*.txt, assets/*.txt, *.yml, LICENSE.txt"
exclude_filter="test/*, builds/*, build/*, build-debug/*, *mono_crash*, fast_build_mode.json, docker/*, Scripts/*, RevolutionaryGamesCommon/*"
exclude_filter="test/*, builds/*, build/*, build-debug/*, *mono_crash*, fast_build_mode.json, podman/*, Scripts/*, RevolutionaryGamesCommon/*"
export_path="builds/Thrive.x86_64"
script_export_mode=1
script_encryption_key=""
Expand All @@ -216,7 +216,7 @@ runnable=false
custom_features="steam"
export_filter="all_resources"
include_filter="*.json, doc/*.txt, assets/*.txt, *.yml, LICENSE.txt"
exclude_filter="test/*, builds/*, build/*, build-debug/*, *mono_crash*, fast_build_mode.json, docker/*, Scripts/*, RevolutionaryGamesCommon/*"
exclude_filter="test/*, builds/*, build/*, build-debug/*, *mono_crash*, fast_build_mode.json, podman/*, Scripts/*, RevolutionaryGamesCommon/*"
export_path="builds/Thrive.exe"
script_export_mode=1
script_encryption_key=""
Expand Down Expand Up @@ -285,7 +285,7 @@ runnable=true
custom_features=""
export_filter="all_resources"
include_filter="*.json, *.txt, *.yml"
exclude_filter="test/*, builds/*, build/*, build-debug/*, *mono_crash*, fast_build_mode.json, docker/*, Scripts/*, doc/steam*, steam*, RevolutionaryGamesCommon/*"
exclude_filter="test/*, builds/*, build/*, build-debug/*, *mono_crash*, fast_build_mode.json, podman/*, Scripts/*, doc/steam*, steam*, RevolutionaryGamesCommon/*"
export_path="builds/Thrive.html"
script_export_mode=1
script_encryption_key=""
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 19fa433

Please sign in to comment.