Fix docker containers adding missing files

Signed-off-by: Antonio Navarro <antnavper@gmail.com>
gnolang · May 21, 2024 · eacc09a · eacc09a
1 parent 8f87ff0
commit eacc09a
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 7 deletions.
diff --git a/.github/goreleaser.yaml b/.github/goreleaser.yaml
@@ -108,6 +108,10 @@ dockers:
       - "--label=org.opencontainers.image.version={{.Version}}"
     ids:
       - gno
+    extra_files:
+      - examples
+      - gnovm/stdlibs
+      - gnovm/tests/stdlibs
   - use: buildx
     dockerfile: Dockerfile.gno.release
     goos: linux
@@ -123,6 +127,10 @@ dockers:
       - "--label=org.opencontainers.image.version={{.Version}}"
     ids:
       - gno
+    extra_files:
+      - examples
+      - gnovm/stdlibs
+      - gnovm/tests/stdlibs
   - use: buildx
     dockerfile: Dockerfile.gno.release
     goos: linux
@@ -139,6 +147,10 @@ dockers:
       - "--label=org.opencontainers.image.version={{.Version}}"
     ids:
       - gno
+    extra_files:
+      - examples
+      - gnovm/stdlibs
+      - gnovm/tests/stdlibs
   - use: buildx
     dockerfile: Dockerfile.gno.release
     goos: linux
@@ -155,6 +167,10 @@ dockers:
       - "--label=org.opencontainers.image.version={{.Version}}"
     ids:
       - gno
+    extra_files:
+      - examples
+      - gnovm/stdlibs
+      - gnovm/tests/stdlibs
 
   # gnoland
   - use: buildx
@@ -172,6 +188,11 @@ dockers:
       - "--label=org.opencontainers.image.version={{.Version}}"
     ids:
       - gnoland
+    extra_files:
+      - gno.land/genesis/genesis_balances.txt
+      - gno.land/genesis/genesis_txs.jsonl
+      - examples
+      - gnovm/stdlibs
   - use: buildx
     dockerfile: Dockerfile.gnoland.release
     goos: linux
@@ -187,6 +208,11 @@ dockers:
       - "--label=org.opencontainers.image.version={{.Version}}"
     ids:
       - gnoland
+    extra_files:
+      - gno.land/genesis/genesis_balances.txt
+      - gno.land/genesis/genesis_txs.jsonl
+      - examples
+      - gnovm/stdlibs
   - use: buildx
     dockerfile: Dockerfile.gnoland.release
     goos: linux
@@ -203,6 +229,11 @@ dockers:
       - "--label=org.opencontainers.image.version={{.Version}}"
     ids:
       - gnoland
+    extra_files:
+      - gno.land/genesis/genesis_balances.txt
+      - gno.land/genesis/genesis_txs.jsonl
+      - examples
+      - gnovm/stdlibs
   - use: buildx
     dockerfile: Dockerfile.gnoland.release
     goos: linux
@@ -219,6 +250,11 @@ dockers:
       - "--label=org.opencontainers.image.version={{.Version}}"
     ids:
       - gnoland
+    extra_files:
+      - gno.land/genesis/genesis_balances.txt
+      - gno.land/genesis/genesis_txs.jsonl
+      - examples
+      - gnovm/stdlibs
   # gnokey
   - use: buildx
     dockerfile: Dockerfile.gnokey.release
@@ -282,7 +318,7 @@ dockers:
       - "--label=org.opencontainers.image.version={{.Version}}"
     ids:
       - gnokey
-
+    
   # gnoweb
   - use: buildx
     dockerfile: Dockerfile.gnoweb.release

diff --git a/.github/workflows/releaser.yml b/.github/workflows/releaser.yml
@@ -37,7 +37,9 @@ jobs:
 
       - uses: goreleaser/goreleaser-action@v5
         with:
+          distribution: goreleaser-pro
           version: latest
           args: release --clean --config ./.github/goreleaser.yaml
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GORELEASER_KEY: ${{ secrets.GORELEASER_TOKEN }}
diff --git a/Dockerfile.gno.release b/Dockerfile.gno.release
@@ -1,4 +1,11 @@
-FROM scratch
-COPY . /
+FROM busybox
+
+COPY ./gno /gno
+COPY ./examples /gnoroot/examples/
+COPY ./gnovm/stdlibs /gnoroot/gnovm/stdlibs/
+COPY ./gnovm/tests/stdlibs /gnoroot/gnovm/tests/stdlibs/
+
+ENV GNOROOT="/gnoroot/"
+
 ENTRYPOINT [ "/gno" ]
 CMD [ "" ]
diff --git a/Dockerfile.gnokey.release b/Dockerfile.gnokey.release
@@ -1,4 +1,6 @@
-FROM scratch
+FROM busybox
+
 COPY . /
+
 ENTRYPOINT [ "/gnokey" ]
 CMD [ "" ]
diff --git a/Dockerfile.gnoland.release b/Dockerfile.gnoland.release
@@ -1,5 +1,13 @@
-FROM scratch
-COPY . /
+FROM busybox
+
+COPY ./gnoland /gnoland
+COPY ./examples /gnoroot/examples/
+COPY ./gnovm/stdlibs /gnoroot/gnovm/stdlibs/
+COPY ./gno.land/genesis/genesis_balances.txt /gnoroot/gno.land/genesis/genesis_balances.txt
+COPY ./gno.land/genesis/genesis_txs.jsonl /gnoroot/gno.land/genesis/genesis_txs.jsonl
+
+ENV GNOROOT="/gnoroot/"
+
 EXPOSE 26657 36657
 ENTRYPOINT [ "/gnoland" ]
 CMD [ "" ]
diff --git a/Dockerfile.gnoweb.release b/Dockerfile.gnoweb.release
@@ -1,5 +1,7 @@
-FROM scratch
+FROM busybox
+
 COPY . /
+
 EXPOSE 8888
 ENTRYPOINT [ "/gnoweb" ]
 CMD [ "" ]