Skip to content

Commit

Permalink
Update tutorials with new docker image location. (#60)
Browse files Browse the repository at this point in the history
  • Loading branch information
jwalton authored Apr 19, 2023
1 parent 578aa59 commit 3bbda99
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion CACHING-WITH-CCACHE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ENVIRONMENT-STRUCTURE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion INSTALLING-ADDITIONAL-DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
~~~
Expand Down
4 changes: 2 additions & 2 deletions SECURING-THE-BUILD-ENVIRONMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion SECURITY-HARDENING-BINARIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions TUTORIAL-1-BASICS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions TUTORIAL-2-COMPILATION-SCRIPT.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion TUTORIAL-3-STATIC-LINKING-DEPS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions TUTORIAL-4-TWEAKING-APPS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions TUTORIAL-5-USING-LIBRARY-VARIANTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
...
Expand All @@ -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:
Expand All @@ -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
...
Expand Down
2 changes: 1 addition & 1 deletion TUTORIAL-6-ADDITIONAL-STATIC-LIBS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions TUTORIAL-7-VERIFYING-PORTABILITY-WITH-LIBCHECK.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
...
Expand Down

0 comments on commit 3bbda99

Please sign in to comment.