diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml index 13c50cb..9b82680 100644 --- a/.github/workflows/build-beta.yml +++ b/.github/workflows/build-beta.yml @@ -22,11 +22,6 @@ jobs: fail-fast: false matrix: include: - - version: "0.9.3.0" - tag: alpine-beta - folder: beta/alpine - file: Dockerfile - platforms: linux/amd64,linux/arm64 - version: master tag: source folder: build/latest diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml index 3bb7196..ddcdfb9 100644 --- a/.github/workflows/build-main.yml +++ b/.github/workflows/build-main.yml @@ -69,6 +69,12 @@ jobs: file: Dockerfile.noscreen platforms: linux/amd64,linux/arm64 sha1: a4bcd861626195af80cc1f962d3a2f4528859ad2 + - version: "0.9.3.0" + tag: alpine-beta + folder: build/latest + file: Dockerfile.alpine + platforms: linux/amd64,linux/arm64 + sha1: a4bcd861626195af80cc1f962d3a2f4528859ad2 steps: - name: Checkout Codebase diff --git a/beta/alpine/defaults/OpenSim.ini b/beta/alpine/defaults/OpenSim.ini deleted file mode 100644 index 06e02e1..0000000 --- a/beta/alpine/defaults/OpenSim.ini +++ /dev/null @@ -1,39 +0,0 @@ - -[Const] - BaseHostname = "localhost" - BaseURL = http://${Const|BaseHostname} - PublicPort = "9000" - PrivURL = ${Const|BaseURL} - PrivatePort = "8003" - -[Permissions] - automatic_gods = false - implicit_gods = false - allow_grid_gods = true - -[Network] - http_listener_port = 9000 - ExternalHostNameForLSL = ${Const|BaseHostname} - shard = "OpenSim" - -[ClientStack.LindenCaps] - Cap_GetTexture = "localhost" - Cap_GetMesh = "localhost" - Cap_AvatarPickerSearch = "localhost" - Cap_GetDisplayNames = "localhost" - -[BulletSim] - AvatarToAvatarCollisionsByDefault = true - -[XEngine] - AppDomainLoading = false - DeleteScriptsOnStartup = false - -[OSSL] - Include-osslDefaultEnable = "config-include/osslDefaultEnable.ini" - -[Architecture] - Include-Architecture = "config-include/Standalone.ini" - -[WebStats] - enabled = true diff --git a/beta/alpine/defaults/SQLiteStandalone.ini b/beta/alpine/defaults/SQLiteStandalone.ini deleted file mode 100644 index 200a9c9..0000000 --- a/beta/alpine/defaults/SQLiteStandalone.ini +++ /dev/null @@ -1,39 +0,0 @@ -; These are the initialization settings for running OpenSim Standalone with an SQLite database - -[DatabaseService] - StorageProvider = "OpenSim.Data.SQLite.dll" - ConnectionString = "URI=file:sqlite-database/OpenSim.db,version=3,UseUTF16Encoding=True" - -[AssetService] - ConnectionString = "URI=file:sqlite-database/Asset.db,version=3" - -; The HGAssetService section controls the connection given to the AssetService in a Hypergrid configuration. -; This has to be separate from [AssetService] because the Hypergrid facing connector uses [HGAssetService] for its config data instead. -; However, the internal asset service will still use the [AssetService] section. -; Therefore, you will almost certainly want the ConnectionString in [HGAssetService] to be the same as in [AssetService] -; so that they both access the same database. -; This issue does not apply to normal MySQL/MSSQL configurations, since by default they use the settings in [DatabaseService] and -; do not have separate connection strings for different services. -[HGAssetService] - ConnectionString = "URI=file:sqlite-database/Asset.db,version=3" - -[InventoryService] - ;ConnectionString = "URI=file:inventory.db,version=3" - ; if you have a legacy inventory store use the connection string below - ConnectionString = "URI=file:sqlite-database/inventory.db,version=3,UseUTF16Encoding=True" - -[AvatarService] - ConnectionString = "URI=file:sqlite-database/avatars.db,version=3" - -[AuthenticationService] - ConnectionString = "URI=file:sqlite-database/auth.db,version=3" - -[UserAccountService] - ConnectionString = "URI=file:sqlite-database/userprofiles.db,version=3" - -[GridUserService] - ConnectionString = "URI=file:sqlite-database/griduser.db,version=3" - -[FriendsService] - ConnectionString = "URI=file:sqlite-database/friends.db,version=3" - diff --git a/beta/alpine/defaults/StandaloneCommon.ini b/beta/alpine/defaults/StandaloneCommon.ini deleted file mode 100644 index b9e9fc5..0000000 --- a/beta/alpine/defaults/StandaloneCommon.ini +++ /dev/null @@ -1,43 +0,0 @@ -; This is the main configuration file for an instance of OpenSim running in standalone mode - -[Hypergrid] - HomeURI = "${Const|BaseURL}:${Const|PublicPort}" - -[Modules] - AssetCaching = "FlotsamAssetCache" - Include-FlotsamCache = "config-include/FlotsamCache.ini" - -[AssetService] - DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" - AssetLoaderArgs = "assets/AssetSets.xml" - -[LibraryModule] - LibraryName = "Library" - -[LoginService] - WelcomeMessage = "OpenSimulator is running!" - SRV_HomeURI = "${Hypergrid|HomeURI}" - SRV_InventoryServerURI = "${Const|BaseURL}:${Const|PublicPort}" - SRV_AssetServerURI = "${Const|BaseURL}:${Const|PublicPort}" - SRV_ProfileServerURI = "${Const|BaseURL}:${Const|PublicPort}" - SRV_FriendsServerURI = "${Const|BaseURL}:${Const|PublicPort}" - SRV_IMServerURI = "${Const|BaseURL}:${Const|PublicPort}" - MapTileURL = "${Const|BaseURL}:${Const|PublicPort}/" - -[GridInfoService] - login = ${Const|BaseURL}:${Const|PublicPort}/ - gridname = "OpenSimulator Instance" - gridnick = "osss" - welcome = ${Const|BaseURL}:8080 - -[GatekeeperService] - AllowTeleportsToAnyRegion = true - -[EntityTransfer] - AccountForAppearance = "Test User, Astronaut Smith" - -[UserProfilesService] - Enabled = false - LocalServiceModule = "OpenSim.Services.UserProfilesService.dll:UserProfilesService" - UserAccountService = OpenSim.Services.UserAccountService.dll:UserAccountService - AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" diff --git a/beta/alpine/Dockerfile b/build/latest/Dockerfile.alpine similarity index 94% rename from beta/alpine/Dockerfile rename to build/latest/Dockerfile.alpine index ed1254c..a4f6ec4 100644 --- a/beta/alpine/Dockerfile +++ b/build/latest/Dockerfile.alpine @@ -25,7 +25,7 @@ EXPOSE 9000 WORKDIR /opt/opensim/bin -COPY docker-entrypoint.sh /usr/local/bin/ +COPY docker-entrypoint.ash /usr/local/bin/docker-entrypoint.sh ENTRYPOINT ["docker-entrypoint.sh"] CMD [ "screen", "-S", "OpenSim", "-D", "-m", "dotnet", "OpenSim.dll" ] diff --git a/beta/alpine/docker-entrypoint.sh b/build/latest/docker-entrypoint.ash old mode 100755 new mode 100644 similarity index 100% rename from beta/alpine/docker-entrypoint.sh rename to build/latest/docker-entrypoint.ash