qena42

tez-capital · Oct 27, 2024 · 2f12a9c · 2f12a9c
1 parent 8d8be16
commit 2f12a9c
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 337 deletions.
diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
@@ -62,45 +62,17 @@ jobs:
         push: true
         provenance: false
 
-    - name: build tezos v21.0-rc1
+    - name: build tezos v21.0-rc4
       uses: docker/build-push-action@v5
       with:
-        file: containers/tezos/Containerfile
-        context: .
-        platforms: linux/amd64,linux/arm64
-        build-args: |
-          PROTOCOLS=PsParisC,PsquebeC
-          IMAGE_TAG=octez-v21.0-rc1
-          GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
-        tags: ghcr.io/tez-capital/tezbox:tezos-v21.0-rc1.${{steps.prep.outputs.CURRENT_DATE}},ghcr.io/tez-capital/tezbox:tezos-v21.0-rc1
-        push: true
-        provenance: false
-
-    - name: build tezos v21.0-rc2
-      uses: docker/build-push-action@v5
-      with:
-        file: containers/tezos/Containerfile
-        context: .
-        platforms: linux/amd64,linux/arm64
-        build-args: |
-          PROTOCOLS=PsParisC,PsQuebecB
-          IMAGE_TAG=octez-v21.0-rc2
-          GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
-        tags: ghcr.io/tez-capital/tezbox:tezos-v21.0-rc2.${{steps.prep.outputs.CURRENT_DATE}},ghcr.io/tez-capital/tezbox:tezos-v21.0-rc2
-        push: true
-        provenance: false
-
-    - name: build tezos v21.0-rc3
-      uses: docker/build-push-action@v5
-      with:
-        file: containers/tezos/Containerfile
+        file: containers/tzc-tezos/Containerfile
         context: .
         platforms: linux/amd64,linux/arm64
         build-args: |
-          PROTOCOLS=PsParisC,PsqenaVw
-          IMAGE_TAG=octez-v21.0-rc3
+          PROTOCOLS=PsParisC,PsQEna42
+          IMAGE_TAG=latest
           GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
-        tags: ghcr.io/tez-capital/tezbox:tezos-v21.0-rc3.${{steps.prep.outputs.CURRENT_DATE}},ghcr.io/tez-capital/tezbox:tezos-v21.0-rc3
+        tags: ghcr.io/tez-capital/tezbox:tezos-v21.0-rc4.${{steps.prep.outputs.CURRENT_DATE}},ghcr.io/tez-capital/tezbox:tezos-v21.0-rc4
         push: true
         provenance: false
 

diff --git a/configuration/protocols/PsQEna42/protocol.hjson b/configuration/protocols/PsQEna42/protocol.hjson
@@ -0,0 +1,6 @@
+id: psqena42
+short: PsQEna42
+hash: PsQEna427TJJ2dYatjWS12qKihty5huvBDmNHNAgCeTzWCpF673
+aliases: [
+	qenabox
+]
diff --git a/...tocols/PsQuebecB/sandbox-parameters.hjson → ...otocols/PsQEna42/sandbox-parameters.hjson b/...tocols/PsQuebecB/sandbox-parameters.hjson → ...otocols/PsQEna42/sandbox-parameters.hjson
diff --git a/...ation/protocols/PsQuebecB/vote-file.hjson → ...ration/protocols/PsQEna42/vote-file.hjson b/...ation/protocols/PsQuebecB/vote-file.hjson → ...ration/protocols/PsQEna42/vote-file.hjson
diff --git a/configuration/protocols/PsQuebecB/protocol.hjson b/configuration/protocols/PsQuebecB/protocol.hjson
diff --git a/configuration/protocols/PsqenaVw/protocol.hjson b/configuration/protocols/PsqenaVw/protocol.hjson
diff --git a/configuration/protocols/PsqenaVw/sandbox-parameters.hjson b/configuration/protocols/PsqenaVw/sandbox-parameters.hjson
diff --git a/configuration/protocols/PsqenaVw/vote-file.hjson b/configuration/protocols/PsqenaVw/vote-file.hjson
diff --git a/configuration/protocols/PsquebeC/protocol.hjson b/configuration/protocols/PsquebeC/protocol.hjson
diff --git a/configuration/protocols/PsquebeC/sandbox-parameters.hjson b/configuration/protocols/PsquebeC/sandbox-parameters.hjson
diff --git a/configuration/protocols/PsquebeC/vote-file.hjson b/configuration/protocols/PsquebeC/vote-file.hjson
diff --git a/configuration/services/node.hjson b/configuration/services/node.hjson
@@ -8,7 +8,7 @@
         --metadata-size-limit=unlimited
 		--synchronisation-threshold=0
 		--no-bootstrap-peers
-		--peer=localhost:9732
+		--peer=127.0.0.1:9732
 		--private-mode
     ]
     environment: {

diff --git a/containers/tezos/Containerfile b/containers/tezos/Containerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_TAG=octez-v20.3
 
-FROM docker.io/tezos/tezos:${IMAGE_TAG}
+FROM ghcr.io/tez-capital/tezos:${IMAGE_TAG}
 
 ARG PROTOCOLS=parisbox
 
@@ -14,9 +14,6 @@ ENV ASCEND_INIT="tezbox init --setup-services"
 ENV TEZBOX_USER=tezos
 ENV HOME=/tezbox/context/data
 
-# dal scripts need curl
-RUN apk add curl
-
 RUN printf '#!/bin/sh\n\
 if [ -z "$GITHUB_TOKEN" ]; then\n\
   wget "$@" \n\