Skip to content

Commit 0e36e82

Browse files
astrizhachukAlexander Strizhachuk
authored and
Alexander Strizhachuk
committed
Feature/docker env (astrizhachuk#1)
Add docker env
1 parent 462784a commit 0e36e82

File tree

11 files changed

+86
-780
lines changed

11 files changed

+86
-780
lines changed

GitlabServices/src/Configuration/ManagedApplicationModule.bsl

Whitespace-only changes.

GitlabServices/src/Configuration/SessionModule.bsl

Whitespace-only changes.

README.md

+4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727

2828
* Модульные тесты EDT [1CUnits](https://github.com/DoublesunRUS/ru.capralow.dt.unit.launcher) - в расширении, см. [./GitlabServices.Tests](./GitlabServices.Tests);
2929

30+
## Процесс разработки и сборки проекта
31+
32+
//TODO описание сценария разворачивания дева через compose и сборки релизного контейнера
33+
3034
## BPMN: изменение внешней обработки
3135

3236
![Изменение внешней обработки: 1](./doc/images/ВнешниеОбработки.png)

docker-compose.yml

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
version: '3.8'
2+
3+
services:
4+
5+
srv:
6+
image: ${DOCKER_USERNAME}/server:${ONEC_VERSION}
7+
hostname: srv
8+
depends_on:
9+
- db
10+
ports:
11+
- "1540-1541:1540-1541"
12+
- "1550:1550" # для режима отладки
13+
- "1560-1591:1560-1591"
14+
# entrypoint нужен только для запуска сервера с отладкой
15+
entrypoint: ["/opt/1C/v8.3/x86_64/ragent", "-debug", "-http"]
16+
volumes:
17+
- srv_data:/home/usr1cv8/.1cv8
18+
- srv_log:/var/log/1C
19+
- ./tools/nethasp.ini:/opt/1C/v8.3/x86_64/conf/nethasp.ini
20+
networks:
21+
- back_net
22+
23+
db:
24+
image: strizhhh/postgresql-pro-1c:9.6
25+
ports:
26+
- "5432:5432"
27+
volumes:
28+
- db_data:/var/lib/postgresql
29+
networks:
30+
- back_net
31+
32+
web:
33+
image: ${DOCKER_USERNAME}/ws:${ONEC_VERSION}
34+
#domainname: host.docker.internal
35+
depends_on:
36+
- srv
37+
command: >
38+
bash -c "/opt/1C/v8.3/x86_64/webinst -apache24 -wsdir client -dir /var/www/client -descriptor /tmp/web/client/default.vrd -connstr 'Srvr=srv;Ref=gitlabServices;'
39+
&& /opt/1C/v8.3/x86_64/webinst -apache24 -wsdir api -dir /var/www/api -descriptor /tmp/web/api/default.vrd -connstr 'Srvr=srv;Ref=gitlabServices;usr=site;pwd=12345'
40+
&& /usr/sbin/apache2ctl -DFOREGROUND"
41+
ports:
42+
- "80:80"
43+
volumes:
44+
- srv_data:/home/usr1cv8/.1cv8
45+
- srv_log:/var/log/1C
46+
- ./web:/tmp/web
47+
networks:
48+
- back_net
49+
50+
client:
51+
image: ${DOCKER_USERNAME}/client-vnc:${ONEC_VERSION}
52+
ports:
53+
- "5900:5900"
54+
volumes:
55+
- client_data:/home/usr1cv8/.1cv8
56+
- client_data:/home/usr1cv8/.1C
57+
- ./tools/nethasp.ini:/opt/1C/v8.3/x86_64/conf/nethasp.ini
58+
networks:
59+
- back_net
60+
61+
volumes:
62+
srv_data:
63+
srv_log:
64+
db_data:
65+
client_data:
66+
67+
networks:
68+
back_net:

tools/dev-servers.ps1

-23
This file was deleted.

tools/env-install.cmd

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
@echo off
22
cls
3-
@choco install notepadplusplus -y
4-
@choco install curl -y
3+
@choco install docker-desktop -y

tools/nethasp.ini

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[NH_COMMON]
2+
NH_TCPIP=Enabled
3+
[NH_TCPIP]
4+
NH_SERVER_ADDR=10.13.253.119,10.13.252.4,cfs-lic01
5+
NH_PORT_NUMBER=475
6+
NH_TCPIP_METHOD=TCP
7+
NH_USE_BROADCAST=Enabled

0 commit comments

Comments
 (0)