diff --git a/Dockerfile b/Dockerfile index cb4e08d..169da83 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM debian:testing -# FROM nginx # cant use this because it uses debian stable with ancient packeges +# TODO: have build and run deps seperate so the container can be made more lean ENV BUILD_REQ="build-essential libcurl4-gnutls-dev libcjson-dev libpcre3-dev libfcgi-dev git pkgconf" ENV RUN_REQ="spawn-fcgi fcgiwrap" @@ -11,5 +11,7 @@ ENV TB_BUILD_DIR=/usr/local/src/treebird COPY treebird $TB_BUILD_DIR RUN make -C $TB_BUILD_DIR && make -C $TB_BUILD_DIR install -# Fix broken permissions BS -RUN chmod a+x +ENV TB_EXEC_BIN=/usr/local/bin/treebird +RUN chmod a+x $TB_EXEC_BIN + +CMD fcgiwrap -c 10 -f -s tcp:127.0.0.1:4008 diff --git a/configure_build.sh b/configure_build.sh index 03d6b70..3795f5d 100755 --- a/configure_build.sh +++ b/configure_build.sh @@ -23,4 +23,5 @@ sed -i "/config_instance_url/ s/= .*;/= \"https:\\/\\/${INSTANCE_HOST}\\/\\\"/;\ sed "s/unix:.*;/127.0.0.1:${TREEBIRD_PORT};/g;s/treebird.example.com/${TREEBIRD_HOST}/g" \ treebird/docs/sample/treebird.nginx.conf > ${CONFIG_DIR}/treebird.nginx.conf -echo "Please edit config.h (symlinked for convenience) as needed, then run ./build_container.sh" +echo "Please edit configs/config.h (symlinked for convenience) as needed." +echo "Then run ./build_container.sh"