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

No default plugins #78

Open
wants to merge 8 commits into
base: feature/plugins
Choose a base branch
from
Open

No default plugins #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
33c410b
Add kubectl in utils image (#70)
VyacheslavSemin Jan 31, 2023
c6795bc
Fix scripts directory name (#71)
VyacheslavSemin Feb 1, 2023
26efc35
Fix a set of pdf libraries (#72)
VyacheslavSemin Feb 2, 2023
8c48fe3
Fix the package repository url (#76)
VyacheslavSemin Feb 9, 2023
4ae11e3
Fix #73 Added the ability build a specific version (#77)
VyacheslavSemin Feb 10, 2023
d3f3434
Merge pull request #75 from ONLYOFFICE/release/v7.3.2
agolybev Feb 15, 2023
28c8211
Merge branch 'master' into feature/plugins
rizlas Mar 7, 2023
2a6f3a4
Modify only ds-service building part. Other images will inherit from …
rizlas Mar 7, 2023
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
15 changes: 10 additions & 5 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ RUN yum install sudo -y && \
FROM ds-base AS ds-service
ARG TARGETARCH
ARG PRODUCT_EDITION=
ARG PRODUCT_URL=http://download.onlyoffice.com/install/documentserver/linux/onlyoffice-documentserver$PRODUCT_EDITION.$TARGETARCH.rpm
ARG RELEASE_VERSION
ARG PRODUCT_URL=https://download.onlyoffice.com/install/documentserver/linux/onlyoffice-documentserver$PRODUCT_EDITION$RELEASE_VERSION.$TARGETARCH.rpm
ENV TARGETARCH=$TARGETARCH
RUN useradd --no-create-home --shell /sbin/nologin nginx && \
yum -y updateinfo && \
Expand Down Expand Up @@ -191,8 +192,7 @@ COPY --from=ds-service \
/usr/lib64/libDjVuFile.so \
/usr/lib64/libEpubFile.so \
/usr/lib64/libFb2File.so \
/usr/lib64/libPdfReader.so \
/usr/lib64/libPdfWriter.so \
/usr/lib64/libPdfFile.so \
/usr/lib64/libHtmlFile2.so \
/usr/lib64/libHtmlRenderer.so \
/usr/lib64/libUnicodeConverter.so \
Expand Down Expand Up @@ -252,10 +252,15 @@ ENTRYPOINT /var/www/onlyoffice/documentserver-example/docker-entrypoint.sh npm s
FROM alpine:latest AS utils
LABEL maintainer Ascensio System SIA <[email protected]>
RUN apk add bash postgresql-client mysql-client curl wget && \
curl -LO \
https://storage.googleapis.com/kubernetes-release/release/`curl \
-s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl && \
chmod +x ./kubectl && \
mv ./kubectl /usr/local/bin/kubectl && \
addgroup --system --gid 101 ds && \
adduser --system -G ds -h /home/ds --shell /bin/bash --uid 101 ds && \
mkdir /sql && \
chown -R ds:ds /sql
mkdir /scripts && \
chown -R ds:ds /scripts
USER ds

FROM statsd/statsd AS metrics
Expand Down
10 changes: 8 additions & 2 deletions Dockerfile.noplugins
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ COPY --chown=ds:ds \
COPY --chown=ds:ds \
fonts/ \
/var/www/$COMPANY_NAME/documentserver/core-fonts/custom/
RUN rm -rf /var/www/$COMPANY_NAME/documentserver/sdkjs-plugins/*/
COPY --chown=ds:ds \
plugins/ \
/var/www/$COMPANY_NAME/documentserver/sdkjs-plugins/
Expand Down Expand Up @@ -70,6 +71,9 @@ COPY --chown=ds:ds --from=ds-service \
COPY --chown=ds:ds --from=ds-service \
/var/www/$COMPANY_NAME/documentserver/sdkjs \
/var/www/$COMPANY_NAME/documentserver/sdkjs
COPY --chown=ds:ds --from=ds-service \
/var/www/$COMPANY_NAME/documentserver/sdkjs-plugins \
/var/www/$COMPANY_NAME/documentserver/sdkjs-plugins
COPY --chown=ds:ds --from=ds-service \
/var/www/$COMPANY_NAME/documentserver/web-apps \
/var/www/$COMPANY_NAME/documentserver/web-apps
Expand Down Expand Up @@ -99,7 +103,6 @@ RUN sed 's|\(application\/zip.*\)|\1\n application\/wasm wasm;|' \
ln -sf /dev/stderr /var/log/nginx/error.log && \
mkdir -p \
/var/lib/$COMPANY_NAME/documentserver/App_Data/cache/files \
/var/www/$COMPANY_NAME/documentserver/sdkjs-plugins \
/var/lib/$COMPANY_NAME/documentserver/App_Data/docbuilder && \
chown -R ds:ds /var/lib/$COMPANY_NAME/documentserver && \
find \
Expand All @@ -109,6 +112,7 @@ RUN sed 's|\(application\/zip.*\)|\1\n application\/wasm wasm;|' \
-exec sh -c 'gzip -cf9 $0 > $0.gz && chown ds:ds $0.gz' {} \; && \
find \
/var/www/$COMPANY_NAME/documentserver/sdkjs \
/var/www/$COMPANY_NAME/documentserver/sdkjs-plugins \
/var/www/$COMPANY_NAME/documentserver/web-apps \
/var/www/$COMPANY_NAME/documentserver-example/welcome \
-type f \
Expand All @@ -127,6 +131,9 @@ COPY --from=ds-service \
COPY --from=ds-service --chown=ds:ds \
/etc/$COMPANY_NAME/documentserver/log4js/production.json \
/etc/$COMPANY_NAME/documentserver/log4js/
COPY --from=ds-service \
/var/www/$COMPANY_NAME/documentserver/sdkjs-plugins \
/var/www/$COMPANY_NAME/documentserver/sdkjs-plugins
COPY --from=ds-service \
/var/www/$COMPANY_NAME/documentserver/web-apps/apps/common/main/resources/themes \
/var/www/$COMPANY_NAME/documentserver/web-apps/apps/common/main/resources/themes
Expand All @@ -143,7 +150,6 @@ COPY --from=ds-service \
/var/www/$COMPANY_NAME/documentserver/document-templates/new \
/var/www/$COMPANY_NAME/documentserver/document-templates/new
COPY docker-entrypoint.sh /usr/local/bin/
RUN mkdir -p /var/www/$COMPANY_NAME/documentserver/sdkjs-plugins
USER ds
ENTRYPOINT docker-entrypoint.sh /var/www/$COMPANY_NAME/documentserver/server/DocService/docservice
HEALTHCHECK --interval=10s --timeout=3s CMD curl -sf http://localhost:8000/index.html
Expand Down