From 93b43715ac9d7d92cf2867299e76325731bff947 Mon Sep 17 00:00:00 2001 From: shaoying Date: Sun, 28 Jun 2020 13:58:15 +0800 Subject: [PATCH] opt some --- etc/miss.sh | 43 ++++++-------------------------- src/main.go | 2 +- usr/docker/shylinux/contexts | 24 +++++++++--------- usr/docker/shylinux/contexts-dev | 33 +++++++++++++++--------- 4 files changed, 41 insertions(+), 61 deletions(-) diff --git a/etc/miss.sh b/etc/miss.sh index f0c9c644..48d2c485 100644 --- a/etc/miss.sh +++ b/etc/miss.sh @@ -1,3 +1,6 @@ +#!/bin/bash +git &>/dev/null || yum install -y git + [ -f ~/.ish/plug.sh ] || [ -f ./.ish/plug.sh ] || git clone https://github.com/shylinux/intshell ./.ish [ "$ISH_CONF_PRE" != "" ] || source ./.ish/plug.sh || source ~/.ish/plug.sh # declare -f ish_help_repos &>/dev/null || require conf.sh @@ -5,45 +8,13 @@ require show.sh require help.sh require miss.sh -# cd $ISH_CONF_TASK ish_miss_prepare_compile ish_miss_prepare_install -ish_miss_prepare_session miss +ish_miss_prepare_develop +# ish_miss_prepare_session 20200626-hello -ish_miss_prepare_volcanos -ish_miss_prepare_icebergs -ish_miss_prepare toolkits +# ish_miss_prepare_volcanos +# ish_miss_prepare_icebergs # ish_miss_prepare_intshell -# ish_miss_prepare learning -# ish_miss_prepare wubi-dict -# ish_miss_prepare word-dict - -repos=(volcanos icebergs intshell contexts toolkits learning) -ish_miss_pull() { - for p in $repos; do - cd usr/$p && echo && ish_show -g $PWD - git pull - cd - - done -} -ish_miss_status() { - for p in $repos; do - cd usr/$p && echo && ish_show -g $PWD - git status - cd - - done -} -ish_miss_build() { - local target=bin/ice.bin source=src/main.go - ish_log_debug build $source - go build -v -o $target $source && chmod u+x $target && ./bin/ice.sh restart - ish_log_debug build $target -} -ish_miss_build_windows() { - local target=usr/publish/ice.windows.amd64 source=src/main.go - ish_log_debug build $source - GOOS=windows go build -v -o $target $source && chmod u+x $target - ish_log_debug build $target -} diff --git a/src/main.go b/src/main.go index 75d7e342..bdb2e136 100644 --- a/src/main.go +++ b/src/main.go @@ -16,7 +16,7 @@ import ( // _ "github.com/shylinux/icebergs/misc/pi" // _ "github.com/shylinux/icebergs/misc/wx" - _ "github.com/shylinux/icebergs/misc/fyne" + // _ "github.com/shylinux/icebergs/misc/fyne" _ "github.com/shylinux/icebergs/misc/totp" ) diff --git a/usr/docker/shylinux/contexts b/usr/docker/shylinux/contexts index 4beac2b3..4512a588 100644 --- a/usr/docker/shylinux/contexts +++ b/usr/docker/shylinux/contexts @@ -1,21 +1,21 @@ FROM alpine -RUN wget http://192.168.0.103:9020/publish/ice.linux.amd64 -O /usr/local/bin/ice.bin -RUN chmod +x /usr/local/bin/ice.bin -RUN wget http://192.168.0.103:9020/publish/ice.sh -O /usr/local/bin/ice.sh -RUN chmod +x /usr/local/bin/ice.sh +RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories RUN mkdir /root/src /root/etc /root/bin /root/var /root/usr +ADD http://192.168.236.67:9020/publish/ice.sh /usr/local/bin/ice.sh +ADD http://192.168.236.67:9020/publish/ice.linux.amd64 /usr/local/bin/ice.bin +RUN chmod u+x /usr/local/bin/* -RUN wget http://192.168.0.103:9020/publish/order.js -O /usr/local/bin/order.js RUN mkdir -p /root/usr/publish -RUN ln /usr/local/bin/order.js /root/usr/publish/order.js - - -ENV ctx_dev http://192.168.0.103:9020 -ENV ctx_user shaoying -EXPOSE 9020 +RUN mkdir -p /root/usr/volcanos +ADD http://192.168.236.67:9020/publish/order.js /root/usr/publish/order.js +ADD http://192.168.236.67:9020/publish/volcanos.tar.gz /root/usr/ +RUN tar -xvf /root/usr/volcanos.tar.gz -C /root/usr/ +ENV ctx_dev http://192.168.236.67:9020 +ENV ctx_user root WORKDIR /root -CMD cd /root/ +EXPOSE 9020 CMD /usr/local/bin/ice.sh start serve dev + diff --git a/usr/docker/shylinux/contexts-dev b/usr/docker/shylinux/contexts-dev index 940f331a..36241703 100644 --- a/usr/docker/shylinux/contexts-dev +++ b/usr/docker/shylinux/contexts-dev @@ -1,22 +1,31 @@ FROM centos -RUN curl -o /etc/yum.repos.d/CentOS-Base.repo http://mirrors.aliyun.com/repo/Centos-8.repo +ADD http://mirrors.aliyun.com/repo/Centos-8.repo /etc/yum.repos.d/CentOS-Base.repo RUN yum makecache RUN mkdir /root/src /root/etc /root/bin /root/var /root/usr -RUN mkdir -p /root/.vim/autoload -RUN curl -o /root/etc/miss.sh http://192.168.0.103:9020/publish/miss.sh -RUN curl -o /root/.vim/autoload/plug.vim http://192.168.0.103:9020/publish/plug.vim -RUN curl -o /root/.vimrc http://192.168.0.103:9020/publish/vimrc -RUN cd /root && source etc/miss.sh +ADD http://192.168.236.67:9020/publish/ice.sh /root/bin/ice.sh +ADD http://192.168.236.67:9020/publish/ice.linux.amd64 /root/bin/ice.bin +RUN chmod u+x /root/bin/* + +RUN mkdir -p /root/usr/publish +RUN mkdir -p /root/usr/volcanos +ADD http://192.168.236.67:9020/publish/order.js /root/usr/publish/order.js +ADD http://192.168.236.67:9020/publish/volcanos.tar.gz /root/usr/ +RUN tar -xvf /root/usr/volcanos.tar.gz -C /root/usr/ + +RUN mkdir -p /root/.vim/autoload +ADD http://192.168.236.67:9020/publish/miss.sh /root/etc/miss.sh +ADD http://192.168.236.67:9020/publish/plug.vim /root/.vim/autoload/plug.vim +ADD http://192.168.236.67:9020/publish/vimrc /root/.vimrc -ENV ctx_dev http://192.168.0.103:9020 -ENV ctx_user shaoying ENV GOROOT /usr/local/go ENV PATH /usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +# RUN cd /root && source etc/miss.sh -RUN cd /root && source etc/miss.sh - -EXPOSE 9020 - +ENV ctx_dev http://192.168.236.67:9020 +ENV ctx_user root WORKDIR /root +EXPOSE 9020 +CMD cd /root && bin/ice.sh start serve dev +