From 02ef105291ef52d516eac457e3e2c4353877609c Mon Sep 17 00:00:00 2001 From: hael Date: Fri, 28 Jun 2024 10:14:55 +0000 Subject: [PATCH 1/4] env variables --- install.php | 1 + 1 file changed, 1 insertion(+) diff --git a/install.php b/install.php index 50ae14f..954e166 100644 --- a/install.php +++ b/install.php @@ -18,6 +18,7 @@ else { } + // TODO - js warning //if [ "$SMARTHOST_PROXY" == "no" ]; then // echo "Warning! Local proxy will not work without smarthost proxy service."; From fcb5ec65f9985b19e06c41c537786870b02b2fe9 Mon Sep 17 00:00:00 2001 From: Gyorgy Berenyi Date: Fri, 28 Jun 2024 14:45:12 +0000 Subject: [PATCH 2/4] Update nginx.conf --- nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.conf b/nginx.conf index f860c68..8429ce1 100644 --- a/nginx.conf +++ b/nginx.conf @@ -27,7 +27,7 @@ http { server_name localhost; location / { root /usr/share/nginx/html; - index index.html + index index.html; } error_page 500 502 503 504 /50x.html; From ffd6bde25c8dad2c58255fbb07c6d8693847a0a1 Mon Sep 17 00:00:00 2001 From: Gyorgy Berenyi Date: Fri, 28 Jun 2024 14:46:32 +0000 Subject: [PATCH 3/4] Update .drone.yml --- .drone.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index be27ae9..7872888 100644 --- 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: From c0373bb7e0687548f0153e306570806640ba0f9d Mon Sep 17 00:00:00 2001 From: hael Date: Fri, 28 Jun 2024 15:28:22 +0000 Subject: [PATCH 4/4] layout --- index.html | 6 ++++-- install.php | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index cf6ca30..d8f0310 100644 --- a/index.html +++ b/index.html @@ -11,6 +11,8 @@ +
+
@@ -136,10 +138,10 @@
- - +
+ diff --git a/install.php b/install.php index 954e166..f9c8059 100644 --- a/install.php +++ b/install.php @@ -17,8 +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."; @@ -42,4 +40,8 @@ putenv('DISCOVERY='.$_POST["discovery"]); putenv('ADDITIONAL='.$_POST["additional"]); +// check ENV variables +$output = shell_exec("set"); +echo $output; + ?>