Merge remote-tracking branch 'origin/main' into chore/fix_up_event_lo…

…gs_in_ui
pixelaw · Dec 14, 2023 · 4738b8d · 4738b8d
2 parents ef65473 + 9e9051e
commit 4738b8d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -57,7 +57,7 @@ RUN yarn build --mode production
 
 
 
-FROM oostvoort/keiko:v0.0.14 AS runtime
+FROM oostvoort/keiko:v0.0.15 AS runtime
 
 ENV PUBLIC_TORII=http://localhost:8080
 ENV VITE_PUBLIC_ETH_CONTRACT_ADDRESS=0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 REPO = pixelaw/core
-CORE_VERSION = v0.0.25
-KEIKO_VERSION = v0.0.14
+CORE_VERSION = v0.0.30
+KEIKO_VERSION = v0.0.15
 
 
 docker_build:

diff --git a/chart/pixelaw-core/templates/deployment.yaml b/chart/pixelaw-core/templates/deployment.yaml
@@ -35,6 +35,8 @@ spec:
           value: "17885659508068513399"           
         - name: TOTAL_ACCOUNTS
           value: "4"       
+        - name: WORLD_ADDRESS
+          value: "0x6395ccab8983e6598b8d54bac18cadb63d04b8e4631bde418a2cfb504b59a89"
 
         # resources:
         #   requests:
@@ -44,14 +46,11 @@ spec:
         #     memory: "1Gi"
         #     cpu: "1000m" 
         volumeMounts:
-        - name: keiko-manifest
+        - name: keiko-manifests
           mountPath: /keiko/manifests
-          # subPath: prometheus.yml
+
       volumes:
-      - name: keiko-manifest
-        configMap:
-          name: {{ .Values.projectName }}-{{ .Values.nameSpace }}-{{ .Values.app }}-cm
 
-      - name: {{ .Values.projectName }}-{{ .Values.nameSpace }}-{{ .Values.app }}-pvc
+      - name: keiko-manifests
         persistentVolumeClaim:
-          claimName: {{ .Values.projectName }}-{{ .Values.nameSpace }}-{{ .Values.app }}-pvc            
+          claimName: pixelaw-core-main--pvc          
diff --git a/chart/pixelaw-core/templates/pvc.yaml b/chart/pixelaw-core/templates/pvc.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ .Values.projectName }}-{{ .Values.nameSpace }}-{{ .Values.app }}-pvc
+  namespace: {{ .Values.projectName }}-{{ .Values.nameSpace }} 
 spec:
   storageClassName: do-block-storage  
   accessModes:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   keiko:
-    image: oostvoort/keiko:v0.0.14
+    image: oostvoort/keiko:v0.0.15
     container_name: keiko
     ports:
       - "5050:5050"