diff --git a/CACHING-WITH-CCACHE.md b/CACHING-WITH-CCACHE.md index 2535b55..318ecae 100644 --- a/CACHING-WITH-CCACHE.md +++ b/CACHING-WITH-CCACHE.md @@ -15,5 +15,5 @@ Then invoke the compilation script as follows: -e CXX='ccache g++' \ -e CCACHE_DIR='/io/cache' \ -v `pwd`:/io \ - ghcr.io/foobarwidget/holy-build-box-amd64 \ + ghcr.io/phusion/holy-build-box/hbb-64 \ bash /io/compile.sh diff --git a/ENVIRONMENT-STRUCTURE.md b/ENVIRONMENT-STRUCTURE.md index d5771ec..aa5a928 100644 --- a/ENVIRONMENT-STRUCTURE.md +++ b/ENVIRONMENT-STRUCTURE.md @@ -31,7 +31,7 @@ Some environment variables deserve special explanation: You can inspect the environment variables by starting a bash shell and sourcing one of the activation scripts: - $ docker run -t -i --rm ghcr.io/foobarwidget/holy-build-box-amd64 bash + $ docker run -t -i --rm ghcr.io/phusion/holy-build-box/hbb-64 bash container$ source /hbb_exe/activate Holy build box activated diff --git a/INSTALLING-ADDITIONAL-DEPENDENCIES.md b/INSTALLING-ADDITIONAL-DEPENDENCIES.md index cd7d5e8..43b88da 100644 --- a/INSTALLING-ADDITIONAL-DEPENDENCIES.md +++ b/INSTALLING-ADDITIONAL-DEPENDENCIES.md @@ -39,7 +39,7 @@ Here's how your Dockerfile should look like: # Specify the actual desired version here. You can see the list # of available versions in our Changelog: # https://github.com/FooBarWidget/holy-build-box/blob/master/Changelog.md -FROM ghcr.io/foobarwidget/holy-build-box-amd64:3.0 +FROM ghcr.io/phusion/holy-build-box/hbb-64:3.0 ADD install-deps.sh /install-deps.sh RUN bash /install-deps.sh && rm -f /install-deps.sh ~~~ diff --git a/SECURING-THE-BUILD-ENVIRONMENT.md b/SECURING-THE-BUILD-ENVIRONMENT.md index a67ccf8..d082d16 100644 --- a/SECURING-THE-BUILD-ENVIRONMENT.md +++ b/SECURING-THE-BUILD-ENVIRONMENT.md @@ -18,7 +18,7 @@ This example shows how you can run the compile.sh script from [tutorial 2](TUTOR docker run -t -i --rm \ -v `pwd`:/io \ - ghcr.io/foobarwidget/holy-build-box-amd64 \ + ghcr.io/phusion/holy-build-box/hbb-64 \ /hbb/bin/setuser builder \ bash /io/compile.sh @@ -63,5 +63,5 @@ Note that the above example calls `setuser` in order to run specific commands (b docker run -t -i --rm \ -v `pwd`:/io \ - ghcr.io/foobarwidget/holy-build-box-amd64 \ + ghcr.io/phusion/holy-build-box/hbb-64 \ bash /io/compile.sh diff --git a/SECURITY-HARDENING-BINARIES.md b/SECURITY-HARDENING-BINARIES.md index 7598760..478b751 100644 --- a/SECURITY-HARDENING-BINARIES.md +++ b/SECURITY-HARDENING-BINARIES.md @@ -23,7 +23,7 @@ If you want to use it outside a Holy Build Box container, use it as follows: docker run -t -i --rm \ -v /path-to-your-binary:/exe:ro \ - ghcr.io/foobarwidget/holy-build-box-amd64 \ + ghcr.io/phusion/holy-build-box/hbb-64 \ /hbb_exe_gc_hardened/activate-exec \ hardening-check -b /exe diff --git a/TUTORIAL-1-BASICS.md b/TUTORIAL-1-BASICS.md index 320adf9..0034c29 100644 --- a/TUTORIAL-1-BASICS.md +++ b/TUTORIAL-1-BASICS.md @@ -18,7 +18,7 @@ Holy Build Box consists of one Docker image: `foobarwidget/holy-build-box-amd64` Start a Bash shell inside the Holy Build Box environment so that you can look around and inspect things: - $ docker run -t -i --rm ghcr.io/foobarwidget/holy-build-box-amd64 bash + $ docker run -t -i --rm ghcr.io/phusion/holy-build-box/hbb-64 bash container# When you are done, type `exit` to exit the shell: @@ -45,7 +45,7 @@ Compile it with: docker run -t -i --rm \ -v `pwd`:/io \ - ghcr.io/foobarwidget/holy-build-box-amd64 \ + ghcr.io/phusion/holy-build-box/hbb-64 \ /hbb_exe/activate-exec \ bash -x -c 'gcc $CFLAGS /io/hello.c -o /io/hello $LDFLAGS' @@ -73,7 +73,7 @@ The various `/hbb*` directories and the environment variables are explained in t We encourage you to inspect the environment variables set by the Holy Build Box activation script: $ docker run -t -i --rm \ - ghcr.io/foobarwidget/holy-build-box-amd64 \ + ghcr.io/phusion/holy-build-box/hbb-64 \ /hbb_exe/activate-exec \ bash Holy build box activated diff --git a/TUTORIAL-2-COMPILATION-SCRIPT.md b/TUTORIAL-2-COMPILATION-SCRIPT.md index a893b90..186755b 100644 --- a/TUTORIAL-2-COMPILATION-SCRIPT.md +++ b/TUTORIAL-2-COMPILATION-SCRIPT.md @@ -55,7 +55,7 @@ Put `compile.sh` in the same directory as `hello-2.10.tar.gz`. Then invoke the H docker run -t -i --rm \ -v `pwd`:/io \ - ghcr.io/foobarwidget/holy-build-box-amd64 \ + ghcr.io/phusion/holy-build-box/hbb-64 \ bash /io/compile.sh ## Verify that it works @@ -75,7 +75,7 @@ Instead of sourcing the `activate` script from within `compile.sh`, you could al docker run -t -i --rm \ -v `pwd`:/io \ - ghcr.io/foobarwidget/holy-build-box-amd64 \ + ghcr.io/phusion/holy-build-box/hbb-64 \ /hbb_exe/activate-exec \ bash /io/compile.sh diff --git a/TUTORIAL-3-STATIC-LINKING-DEPS.md b/TUTORIAL-3-STATIC-LINKING-DEPS.md index b6fa79a..d935ce5 100644 --- a/TUTORIAL-3-STATIC-LINKING-DEPS.md +++ b/TUTORIAL-3-STATIC-LINKING-DEPS.md @@ -43,7 +43,7 @@ Download Nginx and invoke the script: curl -LO http://nginx.org/download/nginx-1.8.0.tar.gz docker run -t -i --rm \ -v `pwd`:/io \ - ghcr.io/foobarwidget/holy-build-box-amd64 \ + ghcr.io/phusion/holy-build-box/hbb-64 \ bash /io/compile.sh ## Verify that it works diff --git a/TUTORIAL-4-TWEAKING-APPS.md b/TUTORIAL-4-TWEAKING-APPS.md index a39d68b..a32c280 100644 --- a/TUTORIAL-4-TWEAKING-APPS.md +++ b/TUTORIAL-4-TWEAKING-APPS.md @@ -31,7 +31,7 @@ Next, enter the container, invoke the compilation script and verify that the Ngi $ docker run -t -i --rm \ -v `pwd`:/io \ - ghcr.io/foobarwidget/holy-build-box-amd64 \ + ghcr.io/phusion/holy-build-box/hbb-64 \ bash container# bash /io/compile.sh @@ -106,7 +106,7 @@ Now test the script: docker run -t -i --rm \ -v `pwd`:/io \ - ghcr.io/foobarwidget/holy-build-box-amd64 \ + ghcr.io/phusion/holy-build-box/hbb-64 \ bash /io/compile.sh You should see that the configure script succeeds in detecting OpenSSL this time: @@ -179,7 +179,7 @@ Now test the script: docker run -t -i --rm \ -v `pwd`:/io \ - ghcr.io/foobarwidget/holy-build-box-amd64 \ + ghcr.io/phusion/holy-build-box/hbb-64 \ bash /io/compile.sh You should see that linker flags are now passed properly: diff --git a/TUTORIAL-5-USING-LIBRARY-VARIANTS.md b/TUTORIAL-5-USING-LIBRARY-VARIANTS.md index 7570913..f365cfe 100644 --- a/TUTORIAL-5-USING-LIBRARY-VARIANTS.md +++ b/TUTORIAL-5-USING-LIBRARY-VARIANTS.md @@ -18,7 +18,7 @@ It also wasn't compiled with any security hardening flags: $ docker run -t -i --rm \ -v `pwd`/nginx:/exe:ro \ - ghcr.io/foobarwidget/holy-build-box-amd64 \ + ghcr.io/phusion/holy-build-box/hbb-64 \ /hbb_exe_gc_hardened/activate-exec \ hardening-check -b /exe ... @@ -40,7 +40,7 @@ Then invoke the compilation script: docker run -t -i --rm \ -v `pwd`:/io \ - ghcr.io/foobarwidget/holy-build-box-amd64 \ + ghcr.io/phusion/holy-build-box/hbb-64 \ bash /io/compile.sh Let's take a look at the Nginx binary now: @@ -55,7 +55,7 @@ We can also see that the security hardening flag are enabled inside the binary: $ docker run -t -i --rm \ -v `pwd`/nginx:/exe:ro \ - ghcr.io/foobarwidget/holy-build-box-amd64 \ + ghcr.io/phusion/holy-build-box/hbb-64 \ /hbb_exe_gc_hardened/activate-exec \ hardening-check -b /exe ... diff --git a/TUTORIAL-6-ADDITIONAL-STATIC-LIBS.md b/TUTORIAL-6-ADDITIONAL-STATIC-LIBS.md index fc2a30e..03917d0 100644 --- a/TUTORIAL-6-ADDITIONAL-STATIC-LIBS.md +++ b/TUTORIAL-6-ADDITIONAL-STATIC-LIBS.md @@ -57,7 +57,7 @@ Invoke the compilation script: docker run -t -i --rm \ -v `pwd`:/io \ - ghcr.io/foobarwidget/holy-build-box-amd64 \ + ghcr.io/phusion/holy-build-box/hbb-64 \ bash /io/compile.sh Then verify that Nginx is indeed compiled with the `rewrite_module` enabled: diff --git a/TUTORIAL-7-VERIFYING-PORTABILITY-WITH-LIBCHECK.md b/TUTORIAL-7-VERIFYING-PORTABILITY-WITH-LIBCHECK.md index 4513af9..92c6496 100644 --- a/TUTORIAL-7-VERIFYING-PORTABILITY-WITH-LIBCHECK.md +++ b/TUTORIAL-7-VERIFYING-PORTABILITY-WITH-LIBCHECK.md @@ -14,7 +14,7 @@ For example, let's compile the hello world from [tutorial 1](TUTORIAL-1-BASICS.m docker run -t -i --rm \ -v `pwd`:/io \ - ghcr.io/foobarwidget/holy-build-box-amd64 \ + ghcr.io/phusion/holy-build-box/hbb-64 \ /hbb_exe/activate-exec \ gcc /io/hello.c -o /io/hello /usr/lib64/libz.so.1 @@ -32,7 +32,7 @@ If you invoke libcheck, it should complain about this fact: $ docker run -t -i --rm \ -v `pwd`:/io \ - ghcr.io/foobarwidget/holy-build-box-amd64 \ + ghcr.io/phusion/holy-build-box/hbb-64 \ /hbb_exe/activate-exec \ libcheck /io/hello ...