1c/docker_fresh
1
0
Fork 0
mirror of https://github.com/1C-Company/docker_fresh.git synced 2025-01-05 22:53:51 +02:00
Code Issues Releases Activity

Merge pull request #25 from WizaXxX/master

Browse Source 
Исправиления
This commit is contained in:
Ilya 2022-04-15 14:17:58 +03:00 committed by GitHub
commit 1b24100917
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
images/core/Dockerfile
View File

@ -11,7 +11,7 @@ RUN yum -y localinstall /tmp/core/*.rpm; \
yum -y install x11vnc metacity net-tools gdb perl tar git jq; \ yum -y install x11vnc metacity net-tools gdb perl tar git jq; \
yum -y install https://centos7.iuscommunity.org/ius-release.rpm; \ yum -y install https://centos7.iuscommunity.org/ius-release.rpm; \
yum -y --setopt=tsflags=nodocs install python36u python36u-devel python36u-pip; \ yum -y --setopt=tsflags=nodocs install python36u python36u-devel python36u-pip; \
yum -y install java-1.8.0-openjdk; \ yum -y install java-1.8.0-openjdk iproute; \
cert-sync /etc/pki/tls/certs/ca-bundle.crt; \ cert-sync /etc/pki/tls/certs/ca-bundle.crt; \
oscript /usr/share/oscript/lib/opm/src/cmd/opm.os install deployka; \ oscript /usr/share/oscript/lib/opm/src/cmd/opm.os install deployka; \
chmod +x /usr/bin/deployka; \ chmod +x /usr/bin/deployka; \

8
images/core/entrypoint.sh
View File

@ -18,9 +18,10 @@ then
echo "Failed to start ragent: $status" echo "Failed to start ragent: $status"
exit $status exit $status
fi fi
rm -rf /tmp/.X99-lock
exec /usr/bin/Xvfb :99 -screen 0 1680x1050x24 -shmem & exec /usr/bin/Xvfb :99 -screen 0 1680x1050x24 -shmem &
exec metacity --display=:99 & sleep 5 &&
exec /usr/bin/x11vnc & exec /usr/bin/x11vnc -display :99 -forever &
status=$? status=$?
if [ $status -ne 0 ]; then if [ $status -ne 0 ]; then
echo "Failed to start Xvfb: $status" echo "Failed to start Xvfb: $status"
@ -44,8 +45,7 @@ elif [ "$1" = 'cli' ]
then then
chown -R usr1cv8:grp1cv8 ${CORELOGS} chown -R usr1cv8:grp1cv8 ${CORELOGS}
exec /usr/bin/Xvfb :99 -screen 0 1680x1050x24 -shmem & exec /usr/bin/Xvfb :99 -screen 0 1680x1050x24 -shmem &
exec metacity --display=:99 & exec /usr/bin/x11vnc -display :99 -forever
exec /usr/bin/x11vnc
elif [ "$1" = 'web' ] elif [ "$1" = 'web' ]
then then
chown -R usr1cv8:grp1cv8 ${CORELOGS} chown -R usr1cv8:grp1cv8 ${CORELOGS}