parameterize helio flags

Author: tamcore

Makefile

@@ -1,11 +1,23 @@
 BUILD_ARCH := $(shell uname -m)
 RELEASE_NAME := "dragonfly-${BUILD_ARCH}"
 
+HELIO_RELEASE := $(if $(HELIO_RELEASE),y,)
+HELIO_RELEASE_FLAGS = -DHELIO_RELEASE_FLAGS="-flto"
+HELIO_USE_STATIC_LIBS = ON
+HELIO_OPENSSL_USE_STATIC_LIBS = ON
+HELIO_ENABLE_GIT_VERSION = ON
+HELIO_WITH_UNWIND = OFF
+
+HELIO_FLAGS = $(if $(HELIO_RELEASE),-release $(HELIO_RELEASE_FLAGS),) \
+              -DBoost_USE_STATIC_LIBS=$(HELIO_USE_STATIC_LIBS) \
+              -DOPENSSL_USE_STATIC_LIBS=$(HELIO_OPENSSL_USE_STATIC_LIBS) \
+              -DENABLE_GIT_VERSION=$(HELIO_ENABLE_GIT_VERSION) \
+              -DWITH_UNWIND=$(HELIO_WITH_UNWIND) \
+
 .PHONY: default
 
 configure:
-	./helio/blaze.sh -release -DBoost_USE_STATIC_LIBS=ON -DOPENSSL_USE_STATIC_LIBS=ON \
-	      -DENABLE_GIT_VERSION=ON -DWITH_UNWIND=OFF -DHELIO_RELEASE_FLAGS="-flto"
+	./helio/blaze.sh $(HELIO_FLAGS)
 
 build:
 	cd build-opt; \

tools/docker/Dockerfile.alpine-dev

@@ -1,29 +1,31 @@
 # syntax=docker/dockerfile:1
 FROM gcr.io/cadvisor/cadvisor:v0.46.0 as libpfm_donor
 
-FROM alpine:3.17.0 as build
-
-WORKDIR /build
-
-COPY . ./
+FROM alpine:3.17.0 as builder
 
 # "openssl-libs-static" fixes "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the"
 RUN apk add autoconf-archive automake bash bison boost-dev cmake coreutils \
         curl ccache git gcc gdb g++ libunwind-dev libtool libxml2-dev make ninja \
         openssl-dev openssl-libs-static patch zip zstd-dev
 
+# This is required to make static linking work
+RUN ls -1 /usr/lib/libboost_*.so | while read -r _file; do ln -sfv ${_file} ${_file//.so/.a}; done
+
 # Borrow libpfm from cadvisor, so we don't have to build it ourselves
 # https://github.com/google/cadvisor/blob/master/deploy/Dockerfile
 COPY --from=libpfm_donor /usr/local/lib/libpfm.so* /usr/local/lib/
 
-RUN make HELIO_USE_STATIC_LIBS=OFF release
+WORKDIR /build
+
+COPY . ./
+
+RUN make HELIO_RELEASE=y release
 
 RUN build-opt/dragonfly --version
 
 FROM alpine:3.17.0
 
-RUN apk --no-cache add libgcc libstdc++ libunwind boost1.77-fiber \
-    'su-exec>=0.2' netcat-openbsd
+RUN apk --no-cache add libgcc libstdc++ libunwind boost1.80-fiber zstd-dev su-exec netcat-openbsd
 
 RUN addgroup -S -g 1000 dfly && adduser -S -G dfly -u 999 dfly
 RUN mkdir /data && chown dfly:dfly /data

tools/docker/Dockerfile.ubuntu-dev

@@ -1,10 +1,6 @@
 # syntax=docker/dockerfile:1
 FROM ubuntu:20.04 as builder
 
-WORKDIR /build
-
-COPY . ./
-
 RUN \
   rm -f /etc/apt/apt.conf.d/docker-clean; \
   echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
@@ -21,7 +17,11 @@ RUN \
 RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 40  \
                         --slave   /usr/bin/g++ g++ /usr/bin/g++-9
 
-RUN make release
+WORKDIR /build
+
+COPY . ./
+
+RUN make HELIO_RELEASE=y release
 
 RUN build-opt/dragonfly --version
 

tools/release.sh

@@ -12,7 +12,7 @@ fi
 
 pwd
 
-make release
+make HELIO_RELEASE=y release
 
 build-opt/dragonfly --version