Merge branch 'main' of ssh://git.format.hu/format/web-installer

2024-07-01 08:53:51 +02:00
parent 1509a165e1 c0373bb7e0
commit 77161d9843
3 changed files with 10 additions and 6 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -15,11 +15,10 @@ environment:

 steps:
  - name: build image
-    image: thegeeklab/drone-docker-buildx
+    image: plugins/docker
    commands:
      - cd /drone/src/
-      - docker buildx create --name mybuilder --use --bootstrap
-      - docker buildx build --platform linux/amd64,linux/arm64 --tag $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile .
+      - docker build --platform linux/amd64 --tag $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile .
      - docker push $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME}
    when:
      branch:
--- a/index.html
+++ b/index.html
@@ -11,6 +11,8 @@
 <link href="installer.css?t=1" rel="stylesheet">
 </head>
 <body id="installer" class="text-center">
+<div class="container-fluid">
+<div class="col-md-12">
 <form class="form-install" action="install.php" method="post">

 <div class="row">
@@ -136,10 +138,10 @@
    </div>
 </div>

-
-
 <button class="btn btn-lg btn-primary btn-block" type="submit">Start install</button>
 </form>
+</div>
+</div>

 <!-- Optional JavaScript -->
 <!-- jQuery first, then Popper.js, then Bootstrap JS -->
--- a/install.php
+++ b/install.php
@@ -17,7 +17,6 @@ else {
 	putenv('LOCAL_PROXY=no');
 }

-
 // TODO - js warning
 //if [ "$SMARTHOST_PROXY" == "no" ]; then
 //	echo "Warning! Local proxy will not work without smarthost proxy service.";
@@ -41,4 +40,8 @@ putenv('DISCOVERY='.$_POST["discovery"]);

 putenv('ADDITIONAL='.$_POST["additional"]);

+// check ENV variables
+$output = shell_exec("set");
+echo $output;
+
 ?>