chore: update npm deps (#844)

* chore: update npm deps

* f

* f

* f

* f

* f

* f

* f

* f

* f

* f

* f

* f

* f

* f

Author: emosbaugh

.stignore

@@ -0,0 +1,24 @@
+.git
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+
+# vendor folders
+vendor
+
+# Test binary, built with go test -c
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# dlv binary
+__debug_bin
+
+# exclude some directories from syncing to dev envs for the go project
+migrations
+tgapi/bin
+tgrun/bin
+web

okteto.yml

@@ -2,42 +2,38 @@ build:
   tgdb:
     context: migrations
     dockerfile: migrations/fixtures/deploy/Dockerfile
-    image: okteto.dev/kurl-tgdb:${OKTETO_GIT_COMMIT}
   tgmigrations:
     context: migrations
     dockerfile: migrations/Dockerfile.okteto
-    image: okteto.dev/kurl-tgmigrations:${OKTETO_GIT_COMMIT}
   tgapi:
     context: .
     dockerfile: tgapi/Dockerfile.okteto
-    image: okteto.dev/kurl-tgapi:${OKTETO_GIT_COMMIT}
   tgweb:
     context: web
     dockerfile: web/Dockerfile.okteto
-    image: okteto.dev/kurl-tgweb:${OKTETO_GIT_COMMIT}
     args:
       OKTETO_NAMESPACE: ${OKTETO_NAMESPACE}
   tgweb-dev:
     context: web
     dockerfile: web/Dockerfile.dev.okteto
-    image: okteto.dev/kurl-tgweb:${OKTETO_NAMESPACE}
 
 deploy:
-  - cd kustomize/overlays/okteto && kustomize edit set image tgdb=okteto.dev/kurl-tgdb:${OKTETO_GIT_COMMIT}
-  - cd kustomize/overlays/okteto && kustomize edit set image tgmigrations=okteto.dev/kurl-tgmigrations:${OKTETO_GIT_COMMIT}
-  - cd kustomize/overlays/okteto && kustomize edit set image tgapi=okteto.dev/kurl-tgapi:${OKTETO_GIT_COMMIT}
-  - cd kustomize/overlays/okteto && kustomize edit set image tgweb=okteto.dev/kurl-tgweb:${OKTETO_GIT_COMMIT}
+  - cd kustomize/overlays/okteto && kustomize edit set image tgdb=${OKTETO_BUILD_TGDB_IMAGE}
+  - cd kustomize/overlays/okteto && kustomize edit set image tgmigrations=${OKTETO_BUILD_TGMIGRATIONS_IMAGE}
+  - cd kustomize/overlays/okteto && kustomize edit set image tgapi=${OKTETO_BUILD_TGAPI_IMAGE}
+  - cd kustomize/overlays/okteto && kustomize edit set image tgweb=${OKTETO_BUILD_TGWEB_IMAGE}
 
   - kustomize build kustomize/overlays/okteto
   - kubectl apply -k kustomize/overlays/okteto
 
 dev:
   testgrid-web:
     command: bash
-    image: okteto.dev/kurl-tgweb:${OKTETO_NAMESPACE}
+    image: ${OKTETO_BUILD_TGWEB_DEV_IMAGE}
     workdir: /src
     sync:
-      - .:/src
+      folders:
+        - ./web:/src
     resources:
       limits:
         cpu: "2"
@@ -48,7 +44,8 @@ dev:
     command: bash
     workdir: /go/src/github.com/replicatedhq/kurl-testgrid/tgapi
     sync:
-      - ../:/go/src/github.com/replicatedhq/kurl-testgrid
+      folders:
+        - .:/go/src/github.com/replicatedhq/kurl-testgrid
     resources:
       limits:
         cpu: "2"

web/.stignore

@@ -0,0 +1,56 @@
+.git
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules
+jspm_packages
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# next.js build output
+.next
+
+# nuxt.js build output
+.nuxt
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless
+

web/Makefile

@@ -17,9 +17,15 @@ lint:
 	npx eslint ./src --ext .js,.jsx,.ts,.tsx
 
 .PHONY: serve
+serve: export NODE_ENV = development
 serve:
 	npm start
 
+.PHONY: serve-okteto
+serve-okteto: export NODE_ENV = okteto
+serve-okteto:
+	npm start
+
 .PHONY: build
 build:
 	@echo "nothing to do"

web/docker-compose.yaml

@@ -11,5 +11,5 @@ services:
       - ".:/src"
       - /src/node_modules
     ports:
-     - 30881:30881  
+     - 30881:30881
     restart: "always"