Merge branch 'main' of ssh://git.format.hu/format/web-installer
Some checks failed
continuous-integration/drone/push Build is failing
Some checks failed
continuous-integration/drone/push Build is failing
This commit is contained in:
@@ -15,11 +15,10 @@ environment:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: build image
|
- name: build image
|
||||||
image: thegeeklab/drone-docker-buildx
|
image: plugins/docker
|
||||||
commands:
|
commands:
|
||||||
- cd /drone/src/
|
- cd /drone/src/
|
||||||
- docker buildx create --name mybuilder --use --bootstrap
|
- docker build --platform linux/amd64 --tag $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile .
|
||||||
- docker buildx build --platform linux/amd64,linux/arm64 --tag $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile .
|
|
||||||
- docker push $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME}
|
- docker push $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME}
|
||||||
when:
|
when:
|
||||||
branch:
|
branch:
|
||||||
|
@@ -11,6 +11,8 @@
|
|||||||
<link href="installer.css?t=1" rel="stylesheet">
|
<link href="installer.css?t=1" rel="stylesheet">
|
||||||
</head>
|
</head>
|
||||||
<body id="installer" class="text-center">
|
<body id="installer" class="text-center">
|
||||||
|
<div class="container-fluid">
|
||||||
|
<div class="col-md-12">
|
||||||
<form class="form-install" action="install.php" method="post">
|
<form class="form-install" action="install.php" method="post">
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
@@ -136,10 +138,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<button class="btn btn-lg btn-primary btn-block" type="submit">Start install</button>
|
<button class="btn btn-lg btn-primary btn-block" type="submit">Start install</button>
|
||||||
</form>
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- Optional JavaScript -->
|
<!-- Optional JavaScript -->
|
||||||
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
|
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
|
||||||
|
@@ -17,7 +17,6 @@ else {
|
|||||||
putenv('LOCAL_PROXY=no');
|
putenv('LOCAL_PROXY=no');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// TODO - js warning
|
// TODO - js warning
|
||||||
//if [ "$SMARTHOST_PROXY" == "no" ]; then
|
//if [ "$SMARTHOST_PROXY" == "no" ]; then
|
||||||
// echo "Warning! Local proxy will not work without smarthost proxy service.";
|
// echo "Warning! Local proxy will not work without smarthost proxy service.";
|
||||||
@@ -41,4 +40,8 @@ putenv('DISCOVERY='.$_POST["discovery"]);
|
|||||||
|
|
||||||
putenv('ADDITIONAL='.$_POST["additional"]);
|
putenv('ADDITIONAL='.$_POST["additional"]);
|
||||||
|
|
||||||
|
// check ENV variables
|
||||||
|
$output = shell_exec("set");
|
||||||
|
echo $output;
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
Reference in New Issue
Block a user