Compare commits
17 Commits
master
...
kaniko-tes
Author | SHA1 | Date | |
---|---|---|---|
surtur | 3a155798a9 | ||
surtur | 3f775a110b | ||
surtur | 42c6dfd3ba | ||
surtur | 1cc3df6619 | ||
surtur | befe7880fc | ||
surtur | 15d7de1996 | ||
surtur | 5ed341f4ae | ||
surtur | 732cd7d717 | ||
surtur | 11a9ab07ab | ||
surtur | a581457326 | ||
surtur | 1ef9a6831f | ||
surtur | 11d796f0dd | ||
surtur | 4b58c3f584 | ||
surtur | 63601f7f47 | ||
surtur | 54fb45ec65 | ||
surtur | eece1e3dba | ||
surtur | 907a4702d8 |
|
@ -18,11 +18,9 @@ steps:
|
||||||
- name: release
|
- name: release
|
||||||
pull: always
|
pull: always
|
||||||
image: mcr.microsoft.com/dotnet/core/sdk:2.1-alpine
|
image: mcr.microsoft.com/dotnet/core/sdk:2.1-alpine
|
||||||
depends_on:
|
|
||||||
- debug
|
|
||||||
commands:
|
commands:
|
||||||
- dotnet clean
|
|
||||||
- dotnet restore
|
- dotnet restore
|
||||||
|
- dotnet clean
|
||||||
- dotnet publish -c Release
|
- dotnet publish -c Release
|
||||||
|
|
||||||
- name: docker-release-build
|
- name: docker-release-build
|
||||||
|
|
|
@ -3,12 +3,14 @@ FROM mcr.microsoft.com/dotnet/core/sdk:2.1-alpine
|
||||||
COPY . /src
|
COPY . /src
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
RUN dotnet --version && dotnet --info
|
RUN dotnet --version && dotnet --info
|
||||||
RUN dotnet clean
|
|
||||||
RUN dotnet restore
|
RUN dotnet restore
|
||||||
|
RUN dotnet clean
|
||||||
RUN dotnet build -c Release
|
RUN dotnet build -c Release
|
||||||
|
|
||||||
FROM mcr.microsoft.com/dotnet/aspnet:2.1
|
FROM mcr.microsoft.com/dotnet/aspnet:2.1
|
||||||
|
|
||||||
|
# debug drone
|
||||||
|
RUN pwd
|
||||||
COPY --from=0 /src/bin/Release/netcoreapp2.1/publish/ App/
|
COPY --from=0 /src/bin/Release/netcoreapp2.1/publish/ App/
|
||||||
WORKDIR /App
|
WORKDIR /App
|
||||||
ENV ASPNETCORE_ENVIRONMENT=Release
|
ENV ASPNETCORE_ENVIRONMENT=Release
|
||||||
|
|
|
@ -4,8 +4,8 @@ COPY . /src
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
|
|
||||||
RUN dotnet --version && dotnet --info
|
RUN dotnet --version && dotnet --info
|
||||||
RUN dotnet clean
|
|
||||||
RUN dotnet restore
|
RUN dotnet restore
|
||||||
|
RUN dotnet clean
|
||||||
|
|
||||||
RUN dotnet build -c Debug
|
RUN dotnet build -c Debug
|
||||||
|
|
||||||
|
|
9
Makefile
9
Makefile
|
@ -5,6 +5,9 @@ dfiledev = $(dfile).dev
|
||||||
lport = 8000
|
lport = 8000
|
||||||
lportdev = 8001
|
lportdev = 8001
|
||||||
CC = dotnet
|
CC = dotnet
|
||||||
|
wdir = /src
|
||||||
|
krelease = docker run --rm -it -w=$(wdir) -v $$PWD:$(wdir) gcr.io/kaniko-project/executor -f=$(dfile) -c=$(wdir) --use-new-run --snapshotMode=redo --no-push
|
||||||
|
kdebug = docker run --rm -it -w=$(wdir) -v $$PWD:$(wdir) gcr.io/kaniko-project/executor -f=$(dfiledev) -c=$(wdir) --use-new-run --snapshotMode=redo --no-push
|
||||||
|
|
||||||
dev: restore build run
|
dev: restore build run
|
||||||
|
|
||||||
|
@ -17,7 +20,7 @@ build:
|
||||||
run:
|
run:
|
||||||
$(CC) run .
|
$(CC) run .
|
||||||
|
|
||||||
releasebuild: clean restore
|
releasebuild: restore clean
|
||||||
$(CC) publish -c Release
|
$(CC) publish -c Release
|
||||||
|
|
||||||
dockerbuild:
|
dockerbuild:
|
||||||
|
@ -44,6 +47,10 @@ dockerdevrun:
|
||||||
@echo ======================
|
@echo ======================
|
||||||
docker run --rm -p $(lportdev):5000 $(dtagdev)
|
docker run --rm -p $(lportdev):5000 $(dtagdev)
|
||||||
|
|
||||||
|
kaniko:
|
||||||
|
$(krelease)
|
||||||
|
$(kdebug)
|
||||||
|
|
||||||
dockerdev: dockerdevbuild dockerdevrun
|
dockerdev: dockerdevbuild dockerdevrun
|
||||||
|
|
||||||
dockertest: dockerdevbuild dockerbuild
|
dockertest: dockerdevbuild dockerbuild
|
||||||
|
|
|
@ -1,20 +1,5 @@
|
||||||
{
|
{
|
||||||
"iisSettings": {
|
|
||||||
"windowsAuthentication": false,
|
|
||||||
"anonymousAuthentication": true,
|
|
||||||
"iisExpress": {
|
|
||||||
"applicationUrl": "http://localhost:47798",
|
|
||||||
"sslPort": 44311
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"profiles": {
|
"profiles": {
|
||||||
"IIS Express": {
|
|
||||||
"commandName": "IISExpress",
|
|
||||||
"launchBrowser": true,
|
|
||||||
"environmentVariables": {
|
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"pwt_0x01_ng": {
|
"pwt_0x01_ng": {
|
||||||
"commandName": "Project",
|
"commandName": "Project",
|
||||||
"launchBrowser": false,
|
"launchBrowser": false,
|
||||||
|
|
Reference in New Issue