diff --git a/Dockerfile b/Dockerfile index 5106bf894..d7a56c0bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,8 +9,6 @@ LABEL description="ONLYOFFICE DocumentServer for ARM64 and AMD64" ARG BASE_VERSION ARG PG_VERSION=16 ARG PACKAGE_SUFFIX=t64 - -# Oracle Instant Client versions ENV OC_RELEASE_NUM=23 ENV OC_RU_VER=7 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_DOWNLOAD_URL=https://download.oracle.com/otn_software/linux/instantclient/${OC_PATH} -# Locale and environment + ENV LANG=en_US.UTF-8 \ LANGUAGE=en_US:en \ LC_ALL=en_US.UTF-8 \ @@ -29,7 +27,6 @@ ENV LANG=en_US.UTF-8 \ PG_VERSION=${PG_VERSION} \ BASE_VERSION=${BASE_VERSION} -# Company and product info ARG COMPANY_NAME=onlyoffice ARG PRODUCT_NAME=documentserver ARG PRODUCT_EDITION= @@ -43,10 +40,7 @@ ENV COMPANY_NAME=$COMPANY_NAME \ DS_PLUGIN_INSTALLATION=false \ DS_DOCKER_INSTALLATION=true -# ============================================ -# HARDCODED CONFIGURATION - NO ENV VARS NEEDED -# ============================================ -# Database Configuration + ENV DB_TYPE=postgres \ DB_HOST=localhost \ 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/lib/apt/lists/* -# Define volumes for persistent data + VOLUME /var/log/$COMPANY_NAME \ /var/lib/$COMPANY_NAME \ /var/www/$COMPANY_NAME/Data \ @@ -235,5 +229,4 @@ VOLUME /var/log/$COMPANY_NAME \ /var/lib/redis \ /usr/share/fonts/truetype/custom -# Set entrypoint ENTRYPOINT ["/app/ds/run-document-server.sh"] diff --git a/docker-compose.yml b/docker-compose.yml index 6fc8ee2ec..f51d619dd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: - # =========================================== - # ONLYOFFICE DocumentServer - Main Service - # =========================================== onlyoffice-documentserver: build: context: . @@ -19,7 +13,6 @@ services: onlyoffice-rabbitmq: condition: service_healthy environment: - # Database Configuration - DB_TYPE=postgres - DB_HOST=onlyoffice-postgresql - DB_PORT=5432 @@ -32,21 +25,17 @@ services: - AMQP_SERVER_PORT=5672 - AMQP_SERVER_USER=guest - AMQP_SERVER_PWD=guest - # Redis Configuration (using built-in Redis) - REDIS_SERVER_HOST=localhost - REDIS_SERVER_PORT=6379 - REDIS_ENABLED=true - # JWT Configuration (disabled for simplicity) - JWT_ENABLED=false - JWT_SECRET=secret - JWT_HEADER=Authorization - JWT_IN_BODY=false - # Other settings - WOPI_ENABLED=false - GENERATE_FONTS=true - PLUGINS_ENABLED=true - DS_LOG_LEVEL=WARN - # Enable test example page (access at http://your-server/example) - DS_EXAMPLE=true ports: - '80:80' @@ -66,9 +55,6 @@ services: - ds_cache:/var/lib/onlyoffice/documentserver/App_Data/cache/files - ds_fonts:/usr/share/fonts/truetype/custom - # =========================================== - # PostgreSQL Database - # =========================================== onlyoffice-postgresql: container_name: onlyoffice-postgresql image: postgres:16 @@ -89,9 +75,6 @@ services: start_period: 10s timeout: 5s - # =========================================== - # RabbitMQ Message Broker - # =========================================== onlyoffice-rabbitmq: container_name: onlyoffice-rabbitmq image: rabbitmq:3-management @@ -112,9 +95,6 @@ services: start_period: 30s timeout: 10s -# =========================================== -# Persistent Volumes -# =========================================== volumes: postgresql_data: driver: local @@ -129,9 +109,6 @@ volumes: ds_fonts: driver: local -# =========================================== -# Network Configuration -# =========================================== networks: default: name: onlyoffice-network