Skip to content

Commit

Permalink
Prerelease 10.0.0-rc1
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander van Delft committed Jan 27, 2025
1 parent d23fc7d commit 2452462
Show file tree
Hide file tree
Showing 11 changed files with 146 additions and 18 deletions.
2 changes: 1 addition & 1 deletion CDP4Authentication/CDP4Authentication.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net9.0</TargetFramework>
<Company>Starion Group S.A.</Company>
<Title>CDP4Authentication-CE</Title>
<Version>9.0.0</Version>
<Version>10.0.0</Version>
<Description>CDP4-COMET Library to support the implementation of authentication</Description>
<Copyright>Copyright © Starion Group S.A.</Copyright>
<Authors>Sam Gerené, Alex Vorobiev, Alexander van Delft</Authors>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net9.0</TargetFramework>
<Company>Starion Group S.A.</Company>
<Title>CDP4DatabaseAuthentication-CE</Title>
<Version>9.0.0</Version>
<Version>10.0.0</Version>
<Description>CDP4-COMET Database authentication</Description>
<Copyright>Copyright © Starion Group S.A.</Copyright>
<Authors>Sam Gerené, Alex Vorobiev, Alexander van Delft</Authors>
Expand Down
8 changes: 4 additions & 4 deletions CDP4Orm/CDP4Orm.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFramework>net9.0</TargetFramework>
<Company>Starion Group S.A.</Company>
<Title>CDP4Orm-CE</Title>
<Version>9.0.0</Version>
<Version>10.0.0</Version>
<Description>CDP4-COMET Data-Model Object Relational Mapping</Description>
<Copyright>Copyright © Starion Group S.A.</Copyright>
<Authors>Sam Gerené, Alex Vorobiev, Alexander van Delft</Authors>
Expand Down Expand Up @@ -75,9 +75,9 @@
<EmbeddedResource Include="MigrationScript\SiteDirectory_20210108_6_3_0_0_Model_Updates.sql" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CDP4JsonSerializer-CE" Version="28.0.0-rc30" />
<PackageReference Include="Npgsql" Version="9.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
<PackageReference Include="CDP4JsonSerializer-CE" Version="28.0.0-rc31" />
<PackageReference Include="Npgsql" Version="9.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
</ItemGroup>

<ItemGroup Label="override transitive vulnerable dependency">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net9.0</TargetFramework>
<Company>Starion Group S.A.</Company>
<Title>CDP4WspDatabaseAuthentication-CE</Title>
<Version>9.0.0</Version>
<Version>10.0.0</Version>
<Description>CDP4-COMET WSP Database authentication</Description>
<Copyright>Copyright © Starion Group S.A.</Copyright>
<Authors>Sam Gerené, Alex Vorobiev, Alexander van Delft</Authors>
Expand Down
1 change: 1 addition & 0 deletions COMET-WebServices.sln
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
docker-compose-nginx.yml = docker-compose-nginx.yml
docker-compose.yml = docker-compose.yml
Dockerfile = Dockerfile
DockerfilePreRelease = DockerfilePreRelease
Nuget.Config = Nuget.Config
README.md = README.md
EndProjectSection
Expand Down
10 changes: 5 additions & 5 deletions CometServer/CometServer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFramework>net9.0</TargetFramework>
<Company>Starion Group S.A.</Company>
<Title>CometServer-CE</Title>
<Version>9.0.0</Version>
<Version>10.0.0</Version>
<Description>CDP4-COMET Services API</Description>
<Copyright>Copyright © Starion Group S.A.</Copyright>
<PackageLicenseExpression>AGPL-3.0-only</PackageLicenseExpression>
Expand All @@ -19,9 +19,9 @@
<ItemGroup>
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
<PackageReference Include="Carter" Version="9.0.0" />
<PackageReference Include="CDP4DalJsonSerializer-CE" Version="28.0.0-rc30" />
<PackageReference Include="CDP4MessagePackSerializer-CE" Version="28.0.0-rc30" />
<PackageReference Include="CDP4ServicesMessaging-CE" Version="28.0.0-rc30" />
<PackageReference Include="CDP4JsonSerializer-CE" Version="28.0.0-rc31" />
<PackageReference Include="CDP4MessagePackSerializer-CE" Version="28.0.0-rc31" />
<PackageReference Include="CDP4ServicesMessaging-CE" Version="28.0.0-rc31" />
<PackageReference Include="FluentValidation" Version="11.11.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="9.0.1" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.1" />
Expand All @@ -39,7 +39,7 @@
<PackageReference Include="SharpZipLib" Version="1.4.2" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.1" />
<PackageReference Include="System.Resources.Extensions" Version="9.0.1" />
<PackageReference Include="MailKit" Version="4.9.0" />
<PackageReference Include="MailKit" Version="4.10.0" />
</ItemGroup>
<ItemGroup Label="Transitive Dependency overrides">
<PackageReference Include="System.Text.Json" Version="9.0.1" />
Expand Down
3 changes: 1 addition & 2 deletions CometServer/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,7 @@ public void ConfigureContainer(ContainerBuilder builder)
builder.RegisterType<DefaultPermissionProvider>().As<IDefaultPermissionProvider>().SingleInstance();
builder.RegisterAssemblyTypes(typeof(IMetaInfo).Assembly).Where(x => typeof(IMetaInfo).IsAssignableFrom(x)).AsImplementedInterfaces().PropertiesAutowired(PropertyWiringOptions.AllowCircularDependencies).InstancePerLifetimeScope();
builder.RegisterType<MetaInfoProvider>().As<IMetaDataProvider>().As<IMetaInfoProvider>().PropertiesAutowired(PropertyWiringOptions.AllowCircularDependencies).InstancePerLifetimeScope();
builder.Register(_ =>
new Cdp4DalJsonSerializer(false)).As<ICdp4JsonSerializer>().InstancePerLifetimeScope();
builder.Register(_ => new Cdp4DalJsonSerializer(false)).As<ICdp4JsonSerializer>().InstancePerLifetimeScope();
builder.RegisterType<MessagePackSerializer>().As<IMessagePackSerializer>().InstancePerLifetimeScope();

// authentication services
Expand Down
54 changes: 54 additions & 0 deletions DockerfilePreRelease
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# syntax=docker/dockerfile:1.4

FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build-env
WORKDIR /app
COPY CDP4Authentication CDP4Authentication
COPY CDP4DatabaseAuthentication CDP4DatabaseAuthentication
COPY CDP4WspDatabaseAuthentication CDP4WspDatabaseAuthentication
COPY CDP4Orm CDP4Orm
COPY VersionFileCreator VersionFileCreator
COPY CometServer CometServer

RUN --mount=type=secret,id=SDK_PRE_RELEASE_NUGET_USERNAME --mount=type=secret,id=SDK_PRE_RELEASE_NUGET_PASSWORD SDK_PRE_RELEASE_NUGET_PASSWORD=$(cat /run/secrets/SDK_PRE_RELEASE_NUGET_PASSWORD) \
&& export SDK_PRE_RELEASE_NUGET_PASSWORD \
&& SDK_PRE_RELEASE_NUGET_USERNAME=$(cat /run/secrets/SDK_PRE_RELEASE_NUGET_USERNAME) \
&& export SDK_PRE_RELEASE_NUGET_USERNAME \
&& dotnet nuget add source https://nuget.pkg.github.com/STARIONGROUP/index.json --name github --username ${SDK_PRE_RELEASE_NUGET_USERNAME} --password ${SDK_PRE_RELEASE_NUGET_PASSWORD} --store-password-in-clear-text


RUN dotnet build CDP4DatabaseAuthentication -c Release
RUN dotnet build CDP4WspDatabaseAuthentication -c Release
RUN dotnet publish -r linux-x64 CometServer -c Release -o /app/CometServer/bin/Release/publish

FROM mcr.microsoft.com/dotnet/aspnet:9.0.1-alpine3.21
WORKDIR /app
RUN mkdir /app/logs
RUN mkdir /app/storage
RUN mkdir /app/tempstorage
RUN mkdir /app/upload

RUN mkdir /app/Authentication/
RUN mkdir /app/Authentication/CDP4Database
RUN mkdir /app/Authentication/CDP4WspDatabase
RUN mkdir /app/VersionFileCreator

COPY --from=build-env /app/CometServer/bin/Release/publish .
RUN rm /app/appsettings.Development.json
RUN mv /app/appsettings.Production.json /app/appsettings.json

# COPY CDP4DatabaseAuthentication plugin
COPY --from=build-env /app/CDP4DatabaseAuthentication/bin/Release/CDP4DatabaseAuthentication.dll /app/Authentication/CDP4Database/CDP4DatabaseAuthentication.dll
COPY --from=build-env /app/CDP4DatabaseAuthentication/bin/Release/config.json /app/Authentication/CDP4Database/config.json

# COPY CDP4WspDatabaseAuthentication plugin
COPY --from=build-env /app/CDP4WspDatabaseAuthentication/bin/Release/CDP4WspDatabaseAuthentication.dll /app/Authentication/CDP4WspDatabase/CDP4WspDatabaseAuthentication.dll
COPY --from=build-env /app/CDP4WspDatabaseAuthentication/bin/Release/config.json /app/Authentication/CDP4WspDatabase/config.json

COPY --from=build-env /app/VersionFileCreator/bin/Release /app/VersionFileCreator
RUN dotnet /app/VersionFileCreator/VersionFileCreator.dll path:/app
RUN rm -r /app/VersionFileCreator

# set to use the non-root USER here
RUN chown -R $APP_UID /app
USER $APP_UID
CMD ["dotnet", "CometServer.dll"]
13 changes: 10 additions & 3 deletions README.Create-RC.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
docker pull mcr.microsoft.com/dotnet/sdk:8.0
DOCKER_BUILDKIT=1 docker build -f Dockerfile -t stariongroup/comet-webservices-community-edition:8.0.0-rc39 .
docker push stariongroup/comet-webservices-community-edition:8.0.0-rc39
docker pull mcr.microsoft.com/dotnet/sdk:9.0
DOCKER_BUILDKIT=1 docker build -f Dockerfile -t stariongroup/comet-webservices-community-edition:10.0.0-rc1 .
docker push stariongroup/comet-webservices-community-edition:10.0.0-rc1


Pre-Release having a SDK pre release on GitHub:

export SDK_PRE_RELEASE_NUGET_USERNAME=<GitHub username>
export SDK_PRE_RELEASE_NUGET_PASSWORD=<GitHub token>
DOCKER_BUILDKIT=1 docker build --secret id=SDK_PRE_RELEASE_NUGET_USERNAME,env=SDK_PRE_RELEASE_NUGET_USERNAME --secret id=SDK_PRE_RELEASE_NUGET_PASSWORD,env=SDK_PRE_RELEASE_NUGET_PASSWORD -f DockerfilePreRelease -t stariongroup/comet-webservices-community-edition:10.0.0-rc1 .
67 changes: 67 additions & 0 deletions docker-compose-integration-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
version: '3.8'
services:

comet_db:
image: stariongroup/cdp4-test-database-community-edition:3.4.0
container_name: comet-db
shm_size: 2gb
restart: always
command: postgres -c max_locks_per_transaction=1024
environment:
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=pass
hostname: comet-db
networks:
comet:
aliases:
- comet-db
ports:
- '5432:5432'
expose:
- '5432'
volumes:
- comet-db-data:/var/lib/postgresql/data
- comet-db-logs:/logs

comet_webservices:
image: stariongroup/comet-webservices-community-edition:10.0.0-rc1
container_name: comet-webservices
shm_size: 512m
restart: always
hostname: comet-webservices
networks:
comet:
aliases:
- comet-webservices
depends_on:
- comet_db
ports:
- "5000:5000"
expose:
- '5000'
volumes:
- comet-ws-logs:/app/logs
- comet-ws-storage:/app/storage
- comet-ws-uplaod:/app/upload

rabbitmq:
image: "rabbitmq:3-management"
container_name: rabbitmq
restart: always
ports:
- 15672:15672
networks:
- comet
volumes:
- 'rabbitmq_data:/data'

networks:
comet:

volumes:
comet-db-data:
comet-db-logs:
comet-ws-logs:
comet-ws-storage:
comet-ws-uplaod:
rabbitmq_data:
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
- comet-db-logs:/logs

comet_webservices:
image: stariongroup/comet-webservices-community-edition:8.0.1
image: stariongroup/comet-webservices-community-edition:10.0.0-rc1
container_name: comet-webservices
shm_size: 512m
restart: always
Expand Down

0 comments on commit 2452462

Please sign in to comment.