Skip to content

Исправлена публикация docker-образов с неверной версией движка #1743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sfaqer wants to merge 1 commit into
base: develop
Choose a base branch
from
+29 −5
Open

Исправлена публикация docker-образов с неверной версией движка #1743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,9 @@ pipeline {
steps {
script {
def codename = env.TAG_NAME ? env.TAG_NAME : 'lts'
publishDockerImage('v1', codename)
// тег v1.9.4 -> версия для ovm 1.9.4
def engineVersion = env.TAG_NAME ? env.TAG_NAME.replaceFirst(/^v/, '') : 'lts'
publishDockerImage('v1', codename, engineVersion)
}
}
}
Expand All @@ -322,7 +324,8 @@ pipeline {
codename = fullVersionNumber()
}

publishDockerImage('v2', codename)
// для v2 тег образа совпадает с версией для ovm: dev или 2.2.0
publishDockerImage('v2', codename, codename)
}
}
}
Expand Down Expand Up @@ -410,12 +413,14 @@ def publishReleaseNotes(codename) {
}
}

def publishDockerImage(flavour, codename) {
def publishDockerImage(flavour, codename, engineVersion) {
def imageName = "evilbeaver/onescript:${codename}"

// --no-cache: слой с ovm install не меняется между сборками и иначе берется из кэша агента
// --pull: обновлять базовые образы (ovm, aspnet, mono)
docker.build(
imageName,
"--load -f install/builders/base-image/Dockerfile_${flavour} ."
"--load --pull --no-cache --build-arg VERSION=${engineVersion} -f install/builders/base-image/Dockerfile_${flavour} ."
).push()
}

11 changes: 11 additions & 0 deletions install/builders/base-image/Dockerfile_v1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,14 @@ RUN curl -L https://github.com/oscript-library/ovm/releases/latest/download/ovm.

ENV OSCRIPTBIN=/root/.local/share/ovm/current/bin
ENV PATH="$OSCRIPTBIN:$PATH"

# Проверка, что в образ попала запрошенная версия (для алиасов lts, stable и т.п. только вывод)
# 1.x выводит версию с номером сборки: 1.9.4.16
RUN ACTUAL="$(oscript -version)" \
&& echo "oscript -version: ${ACTUAL}" \
&& case "${VERSION}" in \
[0-9]*) case "${ACTUAL}" in \
"${VERSION}"|"${VERSION}".*) ;; \
*) echo "Ожидалась версия ${VERSION}, в образе ${ACTUAL}" >&2; exit 1 ;; \
esac ;; \
esac
10 changes: 9 additions & 1 deletion install/builders/base-image/Dockerfile_v2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,12 @@ ARG VERSION="dev"

RUN mkdir -p /var/oscript
COPY --from=0 /root/.local/share/ovm/${VERSION}/ /var/oscript/
ENV PATH="$PATH:/var/oscript/bin"
ENV PATH="$PATH:/var/oscript/bin"

# Проверка, что в образ попала запрошенная версия (для алиасов dev, stable и т.п. только вывод)
RUN ACTUAL="$(oscript -version)" \
&& echo "oscript -version: ${ACTUAL}" \
&& case "${VERSION}" in \
[0-9]*) [ "${ACTUAL}" = "${VERSION}" ] \
|| { echo "Ожидалась версия ${VERSION}, в образе ${ACTUAL}" >&2; exit 1; } ;; \
esac