forked from pEp.foundation/pEpEngine
CI: specify yml2 version in DEPENDENCIES file
This allows us to keep yml2 up-to-date, and pin to specific releases. Additionally, we were using the old archive url. We've updated that.IPS-2
parent
6fac056ce2
commit
e1d7241bf8
|
@ -2,3 +2,4 @@
|
|||
## Prefer git tags instead of SHA hashes when possible.
|
||||
|
||||
sequoia=365d00a08bec6a5a48d48a7c7893d78c27092b59
|
||||
yml2=2.7.0
|
||||
|
|
|
@ -2,6 +2,7 @@ include ../../DEPENDENCIES
|
|||
export
|
||||
PEP_MACHINE_DIR= $(PKG_INSTALL_PATH)/share/pEp
|
||||
SEQUOIA_VERSION=${sequoia}
|
||||
YML2_VERSION=${yml2}
|
||||
CURRENT_DISTRO=$(shell basename $(shell pwd))
|
||||
IMAGE_NAME=${DOCKER_REGISTRY_HOST}/pep-$(CURRENT_DISTRO)-engine
|
||||
DOCKERFILE=pEpEngine.$(CURRENT_DISTRO).Dockerfile
|
||||
|
@ -18,6 +19,7 @@ all:
|
|||
--build-arg DOCKER_REGISTRY_HOST=${DOCKER_REGISTRY_HOST} \
|
||||
--build-arg PEPENGINE_VERSION=$(PEPENGINE_VERSION) \
|
||||
--build-arg SEQUOIA_VERSION=$(SEQUOIA_VERSION) \
|
||||
--build-arg YML2_VERSION=$(YML2_VERSION) \
|
||||
--build-arg PEP_MACHINE_DIR=$(PEP_MACHINE_DIR) \
|
||||
--cache-from $(IMAGE_NAME):latest \
|
||||
--tag=$(IMAGE_NAME):$(PEPENGINE_VERSION) \
|
||||
|
|
|
@ -3,9 +3,9 @@ set -exo
|
|||
|
||||
### YML2
|
||||
cd $INSTPREFIX
|
||||
wget https://fdik.org/yml2.tar.bz2
|
||||
tar -xf yml2.tar.bz2
|
||||
rm yml2.tar.bz2
|
||||
wget "https://gitea.pep.foundation/fdik/yml2/archive/${YML2_VERSION}.tar.gz"
|
||||
tar -xf "${YML2_VERSION}.tar.gz"
|
||||
rm -f ${YML2_VERSION}.tar*
|
||||
|
||||
|
||||
### libetpan
|
||||
|
|
|
@ -17,6 +17,7 @@ USER root
|
|||
RUN chown -R pep-builder:pep-builder ${BUILDROOT}/pEpEngine
|
||||
WORKDIR ${BUILDROOT}/pEpEngine
|
||||
|
||||
ARG YML2_VERSION
|
||||
ARG ENGINE_VERSION
|
||||
ARG CURRENT_DISTRO
|
||||
|
||||
|
|
Loading…
Reference in New Issue