Compare commits

...

7 Commits

Author SHA1 Message Date
16bb0c8740 Small fix 2024-07-03 12:52:19 +03:00
8aa75be9c1 Small fix 2024-07-03 12:51:13 +03:00
3ab29b1a8e Merge branch 'develop' into feature/build-output 2024-07-03 12:48:20 +03:00
97246467ed Fix production 2023-07-05 13:44:12 +03:00
cc4539e829 Merge branch 'develop' into feature/build-output 2023-07-05 13:39:18 +03:00
b40eb3472d Some conversation 2023-05-17 18:00:30 +03:00
bca002db8e Fix trace build commands #609 2023-05-02 16:21:56 +03:00
2 changed files with 6 additions and 3 deletions

View File

@ -22,7 +22,8 @@ ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=nonint
ARG ONLYOFFICE_VALUE=onlyoffice
RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
RUN set -eux && \
echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
apt-get -y update && \
apt-get -yq install wget apt-transport-https gnupg locales lsb-release && \
wget -q -O /etc/apt/sources.list.d/mssql-release.list https://packages.microsoft.com/config/ubuntu/$BASE_VERSION/prod.list && \
@ -110,7 +111,8 @@ ENV COMPANY_NAME=$COMPANY_NAME \
PRODUCT_EDITION=$PRODUCT_EDITION \
DS_DOCKER_INSTALLATION=true
RUN PACKAGE_FILE="${COMPANY_NAME}-${PRODUCT_NAME}${PRODUCT_EDITION}${PACKAGE_VERSION:+_$PACKAGE_VERSION}_${TARGETARCH:-$(dpkg --print-architecture)}.deb" && \
RUN set -eux && \
env PACKAGE_FILE="${COMPANY_NAME}-${PRODUCT_NAME}${PRODUCT_EDITION}${PACKAGE_VERSION:+_$PACKAGE_VERSION}_${TARGETARCH:-$(dpkg --print-architecture)}.deb" && \
wget -q -P /tmp "$PACKAGE_BASEURL/$PACKAGE_FILE" && \
apt-get -y update && \
service postgresql start && \

View File

@ -26,7 +26,8 @@ ARG DS_SUPERVISOR_CONF=/etc/supervisor/conf.d/ds.conf
### Remove all documentserver-example data ###
RUN rm -rf /var/www/$COMPANY_NAME/$PRODUCT_NAME-example \
RUN set -eux && \
rm -rf /var/www/$COMPANY_NAME/$PRODUCT_NAME-example \
&& rm -rf /etc/$COMPANY_NAME/$PRODUCT_NAME-example \
&& rm -f $DS_SUPERVISOR_CONF \
&& rm -f /etc/nginx/includes/ds-example.conf \