From 350d8b128d85a57bc8a6764774ae0222453d840b Mon Sep 17 00:00:00 2001
From: urielch <uriel.chemouni@gmail.com>
Date: Wed, 10 Apr 2019 16:48:20 +0300
Subject: [PATCH] add EVAL_URL

---
 README.md          | 30 ++++++++++++++++++++++++++----
 conf/chrome.sh     |  3 +++
 conf/entrypoint.sh |  2 +-
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 9432e05..10a89de 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,20 @@
 
 A multi-arch Docker chome VNC
 
+## Usage:
+
+### evironement variable
+* X11_W: screen Width
+* X11_H: screen Heigth
+* EXTRA_CHROME_OPTION: add extra parameter to chrome
+* URL: page to open
+* PASSWORD: vnc password
+* EVAL_URL: evaluate url before using it
+
+### secrets
+* URL: page to open
+* vncpasswd: vnc password
+
 ## Build Steps
 
 ### Build and test images
@@ -41,10 +55,18 @@ edit ~/.docker/config.json add:
 ```
 
 ```sh
-docker rmi urielch/chrome-vnc:latest
-docker manifest inspect urielch/chrome-vnc:latest
-docker manifest create --amend urielch/chrome-vnc:latest urielch/chrome-vnc:amd64 urielch/chrome-vnc:armhf
-docker manifest --purge push urielch/chrome-vnc:latest
+
+docker rmi urielch/chrome-vnc:ubuntu
+docker rmi urielch/chrome-vnc:alpine
+docker manifest inspect urielch/chrome-vnc:ubuntu
+docker manifest inspect urielch/chrome-vnc:alpine
+
+docker manifest create --amend urielch/chrome-vnc:ubuntu urielch/chrome-vnc:ubuntu-amd64 urielch/chrome-vnc:ubuntu-armhf
+
+docker manifest create --amend urielch/chrome-vnc:alpine urielch/chrome-vnc:alpine-amd64 urielch/chrome-vnc:alpine-armhf
+
+docker manifest push --purge urielch/chrome-vnc:ubuntu
+docker manifest push --purge urielch/chrome-vnc:alpine
 ```
 
 ### Test multi arch image
diff --git a/conf/chrome.sh b/conf/chrome.sh
index 56ab38a..b7b60bb 100755
--- a/conf/chrome.sh
+++ b/conf/chrome.sh
@@ -2,6 +2,9 @@
 
 [ -f /run/secrets/URL ] && URL="$(cat /run/secrets/URL)"
 URL="${URL:-https://www.docker.com/}"
+
+if [ ! -z "$EVAL_URL" ]; then URL=$(eval "${URL}"); fi;
+
 # /usr/bin/google-chrome-stable
 /usr/bin/chromium-browser ${EXTRA_CHROME_OPTION} \
  --purge-memory-button \
diff --git a/conf/entrypoint.sh b/conf/entrypoint.sh
index 9786311..12f6475 100644
--- a/conf/entrypoint.sh
+++ b/conf/entrypoint.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-echo Knowns env variables: X11_W, X11_H, EXTRA_CHROME_OPTION, URL, PASSWORD
+echo Knowns env variables: X11_W, X11_H, EXTRA_CHROME_OPTION, URL, PASSWORD, EVAL_URL
 echo Knowns secret: URL, vncpasswd
 echo