Retropex/btcpayserver-docker
1
0
Fork 0
mirror of https://github.com/Retropex/btcpayserver-docker.git synced 2025-05-12 21:10:42 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

bump the generator to 3.1

Browse Source
This commit is contained in:
nicolas.dorier 2019-12-05 21:45:51 +09:00
parent 2002d6eaa0
commit 7efe694d59
No known key found for this signature in database
GPG Key ID: 6618763EF09186FE
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker-compose-generator/docker-compose-generator.sln
View File

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15 # Visual Studio Version 16
VisualStudioVersion = 15.0.26124.0 VisualStudioVersion = 16.0.29519.181
MinimumVisualStudioVersion = 15.0.26124.0 MinimumVisualStudioVersion = 15.0.26124.0
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "docker-compose-generator", "src\docker-compose-generator.csproj", "{0900AF35-48E8-46E2-85B3-BA3847EE0844}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "docker-compose-generator", "src\docker-compose-generator.csproj", "{0900AF35-48E8-46E2-85B3-BA3847EE0844}"
EndProject EndProject
@ -10,6 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{8C1C711D-D
..\.circleci\config.yml = ..\.circleci\config.yml ..\.circleci\config.yml = ..\.circleci\config.yml
linuxamd64.Dockerfile = linuxamd64.Dockerfile linuxamd64.Dockerfile = linuxamd64.Dockerfile
linuxarm32v7.Dockerfile = linuxarm32v7.Dockerfile linuxarm32v7.Dockerfile = linuxarm32v7.Dockerfile
linuxarm64v8.Dockerfile = linuxarm64v8.Dockerfile
EndProjectSection EndProjectSection
EndProject EndProject
Global Global

4
docker-compose-generator/linuxamd64.Dockerfile
View File

@ -1,5 +1,5 @@
# #
FROM mcr.microsoft.com/dotnet/core/sdk:2.1.505-alpine3.7 AS builder FROM mcr.microsoft.com/dotnet/core/sdk:3.1.100 AS builder
WORKDIR /source WORKDIR /source
COPY src/docker-compose-generator.csproj docker-compose-generator.csproj COPY src/docker-compose-generator.csproj docker-compose-generator.csproj
# Cache some dependencies # Cache some dependencies
@ -8,7 +8,7 @@ COPY src/. .
RUN dotnet publish --output /app/ --configuration Release RUN dotnet publish --output /app/ --configuration Release
# #
FROM mcr.microsoft.com/dotnet/core/runtime:2.1.9-alpine3.7 FROM mcr.microsoft.com/dotnet/core/runtime:3.1.0-buster-slim
LABEL org.btcpayserver.image=docker-compose-generator LABEL org.btcpayserver.image=docker-compose-generator
WORKDIR /datadir WORKDIR /datadir
WORKDIR /app WORKDIR /app

4
docker-compose-generator/linuxarm32v7.Dockerfile
View File

@ -1,5 +1,5 @@
# This is a manifest image, will pull the image with the same arch as the builder machine # This is a manifest image, will pull the image with the same arch as the builder machine
FROM mcr.microsoft.com/dotnet/core/sdk:2.1.505 AS builder FROM mcr.microsoft.com/dotnet/core/sdk:3.1.100 AS builder
WORKDIR /source WORKDIR /source
COPY src/docker-compose-generator.csproj docker-compose-generator.csproj COPY src/docker-compose-generator.csproj docker-compose-generator.csproj
# Cache some dependencies # Cache some dependencies
@ -8,7 +8,7 @@ COPY src/. .
RUN dotnet publish --output /app/ --configuration Release RUN dotnet publish --output /app/ --configuration Release
# Force the builder machine to take make an arm runtime image. This is fine as long as the builder does not run any program # Force the builder machine to take make an arm runtime image. This is fine as long as the builder does not run any program
FROM mcr.microsoft.com/dotnet/core/runtime:2.1.9-stretch-slim-arm32v7 FROM mcr.microsoft.com/dotnet/core/runtime:3.1.0-buster-slim-arm32v7
LABEL org.btcpayserver.image=docker-compose-generator LABEL org.btcpayserver.image=docker-compose-generator
WORKDIR /datadir WORKDIR /datadir

8
docker-compose-generator/linuxarm64v8.Dockerfile
View File

@ -1,14 +1,14 @@
# This is a manifest image, will pull the image with the same arch as the builder machine # This is a manifest image, will pull the image with the same arch as the builder machine
FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100-preview7 AS builder FROM mcr.microsoft.com/dotnet/core/sdk:3.1.100 AS builder
WORKDIR /source WORKDIR /source
COPY src/docker-compose-generator.csproj docker-compose-generator.csproj COPY src/docker-compose-generator.csproj docker-compose-generator.csproj
# Cache some dependencies # Cache some dependencies
RUN dotnet restore /p:TargetFrameworkOverride=netcoreapp3.0 RUN dotnet restore
COPY src/. . COPY src/. .
RUN dotnet publish --output /app/ --configuration Release /p:TargetFrameworkOverride=netcoreapp3.0 RUN dotnet publish --output /app/ --configuration Release
# Force the builder machine to take make an arm runtime image. This is fine as long as the builder does not run any program # Force the builder machine to take make an arm runtime image. This is fine as long as the builder does not run any program
FROM mcr.microsoft.com/dotnet/core/runtime:3.0.0-preview7-buster-slim-arm64v8 FROM mcr.microsoft.com/dotnet/core/runtime:3.1.0-buster-slim-arm64v8
LABEL org.btcpayserver.image=docker-compose-generator LABEL org.btcpayserver.image=docker-compose-generator
WORKDIR /datadir WORKDIR /datadir

2
docker-compose-generator/src/docker-compose-generator.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<LangVersion>7.3</LangVersion> <LangVersion>7.3</LangVersion>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.1</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">$(TargetFrameworkOverride)</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">$(TargetFrameworkOverride)</TargetFramework>
<RootNamespace>DockerGenerator</RootNamespace> <RootNamespace>DockerGenerator</RootNamespace>
</PropertyGroup> </PropertyGroup>