Yuki Takei 3 лет назад
Родитель
Сommit
0b8d794e7a
3 измененных файлов с 5 добавлено и 6 удалено
  1. 1 2
      .devcontainer/Dockerfile
  2. 2 2
      .devcontainer/docker-compose.yml
  3. 2 2
      package.json

+ 1 - 2
.devcontainer/Dockerfile

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
 #-------------------------------------------------------------------------------------------------------------
 
 
-FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-16
+FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-18
 
 
 # The node image includes a non-root user with sudo access. Use the
 # The node image includes a non-root user with sudo access. Use the
 # "remoteUser" property in devcontainer.json to use it. On Linux, update
 # "remoteUser" property in devcontainer.json to use it. On Linux, update
@@ -42,7 +42,6 @@ RUN apt-get update \
       google-chrome-stable \
       google-chrome-stable \
       # for Cypress
       # for Cypress
       libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb fonts-noto-cjk \
       libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb fonts-noto-cjk \
-
    # Clean up
    # Clean up
    && apt-get autoremove -y \
    && apt-get autoremove -y \
    && apt-get clean -y \
    && apt-get clean -y \

+ 2 - 2
.devcontainer/docker-compose.yml

@@ -49,7 +49,7 @@ services:
       context: ../../growi-docker-compose/elasticsearch
       context: ../../growi-docker-compose/elasticsearch
       dockerfile: ./Dockerfile
       dockerfile: ./Dockerfile
       args:
       args:
-        - version=7.16.1
+        - version=7.17.9
     container_name: elasticsearch
     container_name: elasticsearch
     restart: unless-stopped
     restart: unless-stopped
     ports:
     ports:
@@ -68,7 +68,7 @@ services:
 
 
   #need to adjust kibana version based on elasticsearch version (use same version as elasticsearch version)
   #need to adjust kibana version based on elasticsearch version (use same version as elasticsearch version)
   kibana:
   kibana:
-    image: docker.elastic.co/kibana/kibana:7.16.1
+    image: docker.elastic.co/kibana/kibana:7.17.9
     restart: unless-stopped
     restart: unless-stopped
     environment:
     environment:
       ELASTICSEARCH_HOSTS: 'http://elasticsearch:9200'
       ELASTICSEARCH_HOSTS: 'http://elasticsearch:9200'

+ 2 - 2
package.json

@@ -94,8 +94,8 @@
     "yargs": "^17.3.1"
     "yargs": "^17.3.1"
   },
   },
   "engines": {
   "engines": {
-    "node": "^14 || ^16",
-    "npm": ">=6.14 <7 || >=8.1 < 9",
+    "node": "^16 || ^18",
+    "npm": ">=8.5 < 9",
     "yarn": ">=1.22 <2"
     "yarn": ">=1.22 <2"
   }
   }
 }
 }