diff --git a/services/analytics/Dockerfile.artifact b/services/analytics/Dockerfile.artifact index 866cba7..384beba 100644 --- a/services/analytics/Dockerfile.artifact +++ b/services/analytics/Dockerfile.artifact @@ -20,7 +20,7 @@ COPY ${SOURCE_DIR}/ ./ COPY services/analytics/nix/ nix/ COPY scripts/nix-build-with-derived-hashes.sh /usr/local/bin/ RUN rm -rf .git -RUN nix-build-with-derived-hashes.sh \ +RUN /usr/local/bin/nix-build-with-derived-hashes.sh \ nix-build "./${NIX_EXPRESSION}" "${NIX_ATTR}" "${SERVICE_VERSION}" \ /result /nix-derived-hashes.json \ mix-deps:mix_deps_hash \ diff --git a/services/pooler/Dockerfile.artifact b/services/pooler/Dockerfile.artifact index 58c6bbd..c1b82ca 100644 --- a/services/pooler/Dockerfile.artifact +++ b/services/pooler/Dockerfile.artifact @@ -20,7 +20,7 @@ COPY ${SOURCE_DIR}/ ./ COPY services/pooler/nix/ nix/ COPY scripts/nix-build-with-derived-hashes.sh /usr/local/bin/ RUN rm -rf .git -RUN nix-build-with-derived-hashes.sh \ +RUN /usr/local/bin/nix-build-with-derived-hashes.sh \ nix-build "./${NIX_EXPRESSION}" "${NIX_ATTR}" "${SERVICE_VERSION}" \ /result /nix-derived-hashes.json \ mix-deps:mix_deps_hash \ diff --git a/services/realtime/Dockerfile.artifact b/services/realtime/Dockerfile.artifact index e17d371..3badabf 100644 --- a/services/realtime/Dockerfile.artifact +++ b/services/realtime/Dockerfile.artifact @@ -22,7 +22,7 @@ COPY scripts/nix-build-with-derived-hashes.sh /usr/local/bin/ # The submodule's .git pointer references the host worktree; drop it so the # source is used as a plain path. RUN rm -rf .git -RUN nix-build-with-derived-hashes.sh \ +RUN /usr/local/bin/nix-build-with-derived-hashes.sh \ nix-build "./${NIX_EXPRESSION}" "${NIX_ATTR}" "${SERVICE_VERSION}" \ /result /nix-derived-hashes.json \ mix-deps:mix_deps_hash \ diff --git a/services/realtime/nix/default.nix b/services/realtime/nix/default.nix index 6a5f860..de1d990 100644 --- a/services/realtime/nix/default.nix +++ b/services/realtime/nix/default.nix @@ -220,6 +220,11 @@ in [ -f "$vmargs" ] || continue printf '\n## Portable artifact: disksup would spawn a Nix store bash (see nix package)\n-os_mon start_disksup false\n' >> "$vmargs" done + + for envsh in "$rootfs"/releases/*/env.sh; do + [ -f "$envsh" ] || continue + printf '\nexport RELEASE_DISTRIBUTION=none\n' >> "$envsh" + done ''; postFixup = '' diff --git a/services/realtime/runtime.env b/services/realtime/runtime.env index fb4597a..00a277a 100644 --- a/services/realtime/runtime.env +++ b/services/realtime/runtime.env @@ -5,3 +5,4 @@ ELIXIR_ERL_OPTIONS=+fnu +S 1:1 +SDio 1 +sbwt none +sbwtdcpu none +sbwtdio none # Metadata repo pool; holds server-side postgres backends (default 5). DB_POOL_SIZE=2 +CLUSTER_STRATEGIES= diff --git a/services/realtime/smoke.sh b/services/realtime/smoke.sh index 73780ba..ad6b311 100755 --- a/services/realtime/smoke.sh +++ b/services/realtime/smoke.sh @@ -125,6 +125,8 @@ container="realtime-smoke-$RUN_ID" run_container \ "$container" \ --network "$NETWORK" \ + --cpus 1 \ + --memory 384m \ -p 127.0.0.1::4000 \ -e DB_HOST="$POSTGRES_CONTAINER" \ -e DB_PORT=5432 \