create-steedos-app 2.1.73 → 2.1.78

package/createSteedosApp.js

@@ -68,6 +68,7 @@ function createProject(name) {
       '.steedos/**',
       '!.steedos/node_modules/**',
       '.vscode/**',
+      '.scripts/**'
     ], projectDir, {
       parents: true,
       flat: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-steedos-app",
-  "version": "2.1.73",
+  "version": "2.1.78",
   "keywords": [
     "steedos"
   ],
@@ -26,11 +26,14 @@
     "create-steedos-app": "./index.js"
   },
   "dependencies": {
-    "@geek/spinner": "^1.0.0",
+    "@geek/spinner": "1.0.0",
     "chalk": "3.0.0",
     "commander": "4.1.0",
     "cpy": "7.3.0",
     "fs-extra": "8.1.0"
   },
-  "gitHead": "f653412d0a75971dd044cff2a87dc4cd0caf8c04"
+  "resolutions": {
+    "**/chalk": "3.0.0"
+  },
+  "gitHead": "b8ec4b6758c54ca760c42ca01269661428260eb7"
 }

package/templates/default/Dockerfile

@@ -9,6 +9,7 @@ ADD steedos-app ./steedos-app/
 ADD package.json .
 ADD moleculer.config.js .
 ADD steedos-config.yml ./steedos-config.yml
+ADD .scripts ./.scripts/
 
 # RUN npm config set registry http://registry.npm.taobao.org/
 # RUN yarn config set registry http://registry.npm.taobao.org/
@@ -17,4 +18,4 @@ RUN yarn
 
 ENV NODE_ENV=production
 
-CMD ["yarn", "start"]
+CMD ["yarn", "start"]

package/templates/default/_package.json

@@ -28,7 +28,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/service-community": "^2.1.66"
+    "@steedos/service-community": "^2.1"
   },
   "devDependencies": {
     "eslint": "^7.7.0",
@@ -40,6 +40,7 @@
   "homepage": "https://www.steedos.com",
   "resolutions": {
     "typeorm": "0.2.28",
+    "**/chalk": "3.0.0",
     "**/lodash": "^4.17.15",
     "**/handlebars": "^4.3.0",
     "**/debug": "^3.1.0",
@@ -56,4 +57,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/templates/default/gitpod.Dockerfile

@@ -1,2 +1,52 @@
-FROM steedos/gitpod-workspace-base:latest
+FROM gitpod/workspace-base:latest
 
+
+### Install MongoDB ###
+# Source: https://docs.mongodb.com/manual/tutorial/install-mongodb-on-ubuntu-tarball/#install-mongodb-community-edition
+USER root
+RUN mkdir -p /tmp/mongodb && \
+    cd /tmp/mongodb && \
+    wget -qOmongodb.tgz https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1804-4.2.17.tgz && \
+    tar xf mongodb.tgz && \
+    cd mongodb-* && \
+    sudo cp bin/* /usr/local/bin/ && \
+    rm -rf /tmp/mongodb
+
+### Install Redis ###
+USER root
+RUN curl -fsSL https://packages.redis.io/gpg | sudo gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg \
+    && echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/redis.list \
+    && sudo apt-get update \
+    && apt-get install -y redis
+
+
+### Install Docker ###
+LABEL dazzle/layer=tool-docker
+LABEL dazzle/test=tests/tool-docker.yaml
+USER root
+ENV TRIGGER_REBUILD=3
+# https://docs.docker.com/engine/install/ubuntu/
+RUN curl -o /var/lib/apt/dazzle-marks/docker.gpg -fsSL https://download.docker.com/linux/ubuntu/gpg \
+    && apt-key add /var/lib/apt/dazzle-marks/docker.gpg \
+    && add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
+    && install-packages docker-ce docker-ce-cli containerd.io
+
+RUN curl -o /usr/bin/slirp4netns -fsSL https://github.com/rootless-containers/slirp4netns/releases/download/v1.1.12/slirp4netns-$(uname -m) \
+    && chmod +x /usr/bin/slirp4netns
+
+RUN curl -o /usr/local/bin/docker-compose -fsSL https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64 \
+    && chmod +x /usr/local/bin/docker-compose
+
+### Install Nodejs ###
+USER gitpod
+ENV NODE_VERSION=12.22.7
+ENV TRIGGER_REBUILD=2
+RUN curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | PROFILE=/dev/null bash \
+    && bash -c ". .nvm/nvm.sh \
+        && nvm install $NODE_VERSION \
+        && nvm alias default $NODE_VERSION \
+        && npm install -g typescript yarn node-gyp"
+ENV PATH=$PATH:/home/gitpod/.nvm/versions/node/v${NODE_VERSION}/bin
+
+### Install Steedos Cli ###
+RUN npm i steedos-cli --global

package/templates/default/gitpod.yml

@@ -1,4 +1,4 @@
-image: steedos/gitpod-workspace-base:latest
+image: ecr.aws.steedos.cn/dockerhub/steedos/gitpod-workspace-base:2.1
 
 # List the ports you want to expose and what to do when they are served. See https://www.gitpod.io/docs/config-ports/
 ports:
@@ -17,15 +17,19 @@ ports:
     visibility: public
 # List the start up tasks. You can start them in parallel in multiple terminals. See https://www.gitpod.io/docs/config-start-tasks/
 tasks:
-  - init: sh ./.scripts/setup.sh
+  - name: MongoDB
+    init: sh ./.scripts/setup.sh
     command: |
       mongod --replSet rs0 --dbpath /workspace/mongodb/data/db
   - command: |
       gp await-port 27017
       mongo steedos --eval "rs.initiate()"
-  - command: |
+      exit
+  - name: Redis
+    command: |
       redis-server --save "" --appendonly no --client-output-buffer-limit replica 0 0 0 --client-output-buffer-limit pubsub 0 0 0 --client-output-buffer-limit slave 0 0 0
-  - init: |
+  - name: Steedos
+    init: |
       yarn install
     command: |
       gp await-port 27017
@@ -38,4 +42,5 @@ vscode:
     - redhat.vscode-yaml
     - steedos.steedosdx-vscode
     - steedos.steedosdx-vscode-core
-    - eamodio.gitlens
+    - ms-ceintl.vscode-language-pack-zh-hans
+    - mongodb.mongodb-vscode