fix utf-8 sequel bug, migrate to canister registry

sergey-koba-mobidev · Sep 6, 2019 · 7685495 · 7685495
1 parent 152e3ff
commit 7685495
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/admin/init/db.rb b/admin/init/db.rb
@@ -13,6 +13,7 @@
   DB = Sequel.connect(config)
   Sequel.extension :migration
   Sequel.extension :pagination
+  Sequel::Model.plugin :force_encoding, 'UTF-8'
   Sequel::Model.db.extension(:pagination)
   require 'will_paginate/sequel'
 end
diff --git a/bin/deploy.sh b/bin/deploy.sh
@@ -3,12 +3,12 @@
 UNIXTIME=$(date +%s)
 
 cd ./front
-docker build -f Dockerfile.prod -t repo.treescale.com/skoba/blog:build-$UNIXTIME .
-docker push repo.treescale.com/skoba/blog:build-$UNIXTIME
+docker build -f Dockerfile.prod -t cloud.canister.io:5000/skoba/blog:build-$UNIXTIME .
+docker push cloud.canister.io:5000/skoba/blog:build-$UNIXTIME
 
 cd ../admin
-docker build -f Dockerfile.prod -t repo.treescale.com/skoba/blog-admin:build-$UNIXTIME .
-docker push repo.treescale.com/skoba/blog-admin:build-$UNIXTIME
+docker build -f Dockerfile.prod -t cloud.canister.io:5000/skoba/blog-admin:build-$UNIXTIME .
+docker push cloud.canister.io:5000/skoba/blog-admin:build-$UNIXTIME
 
 cd ..
 helm upgrade -i --set image.tag=build-$UNIXTIME --wait --namespace default blog ./chart

diff --git a/chart/templates/admin_deployment.yaml b/chart/templates/admin_deployment.yaml
@@ -47,4 +47,4 @@ spec:
               path: /
               port: http
       imagePullSecrets:
-        - name: regcred
+        - name: canister-regcred
diff --git a/chart/templates/front_deployment.yaml b/chart/templates/front_deployment.yaml
@@ -47,4 +47,4 @@ spec:
               path: /
               port: http
       imagePullSecrets:
-        - name: regcred
+        - name: canister-regcred
diff --git a/chart/values.yaml b/chart/values.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: repo.treescale.com/skoba/blog
+  repository: cloud.canister.io:5000/skoba/blog
   tag: latest
   pullPolicy: IfNotPresent
 

diff --git a/front/init/db.rb b/front/init/db.rb
@@ -13,6 +13,7 @@
   DB = Sequel.connect(config)
   Sequel.extension :migration
   Sequel.extension :pagination
+  Sequel::Model.plugin :force_encoding, 'UTF-8'
   Sequel::Model.db.extension(:pagination)
   require 'will_paginate/sequel'
 end