diff options
| author | dd <dd@wx.tnyzeq.icu> | 2024-06-23 18:11:20 +0200 |
|---|---|---|
| committer | dd <dd@wx.tnyzeq.icu> | 2024-06-23 18:11:20 +0200 |
| commit | 0c951c9ff182813ebdb7ff416b76709a1b2cba37 (patch) | |
| tree | edb9503f2b68715c5f8df7e5660ec10521110c8d | |
| parent | f0f6d95f9cccb355071365e9e18b313207ee4b01 (diff) | |
| download | vyos-jenkins-0c951c9ff182813ebdb7ff416b76709a1b2cba37.tar.gz vyos-jenkins-0c951c9ff182813ebdb7ff416b76709a1b2cba37.zip | |
updated ELTS instructions
| -rw-r--r-- | readme.md | 22 | ||||
| -rwxr-xr-x | support-scripts/build-custom-vyos-build-containers.sh | 4 |
2 files changed, 16 insertions, 10 deletions
@@ -151,6 +151,16 @@ Then restart docker: systemctl restart docker.service ``` +**Install apt-cacher-ng for ELTS mirror** + +This is currently used only by equuleus. + +``` +apt install apt-cacher-ng +``` + +This will allow us to use `http://172.17.17.17:3142/deb.freexian.com/extended-lts` as ELTS mirror. + Build patched vyos-build docker images -- @@ -164,6 +174,7 @@ The below script clones the (patched) vyos-build, then builds and pushes the ima set -e CUSTOM_DOCKER_REPO="172.17.17.17:5000" +ELTS_MIRROR="http://172.17.17.17:3142/deb.freexian.com/extended-lts" # # Clone (patched) vyos-build @@ -175,7 +186,8 @@ cd vyos-build/docker # Build and Push equuleus git checkout equuleus -docker build --no-cache -t vyos/vyos-build:equuleus . +docker build --build-arg "ELTS_MIRROR=$ELTS_MIRROR" \ + --no-cache -t vyos/vyos-build:equuleus . docker tag vyos/vyos-build:equuleus ${CUSTOM_DOCKER_REPO}/vyos/vyos-build:equuleus docker push ${CUSTOM_DOCKER_REPO}/vyos/vyos-build:equuleus @@ -676,14 +688,6 @@ if you have too old container. wget http://172.17.17.17/apt.gpg.key -O /tmp/apt.gpg.key ``` -**Install apt-cacher-ng for ELTS mirror** - -This is currently used only by equuleus. - -``` -apt install apt-cacher-ng -``` - **Launch the vyos-build docker container** This is the usual run command from official documentation, we need to add extra mount for our apt singing key diff --git a/support-scripts/build-custom-vyos-build-containers.sh b/support-scripts/build-custom-vyos-build-containers.sh index 3026635..46f9f97 100755 --- a/support-scripts/build-custom-vyos-build-containers.sh +++ b/support-scripts/build-custom-vyos-build-containers.sh @@ -2,6 +2,7 @@ set -e CUSTOM_DOCKER_REPO="172.17.17.17:5000" +ELTS_MIRROR="http://172.17.17.17:3142/deb.freexian.com/extended-lts" # # Clone (patched) vyos-build @@ -13,7 +14,8 @@ cd vyos-build/docker # Build and Push equuleus git checkout equuleus -docker build --no-cache -t vyos/vyos-build:equuleus . +docker build --build-arg "ELTS_MIRROR=$ELTS_MIRROR" \ + --no-cache -t vyos/vyos-build:equuleus . docker tag vyos/vyos-build:equuleus ${CUSTOM_DOCKER_REPO}/vyos/vyos-build:equuleus docker push ${CUSTOM_DOCKER_REPO}/vyos/vyos-build:equuleus |