Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modify docker images build #380

Merged
merged 3 commits into from
Oct 6, 2021
Merged

Modify docker images build #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c07f2d8
Modify images build config
sk81biz Oct 6, 2021
bf115d7
Cosmetic modify
sk81biz Oct 6, 2021
ae93fd6
Modify git clone ind Dockerfile
sk81biz Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/install/common/build-frontend.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ echo "== FRONT-END-BUILD =="

cd ${SRC_PATH}
yarn install

# debug config
if [ "$DEBUG_INFO" = true ]; then
yarn debug-info
fi
Expand Down
4 changes: 2 additions & 2 deletions build/install/docker/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
PRODUCT=onlyoffice
REPO=${PRODUCT}
STATUS=""
SRV_VERSION=latest
MYSQL_VERSION=8.0.18
ELK_VERSION=7.13.1
SERVICE_PORT=5050
CONTAINER_PREFIX=${PRODUCT}-
DOCKERFILE=Dockerfile-app
DOCKER_TAG=latest
DOCKERFILE=Dockerfile.app

# zookeeper #
ZOO_PORT=2181
Expand Down
355 changes: 0 additions & 355 deletions build/install/docker/Dockerfile-app-dll
View file
Open in desktop

This file was deleted.

9 changes: 3 additions & 6 deletions build/install/docker/Dockerfile-app → build/install/docker/Dockerfile.app
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,10 @@ RUN echo "nameserver 8.8.8.8" | tee /etc/resolv.conf > /dev/null && \
curl -fsSL https://deb.nodesource.com/setup_14.x | sudo -E bash - && \
apt-get install -y nodejs

RUN echo "nameserver 8.8.8.8" | tee /etc/resolv.conf > /dev/null && \
echo ${GIT_BRANCH} && \
git clone --depth 1 --recurse-submodules -b ${GIT_BRANCH} https://github.com/ONLYOFFICE/AppServer.git ${SRC_PATH}
RUN echo ${GIT_BRANCH} && \
git clone --recurse-submodules -b ${GIT_BRANCH} https://github.com/ONLYOFFICE/AppServer.git ${SRC_PATH}

RUN echo "nameserver 8.8.8.8" | tee /etc/resolv.conf > /dev/null && \
cd ${SRC_PATH} && \
RUN cd ${SRC_PATH} && \
mkdir -p /app/onlyoffice/config/ && cp -rf config/* /app/onlyoffice/config/ && \
mkdir -p /etc/nginx/conf.d && cp -f config/nginx/onlyoffice*.conf /etc/nginx/conf.d/ && \
mkdir -p /etc/nginx/includes/ && cp -f config/nginx/includes/onlyoffice*.conf /etc/nginx/includes/ && \
Expand All @@ -64,7 +62,6 @@ RUN echo "nameserver 8.8.8.8" | tee /etc/resolv.conf > /dev/null && \
rm -rf ${SRC_PATH}/products/ASC.People/Server/* && \
rm -rf ${SRC_PATH}/products/ASC.Projects/Server/*


COPY config/mysql/conf.d/mysql.cnf /etc/mysql/conf.d/mysql.cnf

RUN rm -rf /var/lib/apt/lists/*
Expand Down
78 changes: 20 additions & 58 deletions build/install/docker/appserver.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ x-service:
DOCUMENT_SERVER_JWT_HEADER: ${DOCUMENT_SERVER_JWT_HEADER}
DOCUMENT_SERVER_URL_PUBLIC: ${DOCUMENT_SERVER_URL_PUBLIC}
DOCUMENT_SERVER_URL_INTERNAL: ${DOCUMENT_SERVER_URL_INTERNAL}
DOCUMENT_SERVER_URL_CONVERTER: ${DOCUMENT_SERVER_URL_CONVERTER}
KAFKA_HOST: ${KAFKA_HOST}
ELK_HOST: ${ELK_HOST}
PROXY_HOST: ${PROXY_HOST}
Expand All @@ -32,7 +31,6 @@ x-service:
- calendar_data:/var/www/products/ASC.Calendar/server/
- mail_data:/var/www/products/ASC.Mail/server/


services:
onlyoffice-elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:${ELK_VERSION}
Expand All @@ -55,148 +53,115 @@ services:
- "9200"
- "9300"

onlyoffice-zookeeper:
image: zookeeper:latest
container_name: ${ZOO_HOST}
restart: always
expose:
- "2181"
environment:
ZOO_MY_ID: 1
ZOO_PORT: ${ZOO_PORT:-2181}
ZOO_SERVER: ${ZOO_SERVER}
volumes:
- zoo_data:/data
- zoo_log:/datalog

onlyoffice-kafka:
image: confluentinc/cp-kafka:latest
container_name: ${KAFKA_HOST}
restart: always
expose:
- "9092"
depends_on:
- onlyoffice-zookeeper
environment:
KAFKA_ADVERTISED_LISTENERS: ${KAFKA_ADVERTISED_LISTENERS}
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: ${KAFKA_LISTENER_SECURITY_PROTOCOL_MAP}
KAFKA_INTER_BROKER_LISTENER_NAME: ${KAFKA_INTER_BROKER_LISTENER_NAME}
KAFKA_ZOOKEEPER_CONNECT: ${KAFKA_ZOOKEEPER_CONNECT}
KAFKA_BROKER_ID: ${KAFKA_BROKER_ID}
KAFKA_LOG4J_LOGGERS: ${KAFKA_LOG4J_LOGGERS}
KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: ${KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR}
volumes:
- kafka_data:/var/lib/kafka/data

onlyoffice-api-system:
<<: *x-service-base
image: "${REPO}/${STATUS}appserver-api-system:${SRV_VERSION}"
image: "${REPO}/${STATUS}appserver-api-system:${DOCKER_TAG}"
container_name: ${API_SYSTEM_HOST}

onlyoffice-backup:
<<: *x-service-base
image: "${REPO}/${STATUS}appserver-backup:${SRV_VERSION}"
image: "${REPO}/${STATUS}appserver-backup:${DOCKER_TAG}"
container_name: ${BACKUP_HOST}

onlyoffice-calendar:
<<: *x-service-base
image: "${REPO}/${STATUS}appserver-calendar:${SRV_VERSION}"
image: "${REPO}/${STATUS}appserver-calendar:${DOCKER_TAG}"
container_name: ${CALENDAR_HOST}

onlyoffice-crm:
<<: *x-service-base
image: "${REPO}/${STATUS}appserver-crm:${SRV_VERSION}"
image: "${REPO}/${STATUS}appserver-crm:${DOCKER_TAG}"
container_name: ${CRM_HOST}

onlyoffice-storage-encryption:
<<: *x-service-base
image: "${REPO}/${STATUS}appserver-storage-encryption:${SRV_VERSION}"
image: "${REPO}/${STATUS}appserver-storage-encryption:${DOCKER_TAG}"
container_name: ${STORAGE_ENCRYPTION_HOST}

onlyoffice-files:
<<: *x-service-base
image: "${REPO}/${STATUS}appserver-files:${SRV_VERSION}"
image: "${REPO}/${STATUS}appserver-files:${DOCKER_TAG}"
container_name: ${FILES_HOST}

onlyoffice-files-services:
<<: *x-service-base
image: "${REPO}/${STATUS}appserver-files-services:${SRV_VERSION}"
image: "${REPO}/${STATUS}appserver-files-services:${DOCKER_TAG}"
container_name: ${FILES_SERVICES_HOST}

onlyoffice-mail:
<<: *x-service-base
image: "${REPO}/${STATUS}appserver-mail:${SRV_VERSION}"
image: "${REPO}/${STATUS}appserver-mail:${DOCKER_TAG}"
container_name: ${MAIL_HOST}

onlyoffice-storage-migration:
<<: *x-service-base
image: "${REPO}/${STATUS}appserver-storage-migration:${SRV_VERSION}"
image: "${REPO}/${STATUS}appserver-storage-migration:${DOCKER_TAG}"
container_name: ${STORAGE_MIGRATION_HOST}

onlyoffice-people-server:
<<: *x-service-base
image: "${REPO}/${STATUS}appserver-people-server:${SRV_VERSION}"
image: "${REPO}/${STATUS}appserver-people-server:${DOCKER_TAG}"
container_name: ${PEOPLE_SERVER_HOST}

onlyoffice-projects-server:
<<: *x-service-base
image: "${REPO}/${STATUS}appserver-projects-server:${SRV_VERSION}"
image: "${REPO}/${STATUS}appserver-projects-server:${DOCKER_TAG}"
container_name: ${PROJECTS_SERVER_HOST}

onlyoffice-socket:
<<: *x-service-base
image: "${REPO}/${STATUS}appserver-socket:${SRV_VERSION}"
image: "${REPO}/${STATUS}appserver-socket:${DOCKER_TAG}"
container_name: ${SOCKET_HOST}
expose:
- ${SERVICE_PORT}
- "9899"

onlyoffice-studio-notify:
<<: *x-service-base
image: "${REPO}/${STATUS}appserver-studio-notify:${SRV_VERSION}"
image: "${REPO}/${STATUS}appserver-studio-notify:${DOCKER_TAG}"
container_name: ${STUDIO_NOTIFY_HOST}

onlyoffice-telegram-service:
<<: *x-service-base
image: "${REPO}/${STATUS}appserver-telegram-service:${SRV_VERSION}"
image: "${REPO}/${STATUS}appserver-telegram-service:${DOCKER_TAG}"
container_name: ${TELEGRAM_SERVICE_HOST}

onlyoffice-thumbnails:
<<: *x-service-base
image: "${REPO}/${STATUS}appserver-thumbnails:${SRV_VERSION}"
image: "${REPO}/${STATUS}appserver-thumbnails:${DOCKER_TAG}"
container_name: ${THUMBNAILS_HOST}
expose:
- ${SERVICE_PORT}
- "9800"

onlyoffice-urlshortener:
<<: *x-service-base
image: "${REPO}/${STATUS}appserver-urlshortener:${SRV_VERSION}"
image: "${REPO}/${STATUS}appserver-urlshortener:${DOCKER_TAG}"
container_name: ${URLSHORTENER_HOST}
expose:
- ${SERVICE_PORT}
- "9999"

onlyoffice-api:
<<: *x-service-base
image: "${REPO}/${STATUS}appserver-api:${SRV_VERSION}"
image: "${REPO}/${STATUS}appserver-api:${DOCKER_TAG}"
container_name: ${API_HOST}

onlyoffice-studio:
<<: *x-service-base
image: "${REPO}/${STATUS}appserver-studio:${SRV_VERSION}"
image: "${REPO}/${STATUS}appserver-studio:${DOCKER_TAG}"
container_name: ${STUDIO_HOST}

onlyoffice-ssoauth:
<<: *x-service-base
image: "${REPO}/${STATUS}appserver-ssoauth:${SRV_VERSION}"
image: "${REPO}/${STATUS}appserver-ssoauth:${DOCKER_TAG}"
container_name: ${SSOAUTH_HOST}
expose:
- ${SERVICE_PORT}
- "9834"

onlyoffice-proxy:
image: "${REPO}/${STATUS}appserver-proxy:${SRV_VERSION}"
image: "${REPO}/${STATUS}appserver-proxy:${DOCKER_TAG}"
container_name: ${PROXY_HOST}
restart: always
expose:
Expand Down Expand Up @@ -257,10 +222,7 @@ networks:
name: ${NETWORK_NAME}

volumes:
kafka_data:
es_data:
zoo_data:
zoo_log:
proxy_log:
app_data:
files_data:
Expand Down
Loading