diff --git a/Dockerfile b/Dockerfile index 0732971..7ef9995 100755 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,8 @@ ARG SERVER_VERSION 8.3.24.1586 # Variables For Container # Common -ENV LANG=ru_RU.UTF8 -ENV LC_ALL=ru_RU.UTF8 +ENV LANG=ru_RU.UTF-8 +ENV LC_ALL=ru_RU.UTF-8 ENV TZ=Europe/Moscow # Server ENV SERVER_VERSION=${SERVER_VERSION} @@ -34,10 +34,13 @@ RUN apt-get -qq update \ iproute2 \ apache2 \ libwebkit2gtk-4.0-37 \ + gawk \ && apt-get clean && apt-get autoremove # Set locale -RUN locale-gen ${LANG} \ +RUN echo "${LANG} UTF-8" > /etc/locale.gen \ + && locale-gen ${LANG} \ + && update-locale LANG=${LANG} \ && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone # S6 overlay install @@ -54,12 +57,9 @@ RUN /tmp/distr/1c/setup-full-${SERVER_VERSION}-x86_64.run \ --enable-components \ ws,liberica_jre,v8_install_deps,client_thin_fib \ --disable-components \ - client_full - -# RUN rm /tmp/distr/* - - -RUN /tmp/distr/license/1ce-installer-cli install --ignore-signature-warnings + client_full +RUN /tmp/distr/license/1ce-installer-cli install --ignore-signature-warnings +RUN rm -rf /tmp/distr/* #COPY ./services.d /etc/services.d COPY ./entrypoint.sh /entrypoint.sh diff --git a/README.txt b/README.txt index 8ba70f7..90611bd 100644 --- a/README.txt +++ b/README.txt @@ -5,7 +5,9 @@ To build image use options to choose version of server and s6 supervisor if need For example: docker build --tag srv1c:8.3.27.1859 --build-arg SERVER_VERSION=8.3.27.1859 --build-arg S6_OVERLAY_VERSION=3.2.1.0 . -./ring license activate --serial 8105431364 --validate --company ООО "МЕДИА ПРОДАКШН" --last-name Полякова --first-name Елена --middle-name Владимировна --email aliya@mediaprod.ru --country RU --zip-code 420066 --region Татарстан Респ --town Казань --street ул. Абсалямова --house 13 --previous-pin 334-970-273-653-397 --pin 543-972-349-546-928 --path /var/1C/licenses/ > /opt/1C/ck_lic_act.log +Образец для активации лицензии: +./ring license activate --serial 8105431364 --validate --company "ООО \"МЕДИА ПРОДАКШН\"" --last-name Полякова --first-name Елена --middle-name Владимировна --email aliya@mediaprod.ru --country RU --zip-code 420066 --region "Татарстан Респ" --town Казань --street "ул. Абсалямова" --house 13 --previous-pin 334-970-273-653-397 --pin 543-972-349-546-928 --path /var/1C/licenses/ > /opt/1C/ck_lic_act.log +./ring license activate --serial 8100291800 --validate --company "ООО \"МЕДИА ПРОДАКШН\"" --last-name Полякова --first-name Елена --middle-name Владимировна --email aliya@mediaprod.ru --country RU --zip-code 420066 --region "Татарстан Респ" --town Казань --street "ул. Абсалямова" --house 13 --previous-pin 320-241-844-946-866 --pin 078-380-003-055-303 --path /var/1C/licenses/ > /var/1C/licenses/lic_act.log o set a Debian CPU to maximum frequency, install linux-cpupower, then run sudo cpupower frequency-set -g performance to set the scaling governor to high performance. Alternatively, use echo performance | tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor to apply this immediately. Methods to Set Max CPU Frequency diff --git a/entrypoint.sh b/entrypoint.sh index 548a6db..0af2789 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -6,6 +6,17 @@ log() { echo "[$(date '+%Y-%m-%d %H:%M:%S')] $*" } +publish() { + log "Публикация $base_name" + $WORKDIR/webinst \ + -publish \ + -apache24 \ + -wsdir $base_name \ + -dir /var/www/1c/$base_name \ + -connstr "File=/bases/$base_name;" \ + -confpath /etc/apache2/apache2.conf +} + check() { log "Проверка наличия сервера" if [ ! -d "/opt/1cv8/x86_64/${SERVER_VERSION}/" ]; then @@ -39,17 +50,8 @@ check() { fi done fi -} - -publish() { - log "Публикация $base_name" - $WORKDIR/webinst \ - -publish \ - -apache24 \ - -wsdir $base_name \ - -dir /var/www/1c/$base_name \ - -connstr "File=/bases/$base_name;" \ - -confpath /etc/apache2/apache2.conf + log "Перечисление лицензий:" + /opt/1C/1CE/components/1c-enterprise-ring-0.19.5+12-x86_64/ring license list } start() {