A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(dev): lack of proper setup of JSON schemas and direnv (#3852)
Emma4e2438ecba3e
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfileindex a8e393698..5d34b213b 100644--- a/.devcontainer/Dockerfile+++ b/.devcontainer/Dockerfile@@ -178,6 +178,11 @@ RUN if ! getent group "${USER_GID}" >/dev/null; then groupadd --gid "${USER_GID}COPY --from=seaweedfs /usr/bin/weed /usr/local/bin/weed+# Dependency of direnv extension+RUN apt-get update \+ && apt-get install -y --no-install-recommends \+ direnv+USER ${USERNAME}ENV DOCKER_HOST="unix:///var/run/docker.sock" \diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.jsonindex dcf79e781..e98958c0d 100644--- a/.devcontainer/devcontainer.json+++ b/.devcontainer/devcontainer.json@@ -33,8 +33,8 @@"label": "Fluxer app proxy"}},- "postCreateCommand": "bash /workspaces/fluxer/.devcontainer/fix-docker-socket.sh && bash /workspaces/fluxer/.devcontainer/fix-workspace-permissions.sh && cargo run -p fluxer-dev -- bootstrap",- "postStartCommand": "bash /workspaces/fluxer/.devcontainer/fix-docker-socket.sh && bash /workspaces/fluxer/.devcontainer/fix-workspace-permissions.sh && cargo run -p fluxer-dev -- post-start",+ "postCreateCommand": "bash /workspaces/fluxer/.devcontainer/fix-docker-socket.sh && bash /workspaces/fluxer/.devcontainer/fix-workspace-permissions.sh && bash /workspaces/fluxer/.devcontainer/direnv-allow.sh && cargo run -p fluxer-dev -- bootstrap",+ "postStartCommand": "bash /workspaces/fluxer/.devcontainer/fix-docker-socket.sh && bash /workspaces/fluxer/.devcontainer/fix-workspace-permissions.sh && bash /workspaces/fluxer/.devcontainer/direnv-allow.sh && cargo run -p fluxer-dev -- post-start","customizations": {"vscode": {"settings": {@@ -42,6 +42,11 @@"erlang.includePaths": ["."],"search.exclude": {"**/_build/default/lib/fluxer_gateway": true+ },+ "json.schemaDownload.trustedDomains": {+ "http://json-schema.org/draft-07/schema#": true,+ "https://unpkg.com/knip%406/schema.json": true,+ "https://json.schemastore.org/tsconfig": true}},"extensions": [@@ -52,7 +57,8 @@"unifiedjs.vscode-mdx","pgourlain.erlang","clinyong.vscode-css-modules",- "EditorConfig.EditorConfig"+ "EditorConfig.EditorConfig",+ "mkhl.direnv"]}}diff --git a/.devcontainer/direnv-allow.sh b/.devcontainer/direnv-allow.shnew file mode 100755index 000000000..13ed7fb6f--- /dev/null+++ b/.devcontainer/direnv-allow.sh@@ -0,0 +1,7 @@+#!/usr/bin/env bash+# SPDX-License-Identifier: AGPL-3.0-or-later++set -euo pipefail++cd /workspaces/fluxer || exit 1+direnv allow