Creating persistent configuration, but keeping config in Dockerfile a…

…nd not in github

.github/workflows/build.yml

@@ -10,7 +10,8 @@ on:
 jobs:
   build:
     name: Lint, build and test
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
+    if: false
 
     steps:
       - name: Checkout code
@@ -76,11 +77,11 @@ jobs:
 
       - run: make configs webapp-proto
 
-      - uses: docker/build-push-action@v4
-        with:
-          context: backend
-          push: true
-          tags: c4dt/service-stainless-backend:latest
+#      - uses: docker/build-push-action@v4
+#        with:
+#          context: backend
+#          push: true
+#          tags: c4dt/service-stainless-backend:latest
       - uses: docker/build-push-action@v4
         with:
           context: webapp

.github/workflows/docker.yml

@@ -0,0 +1,53 @@
+name: Build docker
+on:
+  push:
+
+jobs:
+  # This is copied from https://docs.github.com/en/actions/publishing-packages/publishing-docker-images
+  build-and-push-image:
+    runs-on: ubuntu-22.04
+    if: false
+    permissions:
+      contents: write
+      packages: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Log into registry ${{ env.REGISTRY }}
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 14
+
+      - name: Build requirements
+        run: |
+          sudo apt install -y protobuf-compiler
+          rm -rf backend/{configs,build}
+          make configs webapp-proto
+          git config --global user.name "Build Workflow"
+          git config --global user.email "[email protected]"
+          git add backend/configs
+          git commit -am "Configs generated on $( date )"
+          git push
+
+      - name: Build and push Docker image for nodes
+#        id: build-and-push-backend
+        uses: docker/build-push-action@v4
+        with:
+          context: backend
+          push: true
+          tags: ghcr.io/c4dt/service-stainless-backend:latest
+
+      - name: Build and push Docker image
+#        id: build-and-push-webapp
+        uses: docker/build-push-action@v4
+        with:
+          context: webapp
+          push: true
+          tags: ghcr.io/c4dt/service-stainless-webapp:latest

Makefile

@@ -1,7 +1,7 @@
 .DEFAULT_GOAL := all
 
 services:
-	git clone -b stainless https://github.com/c4dt/services.git
+	git clone -b stainless_archive https://github.com/c4dt/services.git
 services/%: | services
 	@: nothing
 
@@ -32,32 +32,32 @@ $Sbackend-docker-build: | $Sexternal-deps
 $Dbackend/build/bevmadmin: | $Dbackend/build
 	cd $Dbackend/cothority/bevm/bevmadmin && GO111MODULE=on go build -o ../../../build/$(@F)
 
-$Dbackend/build/ident_bevm: $Dbackend/build/bcadmin $Dbackend/build/conodes.toml $Dbackend/build/bevmadmin $Dbackend/build/ident
-	rm -rf $Dbackend/build/bevm_admin $Dbackend/build/bevm_user
+$Dbackend/configs/ident_bevm: $Dbackend/build/bcadmin $Dbackend/configs/conodes.toml $Dbackend/build/bevmadmin $Dbackend/configs/ident
+	rm -rf $Dbackend/configs/bevm_admin $Dbackend/configs/bevm_user
 	$(call $Swith-conodes, \
-		bevm_admin_key=$$( $< --config $Dbackend/build/bevm_admin key ) ; \
-		bevm_user_key=$$( $< --config $Dbackend/build/bevm_user key ) ; \
-		bevm_user_private_key=$$( $< --config $Dbackend/build/bevm_user key --print $Dbackend/build/bevm_user/key-* | grep Private | cut -d \  -f 2 ) ; \
-		bevm_darc=$$( $< --config $Dbackend/build darc add --bc $Dbackend/build/bc-* --unrestricted --identity $$bevm_admin_key --desc "BEvm Darc" | awk -F: '/BaseID:/ {print $$3}' ) ; \
-		$< --config $Dbackend/build/bevm_admin link $(word 2,$^) $$( grep ByzCoinID $Dbackend/build/ident | cut -d \  -f 2 ) --darc $$bevm_darc --identity $$bevm_admin_key ; \
-		$< --config $Dbackend/build/bevm_admin darc rule --bc $Dbackend/build/bevm_admin/bc-* --rule "spawn:bevm" --identity $$bevm_admin_key ; \
-		$< --config $Dbackend/build/bevm_admin darc rule --bc $Dbackend/build/bevm_admin/bc-* --rule "invoke:bevm.credit" --identity $$bevm_user_key ; \
-		$< --config $Dbackend/build/bevm_admin darc rule --bc $Dbackend/build/bevm_admin/bc-* --rule "invoke:bevm.transaction" --identity $$bevm_user_key ; \
-		bevm_instance_id=$$($(word 3,$^) --config $Dbackend/build/bevm_admin spawn --bc $Dbackend/build/bevm_admin/bc-* | awk '{print $$NF}' ) ; \
+		bevm_admin_key=$$( $< --config $Dbackend/configs/bevm_admin key ) ; \
+		bevm_user_key=$$( $< --config $Dbackend/configs/bevm_user key ) ; \
+		bevm_user_private_key=$$( $< --config $Dbackend/configs/bevm_user key --print $Dbackend/configs/bevm_user/key-* | grep Private | cut -d \  -f 2 ) ; \
+		bevm_darc=$$( $< --config $Dbackend/configs darc add --bc $Dbackend/configs/bc-* --unrestricted --identity $$bevm_admin_key --desc "BEvm Darc" | awk -F: '/BaseID:/ {print $$3}' ) ; \
+		$< --config $Dbackend/configs/bevm_admin link $(word 2,$^) $$( grep ByzCoinID $Dbackend/configs/ident | cut -d \  -f 2 ) --darc $$bevm_darc --identity $$bevm_admin_key ; \
+		$< --config $Dbackend/configs/bevm_admin darc rule --bc $Dbackend/configs/bevm_admin/bc-* --rule "spawn:bevm" --identity $$bevm_admin_key ; \
+		$< --config $Dbackend/configs/bevm_admin darc rule --bc $Dbackend/configs/bevm_admin/bc-* --rule "invoke:bevm.credit" --identity $$bevm_user_key ; \
+		$< --config $Dbackend/configs/bevm_admin darc rule --bc $Dbackend/configs/bevm_admin/bc-* --rule "invoke:bevm.transaction" --identity $$bevm_user_key ; \
+		bevm_instance_id=$$($(word 3,$^) --config $Dbackend/configs/bevm_admin spawn --bc $Dbackend/configs/bevm_admin/bc-* | awk '{print $$NF}' ) ; \
 		( echo "bevm_admin_key:        $${bevm_admin_key#ed25519:}" ; \
 		  echo "bevm_user_private_key: $$bevm_user_private_key" ; \
 		  echo "bevm_darc:             $$bevm_darc" ; \
 		  echo "bevm_instance_id:      $$bevm_instance_id" ) > $@)
 
-$Dbackend/build/config_bevm.toml: $Dbackend/build/ident_bevm
+$Dbackend/configs/config_bevm.toml: $Dbackend/configs/ident_bevm
 	awk ' \
 		/^bevm_user_private_key:/  {printf("bevmUserID = \"%s\"\n", $$2)} \
 		/^bevm_instance_id:/       {printf("bevmInstanceID = \"%s\"\n", $$2)} \
 		' $^ > $@
 
 $Swebapp-build $Swebapp-test $Swebapp-serve: $Dwebapp/src/assets/configs/bevm.toml $Dwebapp/src/assets/configs/stainless.toml
 
-$Dwebapp/src/assets/configs/bevm.toml: $Dbackend/build/config_bevm.toml | $Dwebapp/src/assets/configs/
+$Dwebapp/src/assets/configs/bevm.toml: $Dbackend/configs/config_bevm.toml | $Dwebapp/src/assets/configs/
 	cp $^ $@
 
 $Dwebapp/src/assets/configs/stainless.toml: $Dwebapp/src/assets/configs/$(toml_filename) | $Dwebapp/src/assets/configs/
@@ -75,6 +75,12 @@ ifneq ($S,)
 all: $Sall
 endif
 
+persistent: webapp-proto
+	docker build -t ghcr.io/c4dt/service-stainless-persistent:latest -f Dockerfile.persistent backend
+
+push:
+	docker push ghcr.io/c4dt/service-stainless-persistent:latest ghcr.io/c4dt/service-stainless-backend:latest
+
 .PHONY: configs
 configs: webapp/src/assets/configs/byzcoin.toml
 configs: webapp/src/assets/configs/bevm.toml

backend/.gitignore

@@ -1,3 +1,4 @@
 /build/
+/configs/
 /cothority/
 /proto/

backend/Dockerfile

@@ -1,13 +1,19 @@
-FROM golang:1 as builder
+FROM golang:1.21 as builder
+
+RUN apt update \
+    && apt install --no-install-recommends --yes unzip
 
 COPY build/*.go build/go.* /src/main/
-COPY *.go go.* /backend/
-COPY cothority/ /backend/cothority/
-COPY proto/ /backend/proto/
-COPY stainless/ /backend/stainless/
+COPY *.go go.* /src/
+COPY cothority /src/cothority/
+COPY proto /src/proto/
+COPY stainless /src/stainless/
 
 RUN cd /src/main && go build -v -o /conode
 
+COPY build/stainless.zip /tmp/
+RUN unzip -d /stainless /tmp/stainless.zip
+
 FROM debian:bookworm-slim as runner
 
 # libgomp is needed for z3
@@ -16,16 +22,11 @@ RUN apt update \
 	    procps \
 	    openjdk-17-jre-headless \
 	    libgomp1 \
-	    npm \
-	    unzip \
     && apt clean
 RUN npm install --global [email protected]
 
 COPY build/cvc4 /usr/local/bin/
 
-COPY build/stainless.zip /tmp/
-RUN unzip -d /usr/local/bin /tmp/stainless.zip && rm -f /tmp/stainless.zip
-
-COPY --from=builder /conode /usr/local/bin/conode
+COPY --from=builder /conode /stainless/* /usr/local/bin/
 
-ENTRYPOINT ["/usr/local/bin/conode"]
+CMD /usr/local/bin/conode -d 2 -c /config/private.toml server

backend/Dockerfile.persistent

@@ -0,0 +1,5 @@
+FROM ghcr.io/c4dt/service-stainless-backend
+
+COPY configs /configs/
+
+CMD ( mkdir -p /config; test -f /config/private.toml || cp -a /configs/conode-$NODE_NBR/* /config ); /usr/local/bin/conode -d 2 -c /config/private.toml server

docker-compose.yml

@@ -2,53 +2,43 @@ version: "3"
 
 services:
   conode-1:
-    image: c4dt/service-stainless-backend:latest
-    build:
-      context: backend
+    image: ghcr.io/c4dt/service-stainless-persistent:latest
     volumes:
-      - ./backend/build/conode-1:/config
-    network_mode: host
-    command: "-d 2 -c /config/private.toml server"
+      - ./backend/configs/conode-1:/config
+    ports:
+      - "7772-7779:7772-7779"
     environment:
-      - CONODE_SERVICE_PATH=/config
+      - NODE_NBR=1
       - DEBUG_COLOR=true
+
   conode-2:
-    image: c4dt/service-stainless-backend:latest
-    build:
-      context: backend
-    network_mode: host
+    image: ghcr.io/c4dt/service-stainless-persistent:latest
     volumes:
-      - ./backend/build/conode-2:/config
-    command: "-d 2 -c /config/private.toml server"
+      - ./backend/configs/conode-2:/config
     environment:
-      - CONODE_SERVICE_PATH=/config
+      - NODE_NBR=2
       - DEBUG_COLOR=true
+    network_mode: service:conode-1
+
   conode-3:
-    image: c4dt/service-stainless-backend:latest
-    build:
-      context: backend
-    network_mode: host
+    image: ghcr.io/c4dt/service-stainless-persistent:latest
     volumes:
-      - ./backend/build/conode-3:/config
-    command: "-d 2 -c /config/private.toml server"
+      - ./backend/configs/conode-3:/config
     environment:
-      - CONODE_SERVICE_PATH=/config
+      - NODE_NBR=3
       - DEBUG_COLOR=true
+    network_mode: service:conode-1
+
   conode-4:
-    image: c4dt/service-stainless-backend:latest
-    build:
-      context: backend
-    network_mode: host
+    image: ghcr.io/c4dt/service-stainless-persistent:latest
     volumes:
-      - ./backend/build/conode-4:/config
-    command: "-d 2 -c /config/private.toml server"
+      - ./backend/configs/conode-4:/config
     environment:
-      - CONODE_SERVICE_PATH=/config
+      - NODE_NBR=4
       - DEBUG_COLOR=true
+    network_mode: service:conode-1
+
   demo:
-    image: c4dt/service-stainless-demo:latest
-    build:
-      context: webapp
-    network_mode: host
-    volumes:
-      - ./webapp/src/assets:/webapp/assets
+    image: ghcr.io/c4dt/service-stainless-webapp:latest
+    ports:
+      - "8080:8080"

webapp/.gitignore

@@ -1 +1,2 @@
 /node_modules/
+/dist/

webapp/Dockerfile

@@ -1,16 +1,15 @@
-FROM node:16-alpine AS builder
+FROM node:14-alpine AS builder
 
 WORKDIR /webapp
 
-COPY package*.json .
+COPY package*.json ./
 RUN npm ci
 
 COPY . .
 RUN npx ng build --prod
 
-FROM joseluisq/static-web-server:2 AS runner
+FROM python:3
 
 COPY --from=builder /webapp/dist /webapp
 
-WORKDIR /webapp
-ENV SERVER_ROOT=/webapp
+CMD python3 -m http.server 8080 --directory /webapp

webapp/angular.json

@@ -16,7 +16,7 @@
             "customWebpackConfig": {
               "path": "./extra-webpack.config.js"
             },
-            "outputPath": "dist/stainless-demo",
+            "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",

webapp/src/app/stainless/stainless.component.ts

@@ -369,7 +369,7 @@ export class StainlessComponent implements OnInit {
       // Call Stainless service to perform verification
       const response = await this.performLongAction<proto.VerificationResponse>(
         () => this.config.stainlessRPC.verify(sourceFiles),
-        "Performing verification"
+        "Performing verification<br>2-3 minutes"
       );
       if (response === null) {
         return;
@@ -408,7 +408,7 @@ export class StainlessComponent implements OnInit {
     // Call Stainless service to generate bytecode and ABI
     const response = await this.performLongAction<proto.BytecodeGenResponse>(
       () => this.config.stainlessRPC.genBytecode(sourceFiles),
-      "Compiling..."
+      "Compiling...<br>1 minute"
     );
     if (response === null) {
       return;