Browse Source

CI: specify sequoia version tag for Debian10 jobs

We want to be sure we're using the Sequoia version defined in the
DEPENDENCIES file.
Release_2.1
Devan Carpenter 6 months ago
parent
commit
98bf4bebdd
Signed by untrusted user: dvn GPG Key ID: E1707CFFD7B85A02
2 changed files with 3 additions and 2 deletions
  1. +1
    -1
      scripts/debian10/Makefile
  2. +2
    -1
      scripts/debian10/pEpEngine.debian10.Dockerfile

+ 1
- 1
scripts/debian10/Makefile View File

@ -1,8 +1,8 @@
include ../../DEPENDENCIES
export
PEP_MACHINE_DIR= $(PKG_INSTALL_PATH)/share/pEp
SEQUOIA_VERSION=${sequoia}
YML2_VERSION=${yml2}
SEQUOIA_VERSION=$(shell echo ${sequoia} | sed 's/\//-/')
CURRENT_DISTRO=$(shell basename $(shell pwd))
IMAGE_NAME=${DOCKER_REGISTRY_HOST}/pep-$(CURRENT_DISTRO)-engine
DOCKERFILE=pEpEngine.$(CURRENT_DISTRO).Dockerfile


+ 2
- 1
scripts/debian10/pEpEngine.debian10.Dockerfile View File

@ -1,7 +1,8 @@
ARG DOCKER_REGISTRY_HOST
ARG CURRENT_DISTRO
ARG PEPENGINE_VERSION
FROM ${DOCKER_REGISTRY_HOST}/pep-${CURRENT_DISTRO}-sequoia:latest
ARG SEQUOIA_VERSION
FROM ${DOCKER_REGISTRY_HOST}/pep-${CURRENT_DISTRO}-sequoia:${SEQUOIA_VERSION}
ENV BUILDROOT /build
ENV INSTPREFIX /install


Loading…
Cancel
Save