diff --git a/Jenkinsfile b/Jenkinsfile index d60d93856..ddd71e23c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -199,8 +199,9 @@ pipeline { } stage ('Publishing night-build') { - when { anyOf { - branch 'develop'; + when { + anyOf { + branch 'develop'; } } agent { label 'master' } @@ -217,8 +218,9 @@ pipeline { } stage ('Publishing preview') { - when { anyOf { - branch 'release/preview'; + when { + anyOf { + branch 'release/preview'; } } agent { label 'master' } @@ -257,6 +259,45 @@ pipeline { } } } + + stage ('Publishing docker-images') { + parallel { + stage('Build v1') { + agent { label 'linux' } + when { + anyOf { + branch 'latest' + expression { + return env.TAG_NAME && env.TAG_NAME.startsWith('v1.') + } + } + } + steps { + script { + def codename = env.TAG_NAME ? env.TAG_NAME : 'latest' + publishDockerImage('v1', codename) + } + } + } + + stage('Build v2') { + agent { label 'linux' } + when { + anyOf { + branch 'develop' + expression { + return env.TAG_NAME && env.TAG_NAME.startsWith('v2.') + } + } + } + steps { + script { + def codename = env.TAG_NAME ? env.TAG_NAME : 'dev' + publishDockerImage('v2', codename) + } + } + } + } } } @@ -300,3 +341,12 @@ def publishReleaseNotes(codename) { } } +def publishDockerImage(flavour, codename) { + def imageName = "evilbeaver/onescript:${codename}" + + docker.build( + imageName, + "--load -f install/builders/base-image/Dockerfile_${flavour} ." + ).push() +} + diff --git a/install/builders/base-image/Dockerfile_v1 b/install/builders/base-image/Dockerfile_v1 index 513cc9222..a1cc0c9db 100644 --- a/install/builders/base-image/Dockerfile_v1 +++ b/install/builders/base-image/Dockerfile_v1 @@ -8,4 +8,7 @@ LABEL MAINTAINER="EvilBeaver " ARG VERSION=stable RUN curl -L https://github.com/oscript-library/ovm/releases/latest/download/ovm.exe > ovm.exe \ - && mono ovm.exe use --install $VERSION \ No newline at end of file + && mono ovm.exe use --install $VERSION + +ENV OSCRIPTBIN=/root/.local/share/ovm/current/bin +ENV PATH="$OSCRIPTBIN:$PATH" diff --git a/install/builders/base-image/Dockerfile_v2 b/install/builders/base-image/Dockerfile_v2 index 689268ba0..7412f7d47 100644 --- a/install/builders/base-image/Dockerfile_v2 +++ b/install/builders/base-image/Dockerfile_v2 @@ -11,7 +11,7 @@ ARG VERSION="dev" RUN mono /var/ovm/ovm.exe install --fdd ${VERSION} # Основной образ -FROM mcr.microsoft.com/dotnet/aspnet:6.0-jammy +FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy RUN apt-get update \ && apt-get install -y locales \