feat(gitlab-linux config): gitlab-linux config

.gitignore

@@ -9,3 +9,4 @@ public/favicon.ico
 public/landing.html
 public/index.html
 public/fontsDirectory
+

.gitlab-ci.yml

@@ -6,9 +6,14 @@ stages:
   - cleanup_build
   - build_in_master
   - build_in_staging
+
+
 build_in_devel:
   before_script:
     - $env:TAG_VERSION=(git describe --tag --abbrev=0)
+    - $env:BRANCHFULLNAME=(git name-rev --name-only HEAD)
+    - $env:BRANCHNAME=$env:BRANCHFULLNAME.Split('/')[$env:BRANCHFULLNAME.Split('/').length - 1]
+    - $env:CONTAINERNAME=$env:BRANCHNAME.Split('.')[1]
     - docker login -u reza.s -p aA123456 repo.marcopacs.com
   stage: build_in_devel
   tags:
@@ -16,23 +21,32 @@ build_in_devel:
   script:
     - echo "starting build in branch"
     - npm install
-    - npm run test-jest
+    # - npm run test-jest
     - docker-compose config
     - docker-compose build
-    - echo y | plink -ssh administrator@staging.karname.ir "exit"
-    - docker save -o ./scripts/karname-app.tar karname-app:$env:TAG_VERSION # save docker in scripts folder 
-    - echo y | pscp.exe -batch -l administrator -pw $env:StagingPass  ./scripts/karname-app.tar  staging.karname.ir:c:/Users/administrator/karname-app.tar # save docker in remote server 
-    - echo y | plink -batch -ssh administrator@staging.karname.ir -pw $env:StagingPass docker load -i c:/Users/administrator/karname-app.tar -q 
-    - echo y | pscp.exe -batch -l administrator -pw $env:StagingPass  ./docker-compose-staging.yml  staging.karname.ir:c:/Users/administrator/docker-compose.yml # save docker-compose.yml in remote server 
-    - Set-Variable -Name "envtext" -Value "TAG_VERSION=$env:TAG_VERSION"
-    - New-Item -Path '.\.env' -ItemType File
-    - Add-Content .\.env "$envtext"
-    - echo y | pscp.exe -batch -l administrator -pw $env:StagingPass  ./.env  staging.karname.ir:c:/Users/administrator/.env # save .env in remote server 
-    - echo y | plink -batch -ssh administrator@staging.karname.ir -pw $env:StagingPass -m ./scripts/command.bat
-    # - ./scripts/command.ps1
+    - docker push repo.marcopacs.com/karname/karname-app:$env:TAG_VERSION
+    # - echo y | plink -ssh administrator@staging.marcopacs.ir "exit"
+    # # - docker save -o ./scripts/karname-app.tar karname-app:$env:TAG_VERSION # save docker in scripts folder 
+    # # - echo y | pscp.exe -batch -l administrator -pw $env:StagingPass  ./scripts/karname-app.tar  staging.karname.ir:c:/Users/administrator/karname-app.tar # save docker in remote server 
+    # # - echo y | plink -batch -ssh administrator@staging.karname.ir -pw $env:StagingPass docker load -i c:/Users/administrator/karname-app.tar -q 
+    # # - Set-Variable -Name "envtext" -Value "TAG_VERSION=$env:TAG_VERSION"
+    # # - New-Item -Path '.\.env' -ItemType File
+    # # - Add-Content .\.env "$envtext"
+    # # - echo y | pscp.exe -batch -l administrator -pw $env:StagingPass  ./.env  staging.karname.ir:c:/Users/administrator/.env # save .env in remote server 
+    # # - echo y | plink -batch -ssh administrator@staging.karname.ir -pw $env:StagingPass -m ./scripts/command.bat
+    # - echo y | pscp.exe -batch -l administrator -pw $env:StagingPass  ./docker-compose-staging.yml  staging.marcopacs.ir:c:/Users/administrator/docker-compose.yml # save docker-compose.yml in remote server 
+    # - Set-Variable -Name "envtext" -Value "TAG_VERSION=$env:TAG_VERSION"
+    # - New-Item -Path '.\.env' -ItemType File
+    # - Add-Content .\.env "$envtext"
+    # - Set-Variable -Name "envtext1" -Value "CONTAINERNAME=$env:CONTAINERNAME"
+    # - Add-Content .\.env "$envtext1"
+    # - echo y | pscp.exe -batch -l administrator -pw $env:StagingPass  ./.env  staging.marcopacs.ir:c:/Users/administrator/.env # save .env in remote server 
+    # - Set-Variable -Name "batchtext" -Value "cd c:/Users/administrator&&docker-compose config&&docker-compose pull app&&docker-compose -p $env:CONTAINERNAME up -d --force-recreate"
+    # - Add-Content .\command.bat "$batchtext"
+    # - echo y | plink -batch -ssh administrator@staging.marcopacs.ir -pw $env:StagingPass -m ./command.bat
   allow_failure: true
   only:
-    - devel
+    - /^.*staging.*/
 
 
 build_in_staging:
@@ -80,7 +94,7 @@ build_in_staging:
     # - ./scripts/command.ps1
   allow_failure: true
   only:
-    - /^.*staging.*/
+    - devel
 
 
 

.meteor/packages

@@ -6,7 +6,7 @@
 
 meteor-base@1.4.0             # Packages every Meteor app needs to have
 mobile-experience@1.0.5       # Packages for a great mobile UX
-mongo@1.8.0-rc190.1                   # The database Meteor supports right now
+mongo@1.8.0                   # The database Meteor supports right now
 reactive-var@1.0.11            # Reactive variable for tracker
 tracker@1.2.0                 # Meteor's client-side reactive programming library
 

.meteor/release

-METEOR@1.9-rc.1
+METEOR@1.9.2

.meteor/versions

-accounts-base@1.5.0-rc190.1
+accounts-base@1.5.0
 accounts-password@1.5.2
 allow-deny@1.1.0
 ardatan:webpack@0.0.13
 ardatan:webpack-dev-middleware@0.0.13
 autoupdate@1.6.0
-babel-compiler@7.5.0-rc190.1
-babel-runtime@1.5.0-rc190.1
+babel-compiler@7.5.2
+babel-runtime@1.5.0
 base64@1.0.12
 binary-heap@1.0.11
 boilerplate-generator@1.6.0
-callback-hook@1.3.0-rc190.1
+callback-hook@1.3.0
 check@1.3.1
 ddp@1.4.0
 ddp-client@2.3.3
@@ -18,11 +18,11 @@ ddp-rate-limiter@1.0.7
 ddp-server@2.3.0
 diff-sequence@1.1.1
 dynamic-import@0.5.1
-ecmascript@0.14.0-rc190.1
+ecmascript@0.14.2
 ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.10.0-rc190.1
-ecmascript-runtime-server@0.9.0-rc190.1
-ejson@1.1.0
+ecmascript-runtime-client@0.10.0
+ecmascript-runtime-server@0.9.0
+ejson@1.1.1
 email@1.2.3
 es5-shim@4.8.0
 fetch@0.1.1
@@ -41,14 +41,14 @@ minimongo@1.4.5
 mobile-experience@1.0.5
 mobile-status-bar@1.0.14
 modern-browsers@0.1.4
-modules@0.15.0-rc190.1
-modules-runtime@0.12.0-rc190.1
-mongo@1.8.0-rc190.1
+modules@0.15.0
+modules-runtime@0.12.0
+mongo@1.8.0
 mongo-decimal@0.1.1
 mongo-dev-server@1.1.0
 mongo-id@1.0.7
 npm-bcrypt@0.9.3
-npm-mongo@3.3.0-rc190.1
+npm-mongo@3.3.0
 ordered-dict@1.1.0
 ostrio:cookies@2.5.0
 ostrio:files@1.13.0
@@ -71,5 +71,5 @@ tmeasday:publish-counts@0.8.0
 tracker@1.2.0
 underscore@1.0.10
 url@1.2.0
-webapp@1.8.0-rc190.1
+webapp@1.8.0
 webapp-hashing@1.0.9

docker-compose-linux.yml

-  
-version: '3'
-
-services:
-  app:
-    container_name: karname-app
-    restart: on-failure
-    build:
-      context: .
-      dockerfile: docker/linux/Dockerfile
-    image: 'karname/app:${TAG_VERSION}'
-    ports:
-      - '80:3000'
-    depends_on:
-      - mongo
-    links: 
-      - mongo
-    environment:
-      ROOT_URL: ${APP_ROOT_URL:-http://localhost}
-      MONGO_URL: mongodb://mongo:27017/karname
-      PORT: 3000
-      METEOR_SETTINGS: '{"worklistUrl":"http://192.168.0.163"}'
-  mongo:
-    image: repo.marcopacs.com/kelishe/mongo:4.2.0
-    command:
-      - --storageEngine=wiredTiger
-    volumes:
-      - data:/data/db
-
-volumes:
-  data:
\ No newline at end of file

docker-compose-staging-linux.yml

-  
-version: '3'
-
-services:
-  app:
-    container_name: karname-app
-    restart: on-failure
-    image: "karname/app:${TAG_VERSION}"
-    ports:
-      - '80:3000'
-    depends_on:
-      - mongo
-    links: 
-      - mongo
-    environment:
-      ROOT_URL: ${APP_ROOT_URL:-http://localhost}
-      MONGO_URL: mongodb://mongo:27017/karname
-      PORT: 3000
-      METEOR_SETTINGS: '{"worklistUrl":"http://192.168.0.163"}'
-  mongo:
-    image: repo.marcopacs.com/kelishe/mongo:4.2.0
-    command:
-      - --storageEngine=wiredTiger
-    volumes:
-      - data:/data/db
-
-volumes:
-  data:
\ No newline at end of file

docker-compose-staging.yml

+  
+version: '3'
+
+services:
+  app:
+    restart: always
+    image: "repo.marcopacs.com/karname/karname-app:${TAG_VERSION}"
+    # ports:
+    #   - '8090:3000'
+    # depends_on:
+    #   - mongo
+    # links: 
+    #   - mongo
+    environment:
+      ROOT_URL: ${APP_ROOT_URL:-http://localhost}
+      MONGO_URL: mongodb://mongo-windows:27017/karname
+      PORT: 80
+      METEOR_SETTINGS: '{"worklistUrl":"http://karname-broker","databusUrl":"http://databus"}'
+    volumes:
+        - logsvol:/opt/bundle/programs/server/assets/app/logs
+  # mongo:
+  #   image: repo.marcopacs.com/kelishe/mongo:4.2.0
+  #   command:
+  #     - --storageEngine=wiredTiger
+  #   volumes:
+  #     - data:/data/db
+
+volumes:
+  logsvol:
\ No newline at end of file

docker-compose-windows.yml

+version: "3"
+
+services:
+  app:
+    # container_name: ${CONTAINERNAME} #karname-app
+    restart: always
+    image: repo.marcopacs.com/karname/karname-app:${TAG_VERSION} #"karname-app:${TAG_VERSION}"
+    # ports:
+    #   - "80:3000"
+    # depends_on:
+    #   - mongo
+    # links:
+    #   - mongo
+    environment:
+      ROOT_URL: ${APP_ROOT_URL:-http://localhost}
+      MONGO_URL: mongodb://mongo-windows:27017/karname
+      PORT: 80
+      METEOR_SETTINGS: '{"worklistUrl":"http://karname-broker","databusUrl":"http://databus"}'
+    volumes:
+        - C:\karnameapp\logs:C:\app\programs\server\assets\app\logs
+  # mongo:
+  #   container_name: mongo-windows
+  #   image: repo.marcopacs.com/karname/mongo-windows
+  #   volumes:
+  #     - C:\data\db:C:\data\db
+
+# volumes:
+#   data:
+
+networks:
+  default:
+    external:
+      name: nat

docker-compose.yml

-version: "3"
+  
+version: '3'
 
 services:
   app:
-    # container_name: ${CONTAINERNAME} #karname-app
+    container_name: karname-app
     restart: always
-    image: repo.marcopacs.com/karname/karname-app:${TAG_VERSION} #"karname-app:${TAG_VERSION}"
-    # ports:
-    #   - "80:3000"
-    # depends_on:
-    #   - mongo
-    # links:
-    #   - mongo
+    build:
+      context: .
+      dockerfile: docker/linux/Dockerfile
+    image: 'repo.marcopacs.com/karname/karname-app:${TAG_VERSION}'
+    ports:
+      - '8090:3000'
+    depends_on:
+      - mongo
+    links: 
+      - mongo
     environment:
       ROOT_URL: ${APP_ROOT_URL:-http://localhost}
       MONGO_URL: mongodb://mongo-windows:27017/karname
-      PORT: 80
+      PORT: 3000
       METEOR_SETTINGS: '{"worklistUrl":"http://karname-broker","databusUrl":"http://databus"}'
-    volumes:
-        - C:\karnameapp\logs:C:\app\programs\server\assets\app\logs
   # mongo:
-  #   container_name: mongo-windows
-  #   image: repo.marcopacs.com/karname/mongo-windows
+  #   image: repo.marcopacs.com/kelishe/mongo:4.2.0
+  #   command:
+  #     - --storageEngine=wiredTiger
   #   volumes:
-  #     - C:\data\db:C:\data\db
-
-# volumes:
-#   data:
+  #     - data:/data/db
 
-networks:
-  default:
-    external:
-      name: nat
+volumes:
+  data:
\ No newline at end of file

docker/linux/Dockerfile

 # The tag here should match the Meteor version of your app, per .meteor/release
 # FROM geoffreybooth/meteor-base:1.8.1
 
-FROM repo.marcopacs.com/kelishe/meteor-base:1.8.1
+FROM repo.marcopacs.com/public/meteor-base:1.9
 
 WORKDIR $APP_SOURCE_FOLDER/
 

package-lock.json

@@ -4126,8 +4126,7 @@
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escodegen": {
       "version": "1.12.0",
@@ -5205,7 +5204,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
       }
@@ -5292,8 +5290,7 @@
     "hash-sum": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-      "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
-      "dev": true
+      "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ="
     },
     "hash.js": {
       "version": "1.1.7",
@@ -9297,8 +9294,7 @@
     "lodash._reinterpolate": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-      "dev": true
+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
     },
     "lodash.every": {
       "version": "4.6.0",
@@ -9419,7 +9415,6 @@
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
       "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
-      "dev": true,
       "requires": {
         "lodash._reinterpolate": "^3.0.0",
         "lodash.templatesettings": "^4.0.0"
@@ -9429,7 +9424,6 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
       "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
-      "dev": true,
       "requires": {
         "lodash._reinterpolate": "^3.0.0"
       }
@@ -13654,6 +13648,55 @@
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.2.tgz",
       "integrity": "sha512-WssQEHSEvIS1/CI4CO2T8LJdoK4Q9Ngox28K7FDNMTfzNTk2WS5D0dDlqYCaPG+AG4Z8wJkn1KrBc7AhspZJUQ=="
     },
+    "vue-server-renderer": {
+      "version": "2.6.11",
+      "resolved": "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.6.11.tgz",
+      "integrity": "sha512-V3faFJHr2KYfdSIalL+JjinZSHYUhlrvJ9pzCIjjwSh77+pkrsXpK4PucdPcng57+N77pd1LrKqwbqjQdktU1A==",
+      "requires": {
+        "chalk": "^1.1.3",
+        "hash-sum": "^1.0.2",
+        "he": "^1.1.0",
+        "lodash.template": "^4.5.0",
+        "lodash.uniq": "^4.5.0",
+        "resolve": "^1.2.0",
+        "serialize-javascript": "^2.1.2",
+        "source-map": "0.5.6"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "serialize-javascript": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
+          "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ=="
+        },
+        "source-map": {
+          "version": "0.5.6",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
+          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+        }
+      }
+    },
     "vue-style-loader": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",

package.json

@@ -3,7 +3,7 @@
     "private": true,
     "version": "0.0.9",
     "scripts": {
-        "start": "SET MONGO_URL=mongodb://127.0.0.1:27017/karname&& meteor run --inspect --settings settings.json",
+        "start": "SET MONGO_URL=mongodb://karnameh.marcopacs.com:27018/karname&& meteor run --inspect --settings settings.json",
         "test": "meteor test --once --driver-package meteortesting:mocha",
         "test-app": "TEST_WATCH=1 meteor test --full-app --driver-package meteortesting:mocha",
         "test-jest": "jest",
@@ -32,6 +32,7 @@
         "vue-meta": "^2.2.1",
         "vue-meteor-tracker": "^2.0.0-beta.5",
         "vue-router": "^3.1.2",
+        "vue-server-renderer": "^2.6.11",
         "vue-template-compiler": "^2.6.10",
         "vuetify": "^2.2.12",
         "vuex": "^3.1.1"

settings.json

 {
-    "worklistUrl": "http://192.168.0.66:8086",
+    "worklistUrl": "http://karnameh.marcopacs.com:8086",
     "databusUrl": "http://localhost:8090",
     "enableDebug": false,
     "public": {