merge: bring in kaniko builds
commit3a155798a9
Author: surtur <a_mirre@utb.cz> Date: Wed Dec 2 03:08:12 2020 +0100 rm: get rid of unused launch settings [skip ci] commit3f775a110b
Author: surtur <a_mirre@utb.cz> Date: Sun Nov 29 21:08:11 2020 +0100 fix: clean build after restore * this fixes occasional situation when NuGets have not been restored yet but the clean build already running required them, which resulted a failed build commit42c6dfd3ba
Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 20:05:30 2020 +0100 chore: update make kaniko * skip ci commit1cc3df6619
Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 18:58:48 2020 +0100 chore: rm debug ls call skip ci commitbefe7880fc
Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 18:58:27 2020 +0100 revert: set kaniko context back to "." skip ci commit15d7de1996
Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 18:58:06 2020 +0100 chore: add make kaniko * skip ci commit5ed341f4ae
Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 17:13:27 2020 +0100 refactor: merge pipelines back commit732cd7d717
Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 17:12:39 2020 +0100 chore: don't wait and build commit11a9ab07ab
Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 17:11:08 2020 +0100 revert: kaniko don't give a **** about relpaths commita581457326
Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 16:23:28 2020 +0100 debug: see where we are commit1ef9a6831f
Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:58:50 2020 +0100 chore: try /src workspace for kaniko commit11d796f0dd
Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:30:21 2020 +0100 chore: add /src context for kaniko commit4b58c3f584
Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:22:18 2020 +0100 fix: rel paths are nicer to kaniko commit63601f7f47
Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:16:57 2020 +0100 chore: run wherever commit54fb45ec65
Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:06:42 2020 +0100 refactor: effectively revert907a470
and63bde0a
commiteece1e3dba
Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 14:52:23 2020 +0100 chore: move dockerbuilds to a separate pipeline * and run them on the main runner commit907a4702d8
Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 14:47:03 2020 +0100 chore: give kaniko relative paths in Dockerfile
This commit is contained in:
parent
5aa52dd687
commit
e64d137b2a
|
@ -18,11 +18,9 @@ steps:
|
|||
- name: release
|
||||
pull: always
|
||||
image: mcr.microsoft.com/dotnet/core/sdk:2.1-alpine
|
||||
depends_on:
|
||||
- debug
|
||||
commands:
|
||||
- dotnet clean
|
||||
- dotnet restore
|
||||
- dotnet clean
|
||||
- dotnet publish -c Release
|
||||
|
||||
- name: docker-release-build
|
||||
|
|
|
@ -3,12 +3,14 @@ FROM mcr.microsoft.com/dotnet/core/sdk:2.1-alpine
|
|||
COPY . /src
|
||||
WORKDIR /src
|
||||
RUN dotnet --version && dotnet --info
|
||||
RUN dotnet clean
|
||||
RUN dotnet restore
|
||||
RUN dotnet clean
|
||||
RUN dotnet build -c Release
|
||||
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:2.1
|
||||
|
||||
# debug drone
|
||||
RUN pwd
|
||||
COPY --from=0 /src/bin/Release/netcoreapp2.1/publish/ App/
|
||||
WORKDIR /App
|
||||
ENV ASPNETCORE_ENVIRONMENT=Release
|
||||
|
|
|
@ -4,8 +4,8 @@ COPY . /src
|
|||
WORKDIR /src
|
||||
|
||||
RUN dotnet --version && dotnet --info
|
||||
RUN dotnet clean
|
||||
RUN dotnet restore
|
||||
RUN dotnet clean
|
||||
|
||||
RUN dotnet build -c Debug
|
||||
|
||||
|
|
9
Makefile
9
Makefile
|
@ -5,6 +5,9 @@ dfiledev = $(dfile).dev
|
|||
lport = 8000
|
||||
lportdev = 8001
|
||||
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
|
||||
|
||||
|
@ -17,7 +20,7 @@ build:
|
|||
run:
|
||||
$(CC) run .
|
||||
|
||||
releasebuild: clean restore
|
||||
releasebuild: restore clean
|
||||
$(CC) publish -c Release
|
||||
|
||||
dockerbuild:
|
||||
|
@ -44,6 +47,10 @@ dockerdevrun:
|
|||
@echo ======================
|
||||
docker run --rm -p $(lportdev):5000 $(dtagdev)
|
||||
|
||||
kaniko:
|
||||
$(krelease)
|
||||
$(kdebug)
|
||||
|
||||
dockerdev: dockerdevbuild dockerdevrun
|
||||
|
||||
dockertest: dockerdevbuild dockerbuild
|
||||
|
|
|
@ -1,20 +1,5 @@
|
|||
{
|
||||
"iisSettings": {
|
||||
"windowsAuthentication": false,
|
||||
"anonymousAuthentication": true,
|
||||
"iisExpress": {
|
||||
"applicationUrl": "http://localhost:47798",
|
||||
"sslPort": 44311
|
||||
}
|
||||
},
|
||||
"profiles": {
|
||||
"IIS Express": {
|
||||
"commandName": "IISExpress",
|
||||
"launchBrowser": true,
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
}
|
||||
},
|
||||
"pwt_0x01_ng": {
|
||||
"commandName": "Project",
|
||||
"launchBrowser": false,
|
||||
|
|
Reference in New Issue