Merge branch 'develop' into feature/company-info-settings
This commit is contained in:
commit
d666bc15dd
@ -20,7 +20,7 @@ docker_dir="$( pwd )"
|
||||
echo "Docker directory:" $docker_dir
|
||||
|
||||
docker_file=Dockerfile.dev
|
||||
core_base_domain=""
|
||||
core_base_domain="localhost"
|
||||
build_date=$(date +%Y-%m-%d)
|
||||
env_extension="dev"
|
||||
|
||||
|
@ -35,7 +35,7 @@ RUN apt-get -y update && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN echo ${GIT_BRANCH} && \
|
||||
git clone --depth 1 --recurse-submodules -b ${GIT_BRANCH} https://github.com/ONLYOFFICE/DocSpace.git ${SRC_PATH}
|
||||
git clone --recurse-submodules -b ${GIT_BRANCH} https://github.com/ONLYOFFICE/DocSpace.git ${SRC_PATH}
|
||||
|
||||
RUN cd ${SRC_PATH} && \
|
||||
# mkdir -p /app/onlyoffice/config/ && cp -rf config/* /app/onlyoffice/config/ && \
|
||||
|
@ -35,7 +35,7 @@ RUN apt-get -y update && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN echo ${GIT_BRANCH} && \
|
||||
git clone --depth 1 --recurse-submodules -b ${GIT_BRANCH} https://github.com/ONLYOFFICE/DocSpace.git ${SRC_PATH}
|
||||
git clone --recurse-submodules -b ${GIT_BRANCH} https://github.com/ONLYOFFICE/DocSpace.git ${SRC_PATH}
|
||||
|
||||
RUN cd ${SRC_PATH} && \
|
||||
mkdir -p /app/onlyoffice/ && \
|
||||
|
@ -37,7 +37,7 @@ echo "SERVICE_CLIENT: $client"
|
||||
|
||||
docker_file=Dockerfile.dev
|
||||
env_extension="dev"
|
||||
core_base_domain=""
|
||||
core_base_domain="localhost"
|
||||
|
||||
echo "Start all backend services"
|
||||
DOCKERFILE=$docker_file \
|
||||
|
Loading…
Reference in New Issue
Block a user