Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
D3strukt0r committed May 3, 2024
2 parents 953ce71 + 28ea312 commit 386128b
Show file tree
Hide file tree
Showing 134 changed files with 11,222 additions and 17,770 deletions.
2 changes: 2 additions & 0 deletions .docker/certs/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*
!.gitignore
Empty file added .docker/rootfs-local/empty.txt
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
tls:
certificates:
- certFile: /etc/ssl/certs/local/cert.pem
keyFile: /etc/ssl/certs/local/key.pem
46 changes: 24 additions & 22 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
# https://stackoverflow.com/a/51429852/4156752
# Ignore everything
*

# Allow files and directories
!/.docker/rootfs

!/pwa/.docker/rootfs
!/pwa/public
!/pwa/src
!/pwa/.browserlistrc
!/pwa/index.html
!/pwa/package.json
!/pwa/pnpm-lock.yaml
!/pwa/postcss.config.js
!/pwa/tailwind.config.ts
!/pwa/tsconfig.json
!/pwa/tsconfig.node.json
!/pwa/vite.config.ts
!/pwa/vitest-setup.js

# Ignore unnecessary files inside allowed directories
# This should go after the allowed directories
**/*~
**/*.log
**/*.md
**/*.php~
**/*.bat
**/._*
**/.dockerignore
**/.DS_Store
**/.git/
**/.gitattributes
**/.gitignore
**/.gitmodules
**/docker-compose.*.yaml
**/docker-compose.*.yml
**/docker-compose.yaml
**/docker-compose.yml
**/Dockerfile
**/Thumbs.db
**/.editorconfig
**/.env.*.local
**/.env.local
# **/*.test.tsx
.github/
.idea/
.vscode/
build/
545 changes: 512 additions & 33 deletions .editorconfig

Large diffs are not rendered by default.

Loading

0 comments on commit 386128b

Please sign in to comment.