fix compose and maybe fix pg

This commit is contained in:
Akis 2022-12-31 20:14:28 +02:00
parent fda2cbea59
commit 7a04cc70fe
Signed by untrusted user: akis
GPG Key ID: 267BF5C6677944ED
4 changed files with 33 additions and 15 deletions

View File

@ -1,14 +1,30 @@
services: services:
website: website:
container_name: website container_name: website
#image: realprojectsegfault/website #image: realprojectsegfault/website:latest
restart: unless-stopped restart: unless-stopped
build: build:
context: . context: .
dockerfile: Dockerfile dockerfile: Dockerfile
ports: ports:
- 1337:4173 - 1339:4173
website-db: environment:
AUTH_SECRET: ${AUTH_SECRET}
AUTH_TRUST_HOST: ${AUTH_TRUST_HOST}
ORIGIN: ${ORIGIN}
AUTH_URL: ${AUTH_URL}
DB_HOST: ${DB_HOST}
DB_PORT: ${DB_PORT}
DB_USERNAME: ${DB_USERNAME}
DB_PASSWORD: ${DB_PASSWORD}
AUTH_CLIENT_ID: ${AUTH_CLIENT_ID}
AUTH_CLIENT_SECRET: ${AUTH_CLIENT_SECRET}
AUTH_ISSUER: ${AUTH_ISSUER}
HCAPTCHA_SECRET: ${HCAPTCHA_SECRET}
HCAPTCHA_SITEKEY: ${HCAPTCHA_SITEKEY}
WEBHOOK: ${WEBHOOK}
website-db-dev:
image: postgres image: postgres
container_name: website-db container_name: website-db
environment: environment:
@ -18,8 +34,7 @@ services:
POSTGRES_DB: website POSTGRES_DB: website
volumes: volumes:
- website-db-data:/data/postgres - website-db-data:/data/postgres
ports:
- "5432:5432"
restart: unless-stopped restart: unless-stopped
volumes: volumes:

View File

@ -31,13 +31,13 @@
"tslib": "^2.4.1", "tslib": "^2.4.1",
"typescript": "^4.9.4", "typescript": "^4.9.4",
"unocss": "^0.48.0", "unocss": "^0.48.0",
"vite": "4.0.3", "vite": "4.0.3"
"yaml": "^2.2.1"
}, },
"type": "module", "type": "module",
"dependencies": { "dependencies": {
"@auth/core": "^0.2.4", "@auth/core": "^0.2.4",
"@auth/sveltekit": "^0.1.11", "@auth/sveltekit": "^0.1.11",
"dotenv": "^16.0.3",
"joi": "^17.7.0", "joi": "^17.7.0",
"pg": "^8.8.0", "pg": "^8.8.0",
"pg-hstore": "^2.3.4", "pg-hstore": "^2.3.4",

View File

@ -11,6 +11,7 @@ specifiers:
consola: ^2.15.3 consola: ^2.15.3
dayjs: ^1.11.7 dayjs: ^1.11.7
discord-webhook-node: ^1.1.8 discord-webhook-node: ^1.1.8
dotenv: ^16.0.3
joi: ^17.7.0 joi: ^17.7.0
mdsvex: ^0.10.6 mdsvex: ^0.10.6
pg: ^8.8.0 pg: ^8.8.0
@ -29,11 +30,11 @@ specifiers:
typescript: ^4.9.4 typescript: ^4.9.4
unocss: ^0.48.0 unocss: ^0.48.0
vite: 4.0.3 vite: 4.0.3
yaml: ^2.2.1
dependencies: dependencies:
'@auth/core': 0.2.4 '@auth/core': 0.2.4
'@auth/sveltekit': 0.1.11_f5fzfhbe3oooig6fzl5vkyl5v4 '@auth/sveltekit': 0.1.11_f5fzfhbe3oooig6fzl5vkyl5v4
dotenv: 16.0.3
joi: 17.7.0 joi: 17.7.0
pg: 8.8.0 pg: 8.8.0
pg-hstore: 2.3.4 pg-hstore: 2.3.4
@ -62,7 +63,6 @@ devDependencies:
typescript: 4.9.4 typescript: 4.9.4
unocss: 0.48.0_vite@4.0.3 unocss: 0.48.0_vite@4.0.3
vite: 4.0.3 vite: 4.0.3
yaml: 2.2.1
packages: packages:
@ -946,6 +946,11 @@ packages:
- encoding - encoding
dev: true dev: true
/dotenv/16.0.3:
resolution: {integrity: sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==}
engines: {node: '>=12'}
dev: false
/dottie/2.0.2: /dottie/2.0.2:
resolution: {integrity: sha512-fmrwR04lsniq/uSr8yikThDTrM7epXHBAAjH9TbeH3rEA8tdCO7mRzB9hdmdGyJCxF8KERo9CITcm3kGuoyMhg==} resolution: {integrity: sha512-fmrwR04lsniq/uSr8yikThDTrM7epXHBAAjH9TbeH3rEA8tdCO7mRzB9hdmdGyJCxF8KERo9CITcm3kGuoyMhg==}
dev: false dev: false
@ -2160,11 +2165,6 @@ packages:
resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
dev: false dev: false
/yaml/2.2.1:
resolution: {integrity: sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==}
engines: {node: '>= 14'}
dev: true
/yocto-queue/0.1.0: /yocto-queue/0.1.0:
resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
engines: {node: '>=10'} engines: {node: '>=10'}

View File

@ -3,7 +3,10 @@ import unoCSS from "unocss/vite";
import { defineConfig } from "vite"; import { defineConfig } from "vite";
const config = defineConfig({ const config = defineConfig({
plugins: [sveltekit(), unoCSS()] plugins: [sveltekit(), unoCSS()],
optimizeDeps: {
include: ["pg", "pg-hstore"]
}
}); });
export default config; export default config;