From 706c08de46b4898e79420956eb76031bd80b9b47 Mon Sep 17 00:00:00 2001 From: Rob Sherwood Date: Wed, 1 Nov 2017 10:28:54 +0000 Subject: [PATCH 1/4] Added doc and support for building behind an HTTP proxy --- .../any/rootfs/jessie/standard/standard.yml | 2 +- .../any/rootfs/stretch/standard/standard.yml | 2 +- .../any/rootfs/wheezy/standard/standard.yml | 2 +- docs/README-proxy.md | 29 +++++++++++++++++++ 4 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 docs/README-proxy.md diff --git a/builds/any/rootfs/jessie/standard/standard.yml b/builds/any/rootfs/jessie/standard/standard.yml index fad73bd8..b7aa4067 100644 --- a/builds/any/rootfs/jessie/standard/standard.yml +++ b/builds/any/rootfs/jessie/standard/standard.yml @@ -42,7 +42,7 @@ Multistrap: ONL: packages: *Packages - source: http://apt.opennetlinux.org/debian + source: http://${APT_CACHE}apt.opennetlinux.org/debian suite: unstable omitdebsrc: true diff --git a/builds/any/rootfs/stretch/standard/standard.yml b/builds/any/rootfs/stretch/standard/standard.yml index 48969cbe..b57fe6c7 100644 --- a/builds/any/rootfs/stretch/standard/standard.yml +++ b/builds/any/rootfs/stretch/standard/standard.yml @@ -42,7 +42,7 @@ Multistrap: ONL: packages: *Packages - source: http://apt.opennetlinux.org/debian + source: http://${APT_CACHE}apt.opennetlinux.org/debian suite: unstable omitdebsrc: true diff --git a/builds/any/rootfs/wheezy/standard/standard.yml b/builds/any/rootfs/wheezy/standard/standard.yml index 083fb7a9..22530fb0 100644 --- a/builds/any/rootfs/wheezy/standard/standard.yml +++ b/builds/any/rootfs/wheezy/standard/standard.yml @@ -42,7 +42,7 @@ Multistrap: ONL: packages: *Packages - source: http://apt.opennetlinux.org/debian + source: http://${APT_CACHE}apt.opennetlinux.org/debian suite: unstable omitdebsrc: true diff --git a/docs/README-proxy.md b/docs/README-proxy.md new file mode 100644 index 00000000..f36d9f1d --- /dev/null +++ b/docs/README-proxy.md @@ -0,0 +1,29 @@ +===== How to build ONL behind an HTTP Proxy ===== + +Many corporate environments don't provide native access to the Internet +and instead all access must go through an HTTP proxy. Since the ONL +build process dynamically pulls lots of things, this can be a pain. +While everyone's setup is different, hopefully these directions help +reduce that pain. + + +1) Update the git modules to point to http: instead of git: + + sed -i -e 's/git:/http:/' $ONL/.gitmodules + +2) Make sure you have apt-cacher-ng installed in your host (non-docker) + environment and that docker starts it. Next, configure it to use + your proxy: + + $ grep Proxy /etc/apt-cacher-ng/acng.conf + Proxy: http://myproxy.mycompany.com:8080 + # /etc/init.d/apt-cacher-ng restart + +3) Make sure your git config is configured correctly for + proxies: + + $ cat ~/.gitconfig + [https] + proxy = myproxy.mycompany.com:8080 + [https] + proxy = myproxy.mycompany.com:8080 From 0e2505a30710096888900915a8fb1840c5d112b3 Mon Sep 17 00:00:00 2001 From: Rob Sherwood Date: Wed, 1 Nov 2017 10:37:41 -0700 Subject: [PATCH 2/4] Update README-proxy.md --- docs/README-proxy.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/README-proxy.md b/docs/README-proxy.md index f36d9f1d..d69bae87 100644 --- a/docs/README-proxy.md +++ b/docs/README-proxy.md @@ -1,4 +1,4 @@ -===== How to build ONL behind an HTTP Proxy ===== +# How to build ONL behind an HTTP Proxy Many corporate environments don't provide native access to the Internet and instead all access must go through an HTTP proxy. Since the ONL @@ -17,7 +17,7 @@ reduce that pain. $ grep Proxy /etc/apt-cacher-ng/acng.conf Proxy: http://myproxy.mycompany.com:8080 - # /etc/init.d/apt-cacher-ng restart + $ sudo /etc/init.d/apt-cacher-ng restart 3) Make sure your git config is configured correctly for proxies: From cf5e803786c8d19a42ac74229468802af938a2ff Mon Sep 17 00:00:00 2001 From: Rob Sherwood Date: Wed, 1 Nov 2017 10:41:16 -0700 Subject: [PATCH 3/4] Update README-proxy.md --- docs/README-proxy.md | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/docs/README-proxy.md b/docs/README-proxy.md index d69bae87..f3e395de 100644 --- a/docs/README-proxy.md +++ b/docs/README-proxy.md @@ -7,23 +7,24 @@ While everyone's setup is different, hopefully these directions help reduce that pain. -1) Update the git modules to point to http: instead of git: +* Update the git modules to point to http: instead of git: - sed -i -e 's/git:/http:/' $ONL/.gitmodules -2) Make sure you have apt-cacher-ng installed in your host (non-docker) + sed -i -e 's/git:/http:/' $ONL/.gitmodules + +* Make sure you have apt-cacher-ng installed in your host (non-docker) environment and that docker starts it. Next, configure it to use your proxy: - $ grep Proxy /etc/apt-cacher-ng/acng.conf - Proxy: http://myproxy.mycompany.com:8080 - $ sudo /etc/init.d/apt-cacher-ng restart + $ grep Proxy /etc/apt-cacher-ng/acng.conf + Proxy: http://myproxy.mycompany.com:8080 + $ sudo /etc/init.d/apt-cacher-ng restart -3) Make sure your git config is configured correctly for +* Make sure your git config is configured correctly for proxies: - $ cat ~/.gitconfig - [https] - proxy = myproxy.mycompany.com:8080 - [https] - proxy = myproxy.mycompany.com:8080 + $ cat ~/.gitconfig + [https] + proxy = myproxy.mycompany.com:8080 + [https] + proxy = myproxy.mycompany.com:8080 From 6405036e28165005456a45a6432e0e84827a8723 Mon Sep 17 00:00:00 2001 From: Rob Sherwood Date: Tue, 2 Jan 2018 16:42:03 -0800 Subject: [PATCH 4/4] Update README-proxy.md --- docs/README-proxy.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docs/README-proxy.md b/docs/README-proxy.md index f3e395de..4a1a7e55 100644 --- a/docs/README-proxy.md +++ b/docs/README-proxy.md @@ -6,12 +6,6 @@ build process dynamically pulls lots of things, this can be a pain. While everyone's setup is different, hopefully these directions help reduce that pain. - -* Update the git modules to point to http: instead of git: - - - sed -i -e 's/git:/http:/' $ONL/.gitmodules - * Make sure you have apt-cacher-ng installed in your host (non-docker) environment and that docker starts it. Next, configure it to use your proxy: