Skip to content

Commit

Permalink
Merge branch 'master' into livestream-host
Browse files Browse the repository at this point in the history
  • Loading branch information
Yiidiir authored Jan 25, 2025
2 parents abe8cad + b6f14aa commit 5373e55
Show file tree
Hide file tree
Showing 1,285 changed files with 179,744 additions and 25,367 deletions.
6 changes: 3 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# experience as rich as possible. Perhaps later down the line it might be worth
# rolling our own
#
FROM mcr.microsoft.com/vscode/devcontainers/python:3.11-bullseye
FROM mcr.microsoft.com/vscode/devcontainers/python:3.11-bookworm

# Make sure all exit codes on pipes cause failures
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
Expand All @@ -31,9 +31,9 @@ CMD ["sleep", "infinity"]
RUN apt-get update \
&& apt-get -y install --no-install-recommends \
# Add in useful db debugging tools
"postgresql-client=13+*" \
"postgresql-client=15+*" \
# needed for posthog to run
netcat brotli curl \
netcat-openbsd brotli curl \
&& rm -rf /var/lib/apt/lists/*

RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
Expand Down
518 changes: 382 additions & 136 deletions .devcontainer/library-scripts/docker-in-docker-debian.sh

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
!.kearc
!.storybook
!tsconfig.json
!products
!frontend/@posthog
!frontend/src
!frontend/types
Expand All @@ -32,10 +33,10 @@
!plugin-server/.eslintrc.js
!plugin-server/.prettierrc
!share/GeoLite2-City.mmdb
!hogvm/python
!common/hogvm/python
!unit.json.tpl
!plugin-transpiler/src
!plugin-transpiler/*.*
!common/plugin_transpiler/src
!common/plugin_transpiler/*.*
!test-runner-jest.config.js
!test-runner-jest-environment.js
!patches
Expand Down
5 changes: 5 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,8 @@ jest.config.ts
node_modules
rust
livestream
common/hogvm/__tests__/__snapshots__
common/hogvm/typescript/dist
common/hogvm/typescript/jest.config.js
common/plugin_transpiler/dist
common/plugin_transpiler/build.mjs
Loading

0 comments on commit 5373e55

Please sign in to comment.