diff --git a/Dockerfile b/Dockerfile index 3f87d7b..42dae8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,41 @@ FROM ubuntu:focal AS build-env -RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get --yes --no-install-recommends install build-essential make libsqlite3-dev zlib1g-dev libreadline-dev nodejs npm libssl-dev -COPY download /download +RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get --yes --no-install-recommends wget git install build-essential make libsqlite3-dev zlib1g-dev libreadline-dev libssl-dev +RUN mkdir /download +RUN cd /download \ + && wget https://github.com/lxsang/ant-http/raw/master/dist/antd-1.0.6b.tar.gz \ + && tar xvzf antd-1.0.6b.tar.gz \ + && rm antd-1.0.6b.tar.gz + +RUN cd /download \ + && wget https://github.com/lxsang/antd-lua-plugin/raw/master/dist/lua-0.5.2b.tar.gz \ + && tar xvzf lua-0.5.2b.tar.gz \ + rm lua-0.5.2b.tar.gz + +RUN cd /download \ + && wget https://github.com/lxsang/antd-wterm-plugin/raw/master/dist/wterm-1.0.0b.tar.gz \ + && tar xvzf wterm-1.0.0b.tar.gz \ + rm wterm-1.0.0b.tar.gz + +RUN cd /download \ + && wget https://github.com/lxsang/antd-tunnel-plugin/raw/master/dist/tunnel-0.1.0b.tar.gz \ + && tar xvzf tunnel-0.1.0b.tar.gz \ + && rm tunnel-0.1.0b.tar.gz + +RUN cd /download \ + wget https://github.com/lxsang/antd-tunnel-publishers/raw/master/dist/antd-publishers-0.1.0a.tar.gz \ + && tar xvzf antd-publishers-0.1.0a.tar.gz \ + && rm antd-publishers-0.1.0a.tar.gz + +RUN cd /download \ + && git clone --depth 1 https://github.com/lxsang/antd-web-apps y-antd-web-apps + +RUN cd /download \ + && wget https://github.com/lxsang/antos/raw/next-1.2.0/release/antos-1.2.0.tar.gz \ + && mkdir -p z-antos \ + && tar xvzf antos-1.2.0.tar.gz -C z-antos \ + && rm antos-1.2.0.tar.gz + RUN cd /download/antd-1.0.6b && ./configure --prefix=/usr/ && make && make install RUN cd /download/lua-0.5.2b && ./configure --prefix=/opt/www && make && make install RUN cd /download/wterm-1.0.0b && ./configure --prefix=/opt/www && make && make install @@ -11,10 +45,10 @@ RUN cd /download/antd-publishers-0.1.0a && ./configure --prefix=/opt/www && mak RUN mkdir -p /opt/www/htdocs -RUN cd /download/antd-web-apps && BUILDDIR=/opt/www/htdocs PROJS=os make +RUN cd /download/y-antd-web-apps && BUILDDIR=/opt/www/htdocs PROJS=os make RUN rm /opt/www/htdocs/index.ls -RUN npm config set strict-ssl false -RUN cd /download/antos && npm install terser uglifycss typescript -g && npm install @types/jquery && BUILDDIR=/opt/www/htdocs/os make release +RUN cp -rf /download/z-antos/* /opt/www/htdocs/os/ +#RUN cd /download/antos && npm install terser uglifycss typescript -g && npm install @types/jquery && BUILDDIR=/opt/www/htdocs/os make release FROM ubuntu:focal AS deploy-env RUN apt-get update && apt-get --yes --no-install-recommends install libsqlite3-0 zlib1g libreadline8 libssl1.1 wget diff --git a/bake.sh b/bake.sh index 4e264de..9e46fd1 100755 --- a/bake.sh +++ b/bake.sh @@ -24,9 +24,11 @@ if [ ! -d "download" ]; then tar xvzf antd-publishers-0.1.0a.tar.gz rm antd-publishers-0.1.0a.tar.gz - git clone --depth 1 https://github.com/lxsang/antd-web-apps - git clone https://github.com/lxsang/antos - cd antos && git checkout next-1.2.0 && cd .. + git clone --depth 1 https://github.com/lxsang/antd-web-apps y-antd-web-apps + wget https://github.com/lxsang/antos/raw/next-1.2.0/release/antos-1.2.0.tar.gz + mkdir -p z-antos + tar xvzf antos-1.2.0.tar.gz -C z-antos + rm antos-1.2.0.tar.gz cd ../ fi