From d7e14e57c3c9b198bdc6d764095f53001874a863 Mon Sep 17 00:00:00 2001
From: sam <sam@allofword>
Date: Fri, 6 Aug 2021 17:27:43 +0800
Subject: [PATCH] squash: cases/chrome,firefox --- s

fonts-wqy-zenhei

RUN apt update; apt -y install chromium;

up

wqy, desktop

firefox

f

f

f

cases: chromium
---
 deploy/cases/Dockerfile.chromium |  3 +++
 deploy/cases/Dockerfile.firefox  |  7 +++++++
 deploy/cases/img_build.sh        | 22 ++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 deploy/cases/Dockerfile.chromium
 create mode 100644 deploy/cases/Dockerfile.firefox
 create mode 100644 deploy/cases/img_build.sh

diff --git a/deploy/cases/Dockerfile.chromium b/deploy/cases/Dockerfile.chromium
new file mode 100644
index 0000000..d81d6b4
--- /dev/null
+++ b/deploy/cases/Dockerfile.chromium
@@ -0,0 +1,3 @@
+FROM infrastlabs/docker-headless:latest
+RUN apt.sh fonts-wqy-zenhei;
+RUN apt update; apt -y install chromium; 
diff --git a/deploy/cases/Dockerfile.firefox b/deploy/cases/Dockerfile.firefox
new file mode 100644
index 0000000..8e6ec4c
--- /dev/null
+++ b/deploy/cases/Dockerfile.firefox
@@ -0,0 +1,7 @@
+FROM infrastlabs/docker-headless:latest
+RUN apt.sh \
+  firefox-esr;
+RUN apt.sh \
+  fonts-wqy-zenhei
+RUN cp /usr/share/applications/firefox-esr.desktop /home/headless/Desktop; \
+  cd /home/headless/Desktop; chown headless:headless firefox-esr*; chmod +x firefox-esr*;
diff --git a/deploy/cases/img_build.sh b/deploy/cases/img_build.sh
new file mode 100644
index 0000000..9ff3514
--- /dev/null
+++ b/deploy/cases/img_build.sh
@@ -0,0 +1,22 @@
+
+#echo "export DOCKER_REGISTRY_USER_sdsir=xxx" >> /etc/profile
+#echo "export DOCKER_REGISTRY_PW_sdsir=xxx" >> /etc/profile
+
+source /etc/profile
+export |grep DOCKER_REG
+repo=registry.cn-shenzhen.aliyuncs.com
+echo "${DOCKER_REGISTRY_PW_infrastSubUser2}" |docker login --username=${DOCKER_REGISTRY_USER_infrastSubUser2} --password-stdin $repo
+
+ns=infrastlabs
+# cache="--no-cache"
+# pull="--pull"
+ver=box06 #02: +full; 04: bins;
+
+
+img="docker-headless:chromium"
+docker build $cache $pull -t $ns/$img -f Dockerfile.chromium . 
+docker push $ns/$img
+
+# img="docker-headless:firefox"
+# docker build $cache $pull -t $ns/$img -f Dockerfile.firefox . 
+# docker push $ns/$img