Compare commits
No commits in common. "main" and "production" have entirely different histories.
main
...
production
@ -1,9 +0,0 @@
|
|||||||
|
|
||||||
kind: pipeline
|
|
||||||
type: docker
|
|
||||||
name: "test"
|
|
||||||
steps:
|
|
||||||
- name: test
|
|
||||||
image: harbor.front.kjuulh.io/docker-proxy/library/bash:latest
|
|
||||||
commands:
|
|
||||||
- echo 'Run tests'
|
|
@ -1,3 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json"
|
|
||||||
}
|
|
@ -1,9 +1,9 @@
|
|||||||
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
|
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
EXPOSE 443
|
EXPOSE 443
|
||||||
|
|
||||||
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
|
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
|
|
||||||
COPY *.sln .
|
COPY *.sln .
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"sdk": {
|
"sdk": {
|
||||||
"version": "9.0.100",
|
"version": "6.0",
|
||||||
"rollForward": "latestMajor",
|
"rollForward": "latestMajor",
|
||||||
"allowPrerelease": true
|
"allowPrerelease": true
|
||||||
}
|
}
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net6.0</TargetFramework>
|
||||||
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
|
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.1.0"/>
|
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@ -11,5 +11,5 @@ namespace Todo.Core;
|
|||||||
public static class DependencyInjection
|
public static class DependencyInjection
|
||||||
{
|
{
|
||||||
public static IServiceCollection AddCore(this IServiceCollection services)
|
public static IServiceCollection AddCore(this IServiceCollection services)
|
||||||
=> services.AddMediatR(cfg => cfg.RegisterServicesFromAssembly(Assembly.GetExecutingAssembly()));
|
=> services.AddMediatR(Assembly.GetExecutingAssembly());
|
||||||
}
|
}
|
@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net6.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
@ -14,7 +14,8 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Mediatr" Version="12.4.1" />
|
<PackageReference Include="Mediatr" Version="9.0.0" />
|
||||||
|
<PackageReference Include="Mediatr.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net6.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
@ -11,7 +11,7 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.0"/>
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net6.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
@ -10,9 +10,9 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="MongoDB.Driver" Version="3.0.0"/>
|
<PackageReference Include="MongoDB.Driver" Version="2.13.2"/>
|
||||||
<PackageReference Include="MongoDB.Driver.Core" Version="2.30.0"/>
|
<PackageReference Include="MongoDB.Driver.Core" Version="2.13.2"/>
|
||||||
<PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="8.1.0"/>
|
<PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="5.0.1"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
# Install dependencies only when needed
|
# Install dependencies only when needed
|
||||||
FROM node:22-alpine AS deps
|
FROM node:14-alpine AS deps
|
||||||
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
|
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
|
||||||
RUN apk add --no-cache libc6-compat
|
RUN apk add --no-cache libc6-compat
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
@ -7,7 +7,7 @@ COPY package.json yarn.lock ./
|
|||||||
RUN yarn install --frozen-lockfile
|
RUN yarn install --frozen-lockfile
|
||||||
|
|
||||||
# Rebuild the source code only when needed
|
# Rebuild the source code only when needed
|
||||||
FROM node:22-alpine AS builder
|
FROM node:14-alpine AS builder
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
ARG NEXT_PUBLIC_SERVER_URL="http://localhost:5000"
|
ARG NEXT_PUBLIC_SERVER_URL="http://localhost:5000"
|
||||||
@ -17,7 +17,7 @@ COPY --from=deps /app/node_modules ./node_modules
|
|||||||
RUN yarn build
|
RUN yarn build
|
||||||
|
|
||||||
# Production image, copy all the files and run next
|
# Production image, copy all the files and run next
|
||||||
FROM node:22-alpine AS runner
|
FROM node:14-alpine AS runner
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
ENV NODE_ENV production
|
ENV NODE_ENV production
|
||||||
|
@ -8,28 +8,28 @@
|
|||||||
"lint": "next lint"
|
"lint": "next lint"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@microsoft/signalr": "8.0.7",
|
"@microsoft/signalr": "^6.0.0",
|
||||||
"@reduxjs/toolkit": "2.4.0",
|
"@reduxjs/toolkit": "^1.6.2",
|
||||||
"@tippyjs/react": "4.2.6",
|
"@tippyjs/react": "^4.2.6",
|
||||||
"axios": "1.7.8",
|
"axios": "^0.24.0",
|
||||||
"next": "15.0.3",
|
"next": "^12.2.5",
|
||||||
"next-pwa": "5.6.0",
|
"next-pwa": "^5.6.0",
|
||||||
"react": "18.3.1",
|
"react": "17.0.2",
|
||||||
"react-dom": "18.3.1",
|
"react-dom": "17.0.2",
|
||||||
"react-redux": "9.1.2",
|
"react-redux": "^7.2.6",
|
||||||
"react-textarea-autosize": "8.5.5",
|
"react-textarea-autosize": "^8.3.3",
|
||||||
"tailwindcss": "3.4.15"
|
"tailwindcss": "^2.2.19"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/react": "18.3.12",
|
"@types/react": "^17.0.34",
|
||||||
"@types/react-redux": "7.1.34",
|
"@types/react-redux": "^7.1.20",
|
||||||
"autoprefixer": "10.4.20",
|
"autoprefixer": "^10.4.0",
|
||||||
"cssnano": "7.0.6",
|
"cssnano": "^5.0.10",
|
||||||
"eslint": "9.15.0",
|
"eslint": "7",
|
||||||
"eslint-config-next": "15.0.3",
|
"eslint-config-next": "12.0.3",
|
||||||
"postcss": "8.4.49",
|
"postcss": "^8.3.11",
|
||||||
"postcss-import": "16.1.0",
|
"postcss-import": "^14.0.2",
|
||||||
"prettier": "3.4.1",
|
"prettier": "^2.5.1",
|
||||||
"typescript": "5.7.2"
|
"typescript": "^4.4.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
4484
src/client/yarn.lock
4484
src/client/yarn.lock
File diff suppressed because it is too large
Load Diff
@ -21,8 +21,6 @@ services:
|
|||||||
MONGODB__Host: db
|
MONGODB__Host: db
|
||||||
MONGODB__Port: 27017
|
MONGODB__Port: 27017
|
||||||
MONGODB__Database: todo
|
MONGODB__Database: todo
|
||||||
env_file:
|
|
||||||
- .env
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user