update packages

itaru2622 · Dec 5, 2023 · 2b0cebf · 2b0cebf
1 parent 9a6412e
commit 2b0cebf
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 22 deletions.
diff --git a/.github/workflows/build_publish.yml b/.github/workflows/build_publish.yml
@@ -33,6 +33,7 @@ env:
   #BASE_IMG: python:3.11-bullseye
   # vars.DOCKER_BASE_IMG: github repository variables.
   BASE_IMG: ${{ vars.DOCKER_BASE_IMG}}
+  VER_NODE: ${{ vars.VER_NODE }}
 
 jobs:
   build:
@@ -84,3 +85,4 @@ jobs:
             base=${{ env.BASE_IMG }}
             uid=${{ env.UID }}
             uname=${{ env.UNAME }}
+            ver_node=${{ env.VER_NODE }}
diff --git a/Dockerfile b/Dockerfile
@@ -7,22 +7,25 @@ ARG base
 # use bash instead of sh in RUN command
 SHELL ["/bin/bash", "-c"]
 
-RUN apt update
 #RUN apt install -y curl apt-transport-https gnupg2
+ARG VER_NODE=18
 RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - ;\
-    echo "deb [arch=amd64] https://packages.microsoft.com/repos/vscode stable main" > /etc/apt/sources.list.d/vscode.list;
-RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash -
-RUN apt update
+    echo "deb [arch=amd64] https://packages.microsoft.com/repos/vscode stable main" > /etc/apt/sources.list.d/vscode.list; \
+    curl https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | apt-key add - ; \
+    echo "deb https://deb.nodesource.com/node_${VER_NODE}.x nodistro main" > /etc/apt/sources.list.d/nodesource.list ; \
+    apt update
 
 # install python3-pip and dependencies only when base image is not based on python
 RUN if [[ ${base} != python* ]] ; \
     then \
         apt install -y python3-pip; \
     fi
 
-RUN apt install -y code git make bash-completion jq nodejs \
-                   task-japanese locales-all locales ibus-mozc sudo dante-client connect-proxy vim iputils-ping traceroute net-tools tzdata \
-                   parallel
+RUN apt install -y code git make bash-completion tzdata task-japanese locales-all locales ibus-mozc sudo vim \
+                   dante-client connect-proxy jq iputils-ping traceroute net-tools parallel \
+                   nodejs \
+                   chromium; \
+    npm install -g yarn
 
 ARG uid=1000
 ARG uname=vscode
@@ -41,32 +44,30 @@ RUN mkdir -p ${workdir} ; \
 RUN pip3 install --upgrade pip; \
     pip3 install fastapi[standard] uvicorn watchfiles     yq pandas openpyxl numpy sympy   q pytest pytest-cov httpx
 
-RUN pip3 install sympy \
-                 matplotlib \
-                 pymongo jupyterlab 
+RUN pip3 install sympy jupyterlab
+#                matplotlib pymongo
 
-# converter between JsonSchema <=> OpenAPI
-RUN npm install -g typescript \
-                   @openapi-contrib/json-schema-to-openapi-schema @openapi-contrib/openapi-schema-to-json-schema
+## converter between JsonSchema <=> OpenAPI
+# RUN npm install -g typescript  @openapi-contrib/json-schema-to-openapi-schema @openapi-contrib/openapi-schema-to-json-schema
 
-# python class generator from JsonSchema
-RUN pip3 install  git+https://github.com/koxudaxi/datamodel-code-generator.git
+## python class generator from JsonSchema
+# RUN pip3 install  git+https://github.com/koxudaxi/datamodel-code-generator.git
 
-# UML generator from python class (pyreverse@pylint), with re-formater mermaid (text2img @ github support), and graphviz
-RUN pip3 install   pylint; \
-    apt install -y graphviz; \
-    npm install -g @mermaid-js/mermaid-cli
+## UML generator from python class (pyreverse@pylint), with re-formater mermaid (text2img @ github support), and graphviz
+# RUN pip3 install   pylint; \
+#   apt install -y graphviz; \
+#   npm install -g @mermaid-js/mermaid-cli
 
-ENV PATH ${PATH}:./node_modules/.bin:/usr/lib/node_modules/.bin:/usr/lib/node_modules/@openapi-contrib/json-schema-to-openapi-schema/bin:
+#ENV PATH ${PATH}:./node_modules/.bin:/usr/lib/node_modules/.bin:/usr/lib/node_modules/@openapi-contrib/json-schema-to-openapi-schema/bin:
 
-# install nlp things and etc.
+## install nlp things and etc.
 #RUN pip3 install fastapi uvicorn[standard] q pytest pytest-cov httpx pandas spacy; \
 #    python3 -m spacy download    en_core_web_lg;
 
 USER ${uname}
 #ENV HOME /home/${uname}
 
-# install vscode plugin...
+## install vscode plugin...
 RUN code --install-extension      ms-python.python; \
     code --install-extension      MS-CEINTL.vscode-language-pack-ja; \
     code --install-extension      ms-vscode-remote.vscode-remote-extensionpack; \