Update docker-compose.yml to use bind mount for database initialization and add script execution for dos2unix; modify CORS origin check in app.ts for production environment
This commit is contained in:
@@ -113,7 +113,23 @@ services:
|
|||||||
- worklenz
|
- worklenz
|
||||||
volumes:
|
volumes:
|
||||||
- worklenz_postgres_data:/var/lib/postgresql/data
|
- worklenz_postgres_data:/var/lib/postgresql/data
|
||||||
- ./worklenz-backend/database/:/docker-entrypoint-initdb.d
|
- type: bind
|
||||||
|
source: ./worklenz-backend/database
|
||||||
|
target: /docker-entrypoint-initdb.d
|
||||||
|
consistency: cached
|
||||||
|
command: >
|
||||||
|
bash -c '
|
||||||
|
if command -v apt-get >/dev/null 2>&1; then
|
||||||
|
apt-get update && apt-get install -y dos2unix
|
||||||
|
elif command -v apk >/dev/null 2>&1; then
|
||||||
|
apk add --no-cache dos2unix
|
||||||
|
fi &&
|
||||||
|
find /docker-entrypoint-initdb.d -type f -name "*.sh" -exec sh -c '\''
|
||||||
|
dos2unix "{}" 2>/dev/null || true
|
||||||
|
chmod +x "{}"
|
||||||
|
'\'' \; &&
|
||||||
|
exec docker-entrypoint.sh postgres
|
||||||
|
'
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
worklenz_postgres_data:
|
worklenz_postgres_data:
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ const allowedOrigins = [
|
|||||||
|
|
||||||
app.use(cors({
|
app.use(cors({
|
||||||
origin: (origin, callback) => {
|
origin: (origin, callback) => {
|
||||||
if (!origin || allowedOrigins.includes(origin)) {
|
if (!isProduction() || !origin || allowedOrigins.includes(origin)) {
|
||||||
callback(null, true);
|
callback(null, true);
|
||||||
} else {
|
} else {
|
||||||
console.log("Blocked origin:", origin, process.env.NODE_ENV);
|
console.log("Blocked origin:", origin, process.env.NODE_ENV);
|
||||||
|
|||||||
Reference in New Issue
Block a user