diff --git a/build/install/docker/Dockerfile.dev b/build/install/docker/Dockerfile.dev index a074652602..c825043180 100644 --- a/build/install/docker/Dockerfile.dev +++ b/build/install/docker/Dockerfile.dev @@ -130,6 +130,7 @@ ENV DNS_NAMESERVER=127.0.0.11 \ RUN apt-get -y update && \ apt-get install -yq vim && \ + apt-get install -yq dos2unix && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /usr/share/nginx/html/* @@ -138,8 +139,13 @@ COPY --from=base /etc/nginx/conf.d /etc/nginx/conf.d COPY --from=base /etc/nginx/includes /etc/nginx/includes COPY /config/nginx/templates/upstream.conf.template /etc/nginx/templates/upstream.conf.template COPY /config/nginx/templates/nginx.conf.template /etc/nginx/nginx.conf.template + COPY prepare-nginx-proxy.sh /docker-entrypoint.d/prepare-nginx-proxy.sh +RUN dos2unix /docker-entrypoint.d/prepare-nginx-proxy.sh && \ + apt-get --purge remove -yq dos2unix && \ + rm -rf /var/lib/apt/lists/* + # add defualt user and group for no-root run RUN chown nginx:nginx /etc/nginx/* -R && \ chown nginx:nginx /docker-entrypoint.d/* && \ @@ -164,7 +170,7 @@ FROM dotnetrun AS backup_background WORKDIR ${BUILD_PATH}/services/ASC.Data.Backup.BackgroundTasks/ COPY --chown=onlyoffice:onlyoffice docker-entrypoint.py ./docker-entrypoint.py -COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Data.Backup.BackgroundTasks/service/ . +COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Data.Backup.BackgroundTasks/service/ . CMD ["ASC.Data.Backup.BackgroundTasks.dll", "ASC.Data.Backup.BackgroundTasks"] @@ -173,27 +179,27 @@ FROM dotnetrun AS api_system WORKDIR ${BUILD_PATH}/services/ASC.ApiSystem/ COPY --chown=onlyoffice:onlyoffice docker-entrypoint.py ./docker-entrypoint.py -COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.ApiSystem/service/ . +COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.ApiSystem/service/ . -CMD [" ASC.ApiSystem.dll", " ASC.ApiSystem"] +CMD ["ASC.ApiSystem.dll", "ASC.ApiSystem"] ## ASC.ClearEvents ## FROM dotnetrun AS clear-events WORKDIR ${BUILD_PATH}/services/ASC.ClearEvents/ COPY --chown=onlyoffice:onlyoffice docker-entrypoint.py ./docker-entrypoint.py -COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.ClearEvents/service/ . +COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.ClearEvents/service/ . CMD ["ASC.ClearEvents.dll", "ASC.ClearEvents"] ## ASC.Migration ## -FROM dotnetrun AS migration -WORKDIR ${BUILD_PATH}/services/ASC.Migration/ +# FROM dotnetrun AS migration +# WORKDIR ${BUILD_PATH}/services/ASC.Migration/ -COPY --chown=onlyoffice:onlyoffice docker-entrypoint.py ./docker-entrypoint.py -COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Migration/service/ . +# COPY --chown=onlyoffice:onlyoffice docker-entrypoint.py ./docker-entrypoint.py +# COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Migration/service/ . -CMD ["ASC.Migration.dll", "ASC.Migration"] +# CMD ["ASC.Migration.dll", "ASC.Migration"] ## ASC.Data.Backup ## FROM dotnetrun AS backup @@ -268,22 +274,22 @@ COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Studio CMD ["ASC.Studio.Notify.dll", "ASC.Studio.Notify"] ## ASC.TelegramService ## -FROM dotnetrun AS telegram_service -WORKDIR ${BUILD_PATH}/services/ASC.TelegramService/ +# FROM dotnetrun AS telegram_service +# WORKDIR ${BUILD_PATH}/services/ASC.TelegramService/ -COPY --chown=onlyoffice:onlyoffice docker-entrypoint.py ./docker-entrypoint.py -COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.TelegramService/service/ . +# COPY --chown=onlyoffice:onlyoffice docker-entrypoint.py ./docker-entrypoint.py +# COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.TelegramService/service/ . -CMD ["ASC.TelegramService.dll", "ASC.TelegramService"] +# CMD ["ASC.TelegramService.dll", "ASC.TelegramService"] ## ASC.UrlShortener ## -FROM noderun AS urlshortener -WORKDIR ${BUILD_PATH}/services/ASC.UrlShortener/service/ +# FROM noderun AS urlshortener +# WORKDIR ${BUILD_PATH}/services/ASC.UrlShortener/service/ -COPY --chown=onlyoffice:onlyoffice docker-entrypoint.py ./docker-entrypoint.py -COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.UrlShortener/service/ . +# COPY --chown=onlyoffice:onlyoffice docker-entrypoint.py ./docker-entrypoint.py +# COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.UrlShortener/service/ . -CMD ["index.js", "ASC.UrlShortener"] +# CMD ["index.js", "ASC.UrlShortener"] ## ASC.Web.Api ## FROM dotnetrun AS api @@ -295,13 +301,13 @@ COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Web.Ap CMD ["ASC.Web.Api.dll", "ASC.Web.Api"] ## ASC.Webhooks.Service ## -FROM dotnetrun AS webhooks-service -WORKDIR ${BUILD_PATH}/services/ASC.Webhooks.Service/ +# FROM dotnetrun AS webhooks-service +# WORKDIR ${BUILD_PATH}/services/ASC.Webhooks.Service/ -COPY --chown=onlyoffice:onlyoffice docker-entrypoint.py ./docker-entrypoint.py -COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Webhooks.Service/service/ . +# COPY --chown=onlyoffice:onlyoffice docker-entrypoint.py ./docker-entrypoint.py +# COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Webhooks.Service/service/ . -CMD ["ASC.Webhooks.Service.dll", "ASC.Webhooks.Service"] +# CMD ["ASC.Webhooks.Service.dll", "ASC.Webhooks.Service"] ## ASC.Web.Studio ## FROM dotnetrun AS studio @@ -319,7 +325,16 @@ ARG SRC_PATH ENV BUILD_PATH=${BUILD_PATH} ENV SRC_PATH=${SRC_PATH} WORKDIR ${BUILD_PATH}/services/ASC.Migration.Runner/ -COPY docker-migration-entrypoint.sh docker-migration-entrypoint.sh + +RUN apt-get update && \ + apt-get install -yq dos2unix + +COPY docker-migration-entrypoint.sh docker-migration-entrypoint.sh + +RUN dos2unix docker-migration-entrypoint.sh && \ + apt-get --purge remove -yq dos2unix && \ + rm -rf /var/lib/apt/lists/* + COPY --from=base ${SRC_PATH}/ASC.Migration.Runner/service/ . ENTRYPOINT ["./docker-migration-entrypoint.sh"]