From c370ce5b5c78e46573cdbbaf85d13ee7eee60985 Mon Sep 17 00:00:00 2001 From: Wvader <34067397+wvader@users.noreply.github.com> Date: Sun, 30 Oct 2022 16:52:18 +0000 Subject: [PATCH] Remove Redis dependency --- CodeLiturgy.Data.Auth/appsettings.json | 6 ++---- CodeLiturgy.Views/Dockerfile | 12 ++++++------ CodeLiturgy.Views/appsettings.json | 2 -- README.md | 3 ++- docker-compose.db.only.yml | 6 +----- 5 files changed, 11 insertions(+), 18 deletions(-) diff --git a/CodeLiturgy.Data.Auth/appsettings.json b/CodeLiturgy.Data.Auth/appsettings.json index 0a4a6fc..b0a056a 100644 --- a/CodeLiturgy.Data.Auth/appsettings.json +++ b/CodeLiturgy.Data.Auth/appsettings.json @@ -7,12 +7,10 @@ }, "AllowedHosts": "*", "ConnectionStringDocker": { - "MySQL": "server=db;user=blueuser;password=dXjw127124dJ;database=bluedb;", - "Redis": "redis://redisinstance:6379" + "MySQL": "server=db;user=blueuser;password=dXjw127124dJ;database=bluedb;" }, "ConnectionStringNoDocker": { - "MySQL": "server=localhost;user=blueuser;password=dXjw127124dJ;database=bluedb;", - "Redis": "redis://localhost:6379" + "MySQL": "server=localhost;user=blueuser;password=dXjw127124dJ;database=bluedb;" }, "AuthSettings": { "SecretKey": "iJWHDmHLpUA283sqsfhqGbMRdRj1PVkH" diff --git a/CodeLiturgy.Views/Dockerfile b/CodeLiturgy.Views/Dockerfile index 82be3d8..a0f6500 100644 --- a/CodeLiturgy.Views/Dockerfile +++ b/CodeLiturgy.Views/Dockerfile @@ -5,16 +5,16 @@ EXPOSE 443 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["BlueWest.Views/BlueWest.Views.csproj", "BlueWest.Views/"] -RUN dotnet restore "BlueWest.Views/BlueWest.Views.csproj" +COPY ["CodeLiturgy.Views/CodeLiturgy.Views.csproj", "CodeLiturgy.Views/"] +RUN dotnet restore "CodeLiturgy.Views/CodeLiturgy.Views.csproj" COPY . . -WORKDIR "/src/BlueWest.Views" -RUN dotnet build "BlueWest.Views.csproj" -c Release -o /app/build +WORKDIR "/src/CodeLiturgy.Views" +RUN dotnet build "CodeLiturgy.Views.csproj" -c Release -o /app/build FROM build AS publish -RUN dotnet publish "BlueWest.Views.csproj" -c Release -o /app/publish +RUN dotnet publish "CodeLiturgy.Views.csproj" -c Release -o /app/publish FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "BlueWest.Views.dll"] +ENTRYPOINT ["dotnet", "CodeLiturgy.Views.dll"] diff --git a/CodeLiturgy.Views/appsettings.json b/CodeLiturgy.Views/appsettings.json index 849eca1..65cc49f 100644 --- a/CodeLiturgy.Views/appsettings.json +++ b/CodeLiturgy.Views/appsettings.json @@ -8,11 +8,9 @@ "mode": "no-docker", "AllowedHosts": "*", "ConnectionStringDocker": { - "Redis": "redis://redisinstance:6379", "MySQL": "server=db;user=blueuser;password=dXjw127124dJ;database=bluedb;" }, "ConnectionStringNoDocker": { - "Redis": "redis://localhost:6379", "MySQL": "server=localhost;user=blueuser;password=dXjw127124dJ;database=bluedb;" }, "AuthSettings": { diff --git a/README.md b/README.md index cda3857..9a543b3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ -# BlueWest Project +# CodeLiturgy Dashboard +Dashboard for managing sites, this includes setting up an environments. ## Using docker diff --git a/docker-compose.db.only.yml b/docker-compose.db.only.yml index e11e6dd..0acf328 100644 --- a/docker-compose.db.only.yml +++ b/docker-compose.db.only.yml @@ -14,8 +14,4 @@ services: - "3306:3306" volumes: - ./docker-entrypoint-initdb.d/:/docker-entrypoint-initdb.d/ - redis-instance: - image: "redislabs/redismod" - ports: - - "6379:6379" - container_name: BW1_REDIS +