fixed some error
Some checks failed
check / markdownlint (push) Has been cancelled
check / spellchecker (push) Has been cancelled

This commit is contained in:
Yajbir Singh
2025-12-05 22:55:29 +05:30
parent 015c89abfe
commit 3e5bb28c6b
2 changed files with 3 additions and 33 deletions

View File

@@ -9,8 +9,6 @@ LABEL description="ONLYOFFICE DocumentServer for ARM64 and AMD64"
ARG BASE_VERSION ARG BASE_VERSION
ARG PG_VERSION=16 ARG PG_VERSION=16
ARG PACKAGE_SUFFIX=t64 ARG PACKAGE_SUFFIX=t64
# Oracle Instant Client versions
ENV OC_RELEASE_NUM=23 ENV OC_RELEASE_NUM=23
ENV OC_RU_VER=7 ENV OC_RU_VER=7
ENV OC_RU_REVISION_VER=0 ENV OC_RU_REVISION_VER=0
@@ -21,7 +19,7 @@ ENV OC_FILE_SUFFIX=${OC_RELEASE_NUM}.${OC_RU_VER}.${OC_RU_REVISION_VER}.${OC_RES
ENV OC_VER_DIR=${OC_RELEASE_NUM}_${OC_RU_VER} ENV OC_VER_DIR=${OC_RELEASE_NUM}_${OC_RU_VER}
ENV OC_DOWNLOAD_URL=https://download.oracle.com/otn_software/linux/instantclient/${OC_PATH} ENV OC_DOWNLOAD_URL=https://download.oracle.com/otn_software/linux/instantclient/${OC_PATH}
# Locale and environment
ENV LANG=en_US.UTF-8 \ ENV LANG=en_US.UTF-8 \
LANGUAGE=en_US:en \ LANGUAGE=en_US:en \
LC_ALL=en_US.UTF-8 \ LC_ALL=en_US.UTF-8 \
@@ -29,7 +27,6 @@ ENV LANG=en_US.UTF-8 \
PG_VERSION=${PG_VERSION} \ PG_VERSION=${PG_VERSION} \
BASE_VERSION=${BASE_VERSION} BASE_VERSION=${BASE_VERSION}
# Company and product info
ARG COMPANY_NAME=onlyoffice ARG COMPANY_NAME=onlyoffice
ARG PRODUCT_NAME=documentserver ARG PRODUCT_NAME=documentserver
ARG PRODUCT_EDITION= ARG PRODUCT_EDITION=
@@ -43,10 +40,7 @@ ENV COMPANY_NAME=$COMPANY_NAME \
DS_PLUGIN_INSTALLATION=false \ DS_PLUGIN_INSTALLATION=false \
DS_DOCKER_INSTALLATION=true DS_DOCKER_INSTALLATION=true
# ============================================
# HARDCODED CONFIGURATION - NO ENV VARS NEEDED
# ============================================
# Database Configuration
ENV DB_TYPE=postgres \ ENV DB_TYPE=postgres \
DB_HOST=localhost \ DB_HOST=localhost \
DB_PORT=5432 \ DB_PORT=5432 \
@@ -226,7 +220,7 @@ RUN PACKAGE_FILE="${COMPANY_NAME}-${PRODUCT_NAME}${PRODUCT_EDITION}${PACKAGE_VER
rm -rf /var/log/$COMPANY_NAME && \ rm -rf /var/log/$COMPANY_NAME && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Define volumes for persistent data
VOLUME /var/log/$COMPANY_NAME \ VOLUME /var/log/$COMPANY_NAME \
/var/lib/$COMPANY_NAME \ /var/lib/$COMPANY_NAME \
/var/www/$COMPANY_NAME/Data \ /var/www/$COMPANY_NAME/Data \
@@ -235,5 +229,4 @@ VOLUME /var/log/$COMPANY_NAME \
/var/lib/redis \ /var/lib/redis \
/usr/share/fonts/truetype/custom /usr/share/fonts/truetype/custom
# Set entrypoint
ENTRYPOINT ["/app/ds/run-document-server.sh"] ENTRYPOINT ["/app/ds/run-document-server.sh"]

View File

@@ -1,11 +1,5 @@
# ONLYOFFICE DocumentServer Docker Compose Configuration
# All services run with hardcoded credentials - no environment variables needed
# Works on both ARM64 and AMD64 architectures
services: services:
# ===========================================
# ONLYOFFICE DocumentServer - Main Service
# ===========================================
onlyoffice-documentserver: onlyoffice-documentserver:
build: build:
context: . context: .
@@ -19,7 +13,6 @@ services:
onlyoffice-rabbitmq: onlyoffice-rabbitmq:
condition: service_healthy condition: service_healthy
environment: environment:
# Database Configuration
- DB_TYPE=postgres - DB_TYPE=postgres
- DB_HOST=onlyoffice-postgresql - DB_HOST=onlyoffice-postgresql
- DB_PORT=5432 - DB_PORT=5432
@@ -32,21 +25,17 @@ services:
- AMQP_SERVER_PORT=5672 - AMQP_SERVER_PORT=5672
- AMQP_SERVER_USER=guest - AMQP_SERVER_USER=guest
- AMQP_SERVER_PWD=guest - AMQP_SERVER_PWD=guest
# Redis Configuration (using built-in Redis)
- REDIS_SERVER_HOST=localhost - REDIS_SERVER_HOST=localhost
- REDIS_SERVER_PORT=6379 - REDIS_SERVER_PORT=6379
- REDIS_ENABLED=true - REDIS_ENABLED=true
# JWT Configuration (disabled for simplicity)
- JWT_ENABLED=false - JWT_ENABLED=false
- JWT_SECRET=secret - JWT_SECRET=secret
- JWT_HEADER=Authorization - JWT_HEADER=Authorization
- JWT_IN_BODY=false - JWT_IN_BODY=false
# Other settings
- WOPI_ENABLED=false - WOPI_ENABLED=false
- GENERATE_FONTS=true - GENERATE_FONTS=true
- PLUGINS_ENABLED=true - PLUGINS_ENABLED=true
- DS_LOG_LEVEL=WARN - DS_LOG_LEVEL=WARN
# Enable test example page (access at http://your-server/example)
- DS_EXAMPLE=true - DS_EXAMPLE=true
ports: ports:
- '80:80' - '80:80'
@@ -66,9 +55,6 @@ services:
- ds_cache:/var/lib/onlyoffice/documentserver/App_Data/cache/files - ds_cache:/var/lib/onlyoffice/documentserver/App_Data/cache/files
- ds_fonts:/usr/share/fonts/truetype/custom - ds_fonts:/usr/share/fonts/truetype/custom
# ===========================================
# PostgreSQL Database
# ===========================================
onlyoffice-postgresql: onlyoffice-postgresql:
container_name: onlyoffice-postgresql container_name: onlyoffice-postgresql
image: postgres:16 image: postgres:16
@@ -89,9 +75,6 @@ services:
start_period: 10s start_period: 10s
timeout: 5s timeout: 5s
# ===========================================
# RabbitMQ Message Broker
# ===========================================
onlyoffice-rabbitmq: onlyoffice-rabbitmq:
container_name: onlyoffice-rabbitmq container_name: onlyoffice-rabbitmq
image: rabbitmq:3-management image: rabbitmq:3-management
@@ -112,9 +95,6 @@ services:
start_period: 30s start_period: 30s
timeout: 10s timeout: 10s
# ===========================================
# Persistent Volumes
# ===========================================
volumes: volumes:
postgresql_data: postgresql_data:
driver: local driver: local
@@ -129,9 +109,6 @@ volumes:
ds_fonts: ds_fonts:
driver: local driver: local
# ===========================================
# Network Configuration
# ===========================================
networks: networks:
default: default:
name: onlyoffice-network name: onlyoffice-network