Merge pull request #491 from lightninglabs/fix-docker-build

Fix docker build
lightninglabs · Sep 7, 2023 · aafd6c8 · aafd6c8
2 parents c8bed24 + 92351ac
commit aafd6c8
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 8 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -97,6 +97,33 @@ jobs:
       - name: compile code
         run: go install -v ./...
 
+  ########################
+  # Docker build check.
+  ########################
+  docker-build-check:
+    name: Docker build check
+    runs-on: ubuntu-latest
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build default image
+        uses: docker/build-push-action@v4
+        with:
+          tags: "default-taproot-assets"
+
+      - name: Build dev image
+        uses: docker/build-push-action@v4
+        with:
+          file: dev.Dockerfile
+          tags: "dev-taproot-assets"
+
   ########################
   # cross compilation
   ########################

diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "bips"]
 	path = bips
-	url = git@github.com:Roasbeef/bips.git
+	url = https://github.com/Roasbeef/bips.git
 	branch = bip-tap
diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@
 # /make/builder.Dockerfile
 # /taprpc/Dockerfile
 # /tools/Dockerfile
-FROM golang:1.21.0-bookworm as builder
+FROM golang:1.21.0-alpine as builder
 
 # Force Go to use the cgo based DNS resolver. This is required to ensure DNS
 # queries required to connect to linked containers succeed.

diff --git a/bips b/bips
diff --git a/itest/tapd_harness.go b/itest/tapd_harness.go
@@ -7,6 +7,7 @@ import (
 	"os"
 	"path/filepath"
 	"sync"
+	"testing"
 	"time"
 
 	"github.com/btcsuite/btcd/chaincfg"
@@ -78,7 +79,7 @@ type tapdConfig struct {
 
 // newTapdHarness creates a new tapd server harness with the given
 // configuration.
-func newTapdHarness(ht *harnessTest, cfg tapdConfig,
+func newTapdHarness(t *testing.T, ht *harnessTest, cfg tapdConfig,
 	proofCourier proof.CourierHarness,
 	proofSendBackoffCfg *proof.BackoffCfg,
 	proofReceiverAckTimeout *time.Duration) (*tapdHarness, error) {
@@ -117,11 +118,11 @@ func newTapdHarness(ht *harnessTest, cfg tapdConfig,
 
 	case tapcfg.DatabaseBackendPostgres:
 		fixture := tapdb.NewTestPgFixture(
-			ht.t, *postgresTimeout, !*noDelete,
+			t, *postgresTimeout, !*noDelete,
 		)
-		ht.t.Cleanup(func() {
+		t.Cleanup(func() {
 			if !*noDelete {
-				fixture.TearDown(ht.t)
+				fixture.TearDown(t)
 			}
 		})
 		tapCfg.DatabaseBackend = tapcfg.DatabaseBackendPostgres

diff --git a/itest/test_harness.go b/itest/test_harness.go
@@ -363,7 +363,7 @@ func setupTapdHarness(t *testing.T, ht *harnessTest,
 	}
 
 	tapdHarness, err := newTapdHarness(
-		ht, tapdConfig{
+		t, ht, tapdConfig{
 			NetParams: harnessNetParams,
 			LndNode:   node,
 		}, selectedProofCourier,
+48 −10		bip-tap-addr.mediawiki
+65 −0		bip-tap-addr/address_tlv_encoding_error_cases.json
+110 −0		bip-tap-addr/address_tlv_encoding_generated.json
+10 −2		bip-tap-ms-smt.mediawiki
+45 −0		bip-tap-ms-smt/mssmt_tree_deletion.json
+42 −0		bip-tap-ms-smt/mssmt_tree_error_cases.json
+84,060 −0		bip-tap-ms-smt/mssmt_tree_proofs.json
+1,519 −0		bip-tap-ms-smt/mssmt_tree_replacement.json
+32 −15		bip-tap-proof-file.mediawiki
+3 −0		bip-tap-proof-file/proof_tlv_encoding_error_cases.json
+603 −0		bip-tap-proof-file/proof_tlv_encoding_generated.json
+911 −0		bip-tap-proof-file/proof_tlv_encoding_regtest.json
+15 −0		bip-tap-psbt.mediawiki
+8 −0		bip-tap-psbt/psbt_encoding_error_cases.json
+395 −0		bip-tap-psbt/psbt_encoding_generated.json
+1 −1		bip-tap-universe.mediawiki
+16 −9		bip-tap-vm.mediawiki
+1,970 −0		bip-tap-vm/vm_validation_generated.json
+1,458 −0		bip-tap-vm/vm_validation_generated_error_cases.json
+75 −138		bip-tap.mediawiki
+31 −0		bip-tap/asset_burn_key_generated.json
+45 −0		bip-tap/asset_tlv_encoding_error_cases.json
+142 −0		bip-tap/asset_tlv_encoding_generated.json