Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion services/analytics/Dockerfile.artifact
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion services/pooler/Dockerfile.artifact
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion services/realtime/Dockerfile.artifact
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
5 changes: 5 additions & 0 deletions services/realtime/nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ''
Expand Down
1 change: 1 addition & 0 deletions services/realtime/runtime.env
Original file line number Diff line number Diff line change
Expand Up @@ -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=
2 changes: 2 additions & 0 deletions services/realtime/smoke.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down