Update: Build's Dockerfile is updated

.github/workflows/ci.yml

@@ -7,11 +7,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, arch-latest, macOS-latest, windows-latest]
+        os: [ubuntu-latest, macOS-latest, windows-latest]
     steps:
       - uses: actions/checkout@v3
       - name: Building squick third party library for linux and macos
-        if: matrix.os == 'ubuntu-latest' || matrix.os == 'arch-latest' || matrix.os == 'macOS-latest'
+        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest'
         run: |
           cd tools && ./build_third_party.sh
       
@@ -22,7 +22,7 @@ jobs:
           .\clone_thirdparty_build.bat
           
       - name: Building sqkctl tools for linux and macos
-        if: matrix.os == 'ubuntu-latest' || matrix.os == 'arch-latest' || matrix.os == 'macOS-latest'
+        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest'
         run: |
           cd tools && ./build_sqkctl.sh
 
@@ -33,7 +33,7 @@ jobs:
           .\build_sqkctl.bat
           
       - name: Building squick project for linux and macos
-        if: matrix.os == 'ubuntu-latest' || matrix.os == 'arch-latest' || matrix.os == 'macOS-latest'
+        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest'
         run: |
           cd tools && ./build_squick.sh
           
@@ -44,12 +44,16 @@ jobs:
           .\build_squick.bat
           
       - name: Geneating deploy files for linux and macos
-        if: matrix.os == 'ubuntu-latest' || matrix.os == 'arch-latest' || matrix.os == 'macOS-latest'
+        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest'
         run: |
           cd tools && ./generate_deploy.sh
-
+          cd ../deploy
+          tree
+          
       - name: Geneating deploy files for windows
         if: matrix.os == 'windows-latest'
         run: |
           cd tools
-          .\generate_deploy.bat
+          .\generate_deploy.bat
+          cd ..\deploy
+          tree

docker/build/Dockerfile

@@ -0,0 +1,16 @@
+FROM ubuntu:22.04
+# Set env
+ARG DEBIAN_FRONTEND=noninteractive
+# The build enviroment for Squick 
+RUN apt update
+RUN apt-get install -y git cmake make g++
+RUN apt-get install -y libtool libreadline-dev libncurses-dev pkg-config libssl-dev
+RUN apt-get install -y python3
+
+# Build Squick c++ source code
+RUN cd ~ && git clone https://github.com/pwnsky/squick.git
+
+WORKDIR ~/squick
+RUN cd tools && chmod +x *.sh
+RUN cd tools && ./build_third_party.sh && ./build_sqkctl.sh && ./build_squick.sh
+RUN ./generate_deploy.sh

docker/deploy/Dockerfile

@@ -1,18 +1,13 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 # Set env
 ARG DEBIAN_FRONTEND=noninteractive
 # The build enviroment for Squick 
-RUN apt update && apt-get install -y git cmake unzip automake make g++ libtool libreadline6-dev libncurses5-dev pkg-config libssl-dev nodejs npm
+RUN apt update && apt-get install -y git cmake unzip automake make g++ libtool libreadline-dev libncurses-dev pkg-config libssl-dev python3
 
 # Build Squick c++ source code
 RUN cd ~ && git clone https://github.com/i0gan/Squick.git
 RUN cd ~/Squick && chmod +x build.sh && chmod +x third_party/build.sh 
 RUN cd ~/Squick/third_party && bash ./build.sh
 RUN cd ~/Squick/ && bash ./build.sh
 
-# Build www javascript source code
-
-RUN cd ~/Squick/www/admin && git config --global url."https://".insteadOf git:// && npm install
-RUN cd ~/Squick/www/admin && bash ./build.sh
-
 # Build www c++ source code

docker/runtime/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 # Set env
 ARG DEBIAN_FRONTEND=noninteractive