From e7abfd6f390603a3e6fc15ddce7d05142014212a Mon Sep 17 00:00:00 2001 From: usmannasir Date: Fri, 22 Dec 2023 15:07:38 +0500 Subject: [PATCH] bug fix: minor issues --- .../templates/baseTemplate/index.html | 31 +++++++++---------- dockerManager/build.sh | 3 ++ plogical/DockerSites.py | 4 +++ .../websiteFunctions/CreateDockerSite.html | 20 ++++++------ 4 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 dockerManager/build.sh diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html index 4a6130eab..8498b96a2 100755 --- a/baseTemplate/templates/baseTemplate/index.html +++ b/baseTemplate/templates/baseTemplate/index.html @@ -372,29 +372,28 @@ -
  • {% trans "Server" %}
    • -
  • +
  • {% trans "MySQL Manager" %} - {% trans "NEW" %} + {% trans "NEW" %}
    • diff --git a/dockerManager/build.sh b/dockerManager/build.sh new file mode 100644 index 000000000..9ae6239f3 --- /dev/null +++ b/dockerManager/build.sh @@ -0,0 +1,3 @@ +docker login +docker build -t cyberpanel/openlitespeed:latest . +docker push cyberpanel/openlitespeed:latest \ No newline at end of file diff --git a/plogical/DockerSites.py b/plogical/DockerSites.py index 39e5510c0..41cb653c7 100644 --- a/plogical/DockerSites.py +++ b/plogical/DockerSites.py @@ -322,6 +322,10 @@ services: logging.statusWriter(self.JobID, f'Error {str(message)} . [404]') return 0 + logging.statusWriter(self.JobID, 'Bringing containers online..,50') + + time.sleep(15) + ### Set up Proxy execPath = "/usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/DockerSites.py" diff --git a/websiteFunctions/templates/websiteFunctions/CreateDockerSite.html b/websiteFunctions/templates/websiteFunctions/CreateDockerSite.html index 4f6d5a4ed..e897c9879 100644 --- a/websiteFunctions/templates/websiteFunctions/CreateDockerSite.html +++ b/websiteFunctions/templates/websiteFunctions/CreateDockerSite.html @@ -1,6 +1,6 @@ {% extends "baseTemplate/index.html" %} {% load i18n %} -{% block title %}{% trans "Create Docker Site - CyberPanel" %}{% endblock %} +{% block title %}{% trans "Create Docker App - CyberPanel" %}{% endblock %} {% block content %} {% load static %} @@ -92,15 +92,15 @@
    -

    {% trans "Create Docker Site" %}

    -

    {% trans "On this page you can create docker site on your server." %}

    +

    {% trans "Create Docker App" %}

    +

    {% trans "On this page you can create docker apps on your server." %}

    - {% trans "Docker Site Details" %}

    @@ -140,27 +140,27 @@
    - +
    - +
    - +
    - +
    @@ -177,14 +177,14 @@
    - +
    - +
    {% trans "Invalid Email" %}