From 3bb846b7cbefc0fcef64d6d5026e18dc4f6735b9 Mon Sep 17 00:00:00 2001 From: Fmar Date: Thu, 18 Jan 2024 22:13:28 +0100 Subject: [PATCH 01/25] go 1.21.x --- .github/workflows/workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 4f0e3176..77e3037f 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -15,7 +15,7 @@ jobs: - name: Install Go uses: actions/setup-go@v1 with: - go-version: 1.20.x + go-version: 1.21.x - name: Checkout code uses: actions/checkout@v2 - name: Run tests From 5f97fde79084705f06f22c31a75c063d1a125f08 Mon Sep 17 00:00:00 2001 From: Fmar Date: Fri, 19 Jan 2024 20:14:11 +0100 Subject: [PATCH 02/25] don't use alpine --- Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index cd1e0674..c259b78c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,10 +3,10 @@ WORKDIR /build COPY frontend ./frontend RUN cd frontend && yarn install && yarn build -FROM golang:latest as builder +FROM golang:1.21 as builder RUN apt-get update && \ - apt-get install -y gcc + apt-get install -y gcc ENV CGO_ENABLED=1 ENV GOOS=linux @@ -29,7 +29,9 @@ COPY --from=frontend /build/frontend/dist ./frontend/dist RUN go build -o main . # Start a new, final image to reduce size. -FROM alpine as final +#FROM alpine as final + +#RUN apk add libc6-compat # FROM gcr.io/distroless/static-debian11 @@ -39,3 +41,4 @@ FROM alpine as final COPY --from=builder /build/main /bin/ ENTRYPOINT [ "/bin/main" ] +#ENTRYPOINT ["/bin/sh","-c","sleep infinity"] From 5a4257e82e17069b24e9d17488aac2729896ec2b Mon Sep 17 00:00:00 2001 From: Fmar Date: Fri, 19 Jan 2024 20:16:00 +0100 Subject: [PATCH 03/25] don't copy --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c259b78c..f16a2c75 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,7 +38,7 @@ RUN go build -o main . # USER small-user:small-user # Copy the binaries and entrypoint from the builder image. -COPY --from=builder /build/main /bin/ +# COPY --from=builder /build/main /bin/ -ENTRYPOINT [ "/bin/main" ] +ENTRYPOINT [ "/build/main" ] #ENTRYPOINT ["/bin/sh","-c","sleep infinity"] From 26348f2ef4ae4e70af172cf18abf8772a3bb2512 Mon Sep 17 00:00:00 2001 From: Fmar Date: Fri, 19 Jan 2024 20:17:02 +0100 Subject: [PATCH 04/25] go-version: 1.21.x --- .github/workflows/multiplatform.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/multiplatform.yaml b/.github/workflows/multiplatform.yaml index 36727bad..d00708c2 100644 --- a/.github/workflows/multiplatform.yaml +++ b/.github/workflows/multiplatform.yaml @@ -15,7 +15,7 @@ jobs: - name: Install Go uses: actions/setup-go@v1 with: - go-version: 1.20.x + go-version: 1.21.x - name: Checkout code uses: actions/checkout@v2 - name: Run tests From a6ee207efe3a57074f2e2a8ac7ae99325cb4e0e7 Mon Sep 17 00:00:00 2001 From: Fmar Date: Fri, 19 Jan 2024 20:21:12 +0100 Subject: [PATCH 05/25] don't run tests --- .github/workflows/workflow.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 77e3037f..41bf8735 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -18,8 +18,8 @@ jobs: go-version: 1.21.x - name: Checkout code uses: actions/checkout@v2 - - name: Run tests - run: mkdir frontend/dist && touch frontend/dist/tmp && go test +# - name: Run tests +# run: mkdir frontend/dist && touch frontend/dist/tmp && go test - name: Docker build uses: mr-smithers-excellent/docker-build-push@v6 id: build From 3486f03e81c14b4b2fae262c69afa556b961fdb5 Mon Sep 17 00:00:00 2001 From: Fmar Date: Fri, 19 Jan 2024 23:14:39 +0100 Subject: [PATCH 06/25] wget libbreez_sdk_bindings and copy it into final --- Dockerfile | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index f16a2c75..d3cba804 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18-alpine as frontend +FROM node:19-alpine as frontend WORKDIR /build COPY frontend ./frontend RUN cd frontend && yarn install && yarn build @@ -28,17 +28,18 @@ COPY --from=frontend /build/frontend/dist ./frontend/dist RUN go build -o main . -# Start a new, final image to reduce size. -#FROM alpine as final +RUN wget https://github.com/breez/breez-sdk-go/raw/main/breez_sdk/lib/linux-amd64/libbreez_sdk_bindings.so -#RUN apk add libc6-compat +# Start a new, final image to reduce size. +FROM debian as final -# FROM gcr.io/distroless/static-debian11 -# USER small-user:small-user +ENV LD_LIBRARY_PATH=/usr/lib/libbreez -# Copy the binaries and entrypoint from the builder image. -# COPY --from=builder /build/main /bin/ +# +# # Copy the binaries and entrypoint from the builder image. +COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ +COPY --from=builder /build/libbreez_sdk_bindings.so /usr/lib/libbreez/ +COPY --from=builder /build/main /bin/ -ENTRYPOINT [ "/build/main" ] -#ENTRYPOINT ["/bin/sh","-c","sleep infinity"] +ENTRYPOINT [ "/bin/main" ] From 455f477fcc39168dd8ba4be8a159c065386bc168 Mon Sep 17 00:00:00 2001 From: Fmar Date: Sat, 20 Jan 2024 00:38:10 +0100 Subject: [PATCH 07/25] wails worflow --- .github/workflows/wails.yaml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/wails.yaml diff --git a/.github/workflows/wails.yaml b/.github/workflows/wails.yaml new file mode 100644 index 00000000..5b82a8d6 --- /dev/null +++ b/.github/workflows/wails.yaml @@ -0,0 +1,26 @@ +name: Multiplatform Docker build & push +on: + push: + release: + types: [published] +jobs: + build: + strategy: + fail-fast: false + matrix: + build: [ + { name: nostr-wallet-connect, platform: linux/amd64, os: ubuntu-latest }, + ] + env: + REGISTRY: ghcr.io + IMAGENAME: ${{ github.event.repository.name }} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + name: Check out code + - uses: dAppServer/wails-build-action@v2.2 + with: + build-name: ${{ matrix.build.name }} + build-platform: ${{ matrix.build.platform }} + package: false + go-version: '1.21' \ No newline at end of file From 9caa8d86f0c58cf44db4009f068ca139dff14fe1 Mon Sep 17 00:00:00 2001 From: Fmar Date: Sat, 20 Jan 2024 01:06:47 +0100 Subject: [PATCH 08/25] wails worflow --- .github/workflows/wails.yaml | 37 +++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/.github/workflows/wails.yaml b/.github/workflows/wails.yaml index 5b82a8d6..d8982276 100644 --- a/.github/workflows/wails.yaml +++ b/.github/workflows/wails.yaml @@ -18,9 +18,36 @@ jobs: steps: - uses: actions/checkout@v2 name: Check out code - - uses: dAppServer/wails-build-action@v2.2 + - name: Setup GoLang + uses: actions/setup-go@v4 with: - build-name: ${{ matrix.build.name }} - build-platform: ${{ matrix.build.platform }} - package: false - go-version: '1.21' \ No newline at end of file + check-latest: true + go-version: ${{inputs.go-version}} + - run: go version + shell: bash + # Setup and configure NodeJS + - name: Setup NodeJS + uses: actions/setup-node@v3 + with: + node-version: 18.x + - name: Install Wails + if: inputs.build == 'true' + run: go install github.com/wailsapp/wails/v2/cmd/wails@latest + shell: bash + - name: Install Linux Wails deps + if: inputs.build == 'true' && runner.os == 'Linux' + run: sudo apt-get update && sudo apt-get install libgtk-3-0 libwebkit2gtk-4.0-dev gcc-aarch64-linux-gnu + shell: bash + # Building step + - name: Build App + if: inputs.build == 'true' && runner.os == 'Linux' + working-directory: . + run: wails build --platform ${{ matrix.build.platform }} -tags "wails" + #-o ${{ matrix.build.name }} + shell: bash +# - uses: dAppServer/wails-build-action@v2.2 +# with: +# build-name: ${{ matrix.build.name }} +# build-platform: ${{ matrix.build.platform }} +# package: false +# go-version: '1.21' \ No newline at end of file From 217aa5b26580fa308272f1031019bbe65f810ca6 Mon Sep 17 00:00:00 2001 From: Fmar Date: Sat, 20 Jan 2024 01:07:53 +0100 Subject: [PATCH 09/25] wails worflow --- .github/workflows/wails.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/wails.yaml b/.github/workflows/wails.yaml index d8982276..d0023c8e 100644 --- a/.github/workflows/wails.yaml +++ b/.github/workflows/wails.yaml @@ -31,16 +31,13 @@ jobs: with: node-version: 18.x - name: Install Wails - if: inputs.build == 'true' run: go install github.com/wailsapp/wails/v2/cmd/wails@latest shell: bash - name: Install Linux Wails deps - if: inputs.build == 'true' && runner.os == 'Linux' run: sudo apt-get update && sudo apt-get install libgtk-3-0 libwebkit2gtk-4.0-dev gcc-aarch64-linux-gnu shell: bash # Building step - name: Build App - if: inputs.build == 'true' && runner.os == 'Linux' working-directory: . run: wails build --platform ${{ matrix.build.platform }} -tags "wails" #-o ${{ matrix.build.name }} From 36a3425a6b0b6be157ff099c7bea82f9f7102672 Mon Sep 17 00:00:00 2001 From: Fmar Date: Sat, 20 Jan 2024 01:09:42 +0100 Subject: [PATCH 10/25] wails worflow --- .github/workflows/wails.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wails.yaml b/.github/workflows/wails.yaml index d0023c8e..94c2d63c 100644 --- a/.github/workflows/wails.yaml +++ b/.github/workflows/wails.yaml @@ -1,4 +1,4 @@ -name: Multiplatform Docker build & push +name: Wails build on: push: release: @@ -22,7 +22,7 @@ jobs: uses: actions/setup-go@v4 with: check-latest: true - go-version: ${{inputs.go-version}} + go-version: 1.21 - run: go version shell: bash # Setup and configure NodeJS From 74df9c419dcd011f009e85ad8e6329807ab734b0 Mon Sep 17 00:00:00 2001 From: Fmar Date: Sat, 20 Jan 2024 01:14:38 +0100 Subject: [PATCH 11/25] wails worflow --- .github/workflows/wails.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wails.yaml b/.github/workflows/wails.yaml index 94c2d63c..bcd6028d 100644 --- a/.github/workflows/wails.yaml +++ b/.github/workflows/wails.yaml @@ -23,8 +23,6 @@ jobs: with: check-latest: true go-version: 1.21 - - run: go version - shell: bash # Setup and configure NodeJS - name: Setup NodeJS uses: actions/setup-node@v3 @@ -42,6 +40,12 @@ jobs: run: wails build --platform ${{ matrix.build.platform }} -tags "wails" #-o ${{ matrix.build.name }} shell: bash + - uses: actions/upload-artifact@v3 + with: + name: Wails Build ${{ matrix.build.platform }} nostr-wallet-connect + path: | + */bin/ + *\bin\* # - uses: dAppServer/wails-build-action@v2.2 # with: # build-name: ${{ matrix.build.name }} From 197b06458be5bc4454d722d8aa9194954f9eb97f Mon Sep 17 00:00:00 2001 From: Fmar Date: Sat, 20 Jan 2024 01:18:29 +0100 Subject: [PATCH 12/25] wails worflow --- .github/workflows/wails.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wails.yaml b/.github/workflows/wails.yaml index bcd6028d..552b9e4b 100644 --- a/.github/workflows/wails.yaml +++ b/.github/workflows/wails.yaml @@ -42,7 +42,7 @@ jobs: shell: bash - uses: actions/upload-artifact@v3 with: - name: Wails Build ${{ matrix.build.platform }} nostr-wallet-connect + name: Wails Build ${{runner.os}} nostr-wallet-connect path: | */bin/ *\bin\* From 83994168b05f64d0adef9dd9a9d36faed05b67aa Mon Sep 17 00:00:00 2001 From: Fmar Date: Sat, 20 Jan 2024 02:01:31 +0100 Subject: [PATCH 13/25] prepare:http --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d3cba804..7f1b118c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM node:19-alpine as frontend WORKDIR /build COPY frontend ./frontend -RUN cd frontend && yarn install && yarn build +RUN cd frontend && yarn install && yarn prepare:http && yarn build FROM golang:1.21 as builder From a60552abc81e0c02aec1cafa33e9fc769f3374a6 Mon Sep 17 00:00:00 2001 From: Fmar Date: Sat, 20 Jan 2024 02:08:58 +0100 Subject: [PATCH 14/25] remove alby-deployment stuff --- .github/workflows/workflow.yaml | 34 --------------------------------- 1 file changed, 34 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 41bf8735..77b7580a 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -28,37 +28,3 @@ jobs: registry: ${{ env.REGISTRY }} username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Checkout deployment repo - uses: actions/checkout@v2 - with: - repository: getalby/alby-deployment - path: infrastructure - token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - # Always update dev environment - - name: Update dev environment - if: ${{ github.ref == 'refs/heads/main' }} - uses: fjogeleit/yaml-update-action@v0.7.0 - with: - valueFile: "alby-simnet-deployment/values/nwc.yaml" - propertyPath: "nwc.image.tag" - value: ${{ steps.build.outputs.tags }} - repository: getalby/alby-deployment - branch: main - createPR: false - message: "CD: Update nwc tag to ${{ steps.build.outputs.tags }}" - token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - workDir: infrastructure - # Only update prod environment if this action was triggered by a new tag - - name: Update production environment - if: startsWith(github.ref, 'refs/tags') - uses: fjogeleit/yaml-update-action@v0.7.0 - with: - valueFile: "alby-mainnet-deployment/values.yaml" - propertyPath: "nwc.image.tag" - value: ${{ steps.build.outputs.tags }} - repository: getalby/alby-deployment - branch: main - createPR: false - message: "CD: Update nwc tag to ${{ steps.build.outputs.tags }}" - token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - workDir: infrastructure From 1b95f5e9e3734d5e5f862e97345ea7697184b73a Mon Sep 17 00:00:00 2001 From: Fmar Date: Sat, 20 Jan 2024 02:09:37 +0100 Subject: [PATCH 15/25] uncomment tests --- .github/workflows/workflow.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 77b7580a..7a6f3050 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -18,8 +18,8 @@ jobs: go-version: 1.21.x - name: Checkout code uses: actions/checkout@v2 -# - name: Run tests -# run: mkdir frontend/dist && touch frontend/dist/tmp && go test + - name: Run tests + run: mkdir frontend/dist && touch frontend/dist/tmp && go test - name: Docker build uses: mr-smithers-excellent/docker-build-push@v6 id: build From fd493b387590942289040da25ff69f36ff09c018 Mon Sep 17 00:00:00 2001 From: Fmar Date: Sat, 20 Jan 2024 02:11:44 +0100 Subject: [PATCH 16/25] uncomment tests --- .github/workflows/workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 7a6f3050..cc81a349 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -1,4 +1,4 @@ -name: Linux Docker build & Alby CD +name: Linux Docker build on: push: release: From e05a259b353ceaab45dd58c6f84054f74aa57b59 Mon Sep 17 00:00:00 2001 From: Fmar Date: Sat, 20 Jan 2024 02:31:57 +0100 Subject: [PATCH 17/25] remove workflow, multiplatform only amd64 for now --- .../{multiplatform.yaml => build-docker.yaml} | 2 +- .github/workflows/workflow.yaml | 30 ------------------- 2 files changed, 1 insertion(+), 31 deletions(-) rename .github/workflows/{multiplatform.yaml => build-docker.yaml} (95%) delete mode 100644 .github/workflows/workflow.yaml diff --git a/.github/workflows/multiplatform.yaml b/.github/workflows/build-docker.yaml similarity index 95% rename from .github/workflows/multiplatform.yaml rename to .github/workflows/build-docker.yaml index d00708c2..a17edf96 100644 --- a/.github/workflows/multiplatform.yaml +++ b/.github/workflows/build-docker.yaml @@ -27,6 +27,6 @@ jobs: image: ${{ env.IMAGENAME }} registry: ${{ env.REGISTRY }} multiPlatform: true - platform: linux/amd64,linux/arm64 + platform: linux/amd64 username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml deleted file mode 100644 index cc81a349..00000000 --- a/.github/workflows/workflow.yaml +++ /dev/null @@ -1,30 +0,0 @@ -name: Linux Docker build -on: - push: - release: - types: [published] -jobs: - build: - env: - REGISTRY: ghcr.io - IMAGENAME: ${{ github.event.repository.name }} - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - name: Check out code - - name: Install Go - uses: actions/setup-go@v1 - with: - go-version: 1.21.x - - name: Checkout code - uses: actions/checkout@v2 - - name: Run tests - run: mkdir frontend/dist && touch frontend/dist/tmp && go test - - name: Docker build - uses: mr-smithers-excellent/docker-build-push@v6 - id: build - with: - image: ${{ env.IMAGENAME }} - registry: ${{ env.REGISTRY }} - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} From 4c694f7af4c1f2fe151cd4858decf9ea8c5c77b7 Mon Sep 17 00:00:00 2001 From: Fmar Date: Wed, 24 Jan 2024 14:52:28 +0100 Subject: [PATCH 18/25] try building for arm64 --- .github/workflows/build-docker.yaml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index a17edf96..07721ce3 100644 --- a/.github/workflows/build-docker.yaml +++ b/.github/workflows/build-docker.yaml @@ -27,6 +27,6 @@ jobs: image: ${{ env.IMAGENAME }} registry: ${{ env.REGISTRY }} multiPlatform: true - platform: linux/amd64 + platform: linux/arm64 username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} diff --git a/Dockerfile b/Dockerfile index 7f1b118c..32fc316a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN apt-get update && \ ENV CGO_ENABLED=1 ENV GOOS=linux -ENV GOARCH=amd64 +ENV GOARCH=arm64 # Move to working directory /build WORKDIR /build From 7a6dacfebe2dc4c85980dcfe2a86402680d9f2a5 Mon Sep 17 00:00:00 2001 From: Fmar Date: Wed, 24 Jan 2024 15:48:00 +0100 Subject: [PATCH 19/25] GOARCH=$(echo "$TARGETPLATFORM" | cut -d'/' -f2) --- .github/workflows/build-docker.yaml | 2 +- Dockerfile | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index 07721ce3..d00708c2 100644 --- a/.github/workflows/build-docker.yaml +++ b/.github/workflows/build-docker.yaml @@ -27,6 +27,6 @@ jobs: image: ${{ env.IMAGENAME }} registry: ${{ env.REGISTRY }} multiPlatform: true - platform: linux/arm64 + platform: linux/amd64,linux/arm64 username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} diff --git a/Dockerfile b/Dockerfile index 32fc316a..f808444b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,23 @@ FROM node:19-alpine as frontend WORKDIR /build COPY frontend ./frontend -RUN cd frontend && yarn install && yarn prepare:http && yarn build +RUN cd frontend && yarn install && yarn build:http FROM golang:1.21 as builder +ARG TARGETPLATFORM +ARG BUILDPLATFORM + +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + RUN apt-get update && \ apt-get install -y gcc ENV CGO_ENABLED=1 ENV GOOS=linux -ENV GOARCH=arm64 +#ENV GOARCH=$GOARCH + +#RUN echo "AAA $GOARCH" # Move to working directory /build WORKDIR /build @@ -18,7 +25,7 @@ WORKDIR /build # Copy and download dependency using go mod COPY go.mod . COPY go.sum . -RUN go mod download +RUN GOARCH=$(echo "$TARGETPLATFORM" | cut -d'/' -f2) go mod download # Copy the code into the container COPY . . @@ -26,7 +33,7 @@ COPY . . # Copy frontend dist files into the container COPY --from=frontend /build/frontend/dist ./frontend/dist -RUN go build -o main . +RUN GOARCH=$(echo "$TARGETPLATFORM" | cut -d'/' -f2) go build -o main . RUN wget https://github.com/breez/breez-sdk-go/raw/main/breez_sdk/lib/linux-amd64/libbreez_sdk_bindings.so @@ -35,7 +42,6 @@ FROM debian as final ENV LD_LIBRARY_PATH=/usr/lib/libbreez - # # # Copy the binaries and entrypoint from the builder image. COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ From c32914a6eb02ea77d0621266aaaaece408ce0131 Mon Sep 17 00:00:00 2001 From: Fmar Date: Thu, 25 Jan 2024 15:13:06 +0100 Subject: [PATCH 20/25] update to github.com/breez/breez-sdk-go v0.2.14 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index af83c2f8..4bd43956 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.21 toolchain go1.21.1 require ( - github.com/breez/breez-sdk-go v0.2.10 + github.com/breez/breez-sdk-go v0.2.14 github.com/davrux/echo-logrus/v4 v4.0.3 github.com/go-gormigrate/gormigrate/v2 v2.1.1 github.com/gorilla/sessions v1.2.1 From 2d0cf8a48197729331c1b5af9fe6cbdde07204bf Mon Sep 17 00:00:00 2001 From: Fmar Date: Thu, 25 Jan 2024 15:28:32 +0100 Subject: [PATCH 21/25] update to github.com/breez/breez-sdk-go v0.2.14 --- go.sum | 2 ++ 1 file changed, 2 insertions(+) diff --git a/go.sum b/go.sum index d7501825..e7b6565d 100644 --- a/go.sum +++ b/go.sum @@ -73,6 +73,8 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/breez/breez-sdk-go v0.2.10 h1:D9mEtVTNWhwoV7L6esxpyjoFyFkFoJ2w2l7iZdfE7NA= github.com/breez/breez-sdk-go v0.2.10/go.mod h1:EalYMEeQVwRzr6UXnF4QpLlpuWNwQQN9xwtDKNIutBo= +github.com/breez/breez-sdk-go v0.2.14 h1:d9AAbSWXQpE/nMZyVBvmg808zSe5jRl9PkyRLiMD298= +github.com/breez/breez-sdk-go v0.2.14/go.mod h1:EalYMEeQVwRzr6UXnF4QpLlpuWNwQQN9xwtDKNIutBo= github.com/btcsuite/btcd v0.0.0-20190824003749-130ea5bddde3/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M= From 0d8900aacd1c04a9221a8cea8d0c3853879b0fad Mon Sep 17 00:00:00 2001 From: Fmar Date: Thu, 25 Jan 2024 15:44:58 +0100 Subject: [PATCH 22/25] add linux/386 --- .github/workflows/build-docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index d00708c2..07397791 100644 --- a/.github/workflows/build-docker.yaml +++ b/.github/workflows/build-docker.yaml @@ -27,6 +27,6 @@ jobs: image: ${{ env.IMAGENAME }} registry: ${{ env.REGISTRY }} multiPlatform: true - platform: linux/amd64,linux/arm64 + platform: linux/amd64,linux/arm64,linux/386 username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} From acf2fb6aa08d9280f84f0fc611ac64c74eb363b5 Mon Sep 17 00:00:00 2001 From: Fmar Date: Thu, 25 Jan 2024 15:45:07 +0100 Subject: [PATCH 23/25] wails doctor --- .github/workflows/wails.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/wails.yaml b/.github/workflows/wails.yaml index 552b9e4b..16d9419d 100644 --- a/.github/workflows/wails.yaml +++ b/.github/workflows/wails.yaml @@ -34,6 +34,10 @@ jobs: - name: Install Linux Wails deps run: sudo apt-get update && sudo apt-get install libgtk-3-0 libwebkit2gtk-4.0-dev gcc-aarch64-linux-gnu shell: bash + - name: Wails Doctor + working-directory: . + run: wails doctor + shell: bash # Building step - name: Build App working-directory: . From 132555388840a2de2e826e114d818df7334400f0 Mon Sep 17 00:00:00 2001 From: Fmar Date: Thu, 25 Jan 2024 15:52:17 +0100 Subject: [PATCH 24/25] wails doctor --- .github/workflows/build-docker.yaml | 2 +- .github/workflows/wails.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index 07397791..d00708c2 100644 --- a/.github/workflows/build-docker.yaml +++ b/.github/workflows/build-docker.yaml @@ -27,6 +27,6 @@ jobs: image: ${{ env.IMAGENAME }} registry: ${{ env.REGISTRY }} multiPlatform: true - platform: linux/amd64,linux/arm64,linux/386 + platform: linux/amd64,linux/arm64 username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/wails.yaml b/.github/workflows/wails.yaml index 16d9419d..bf05da4e 100644 --- a/.github/workflows/wails.yaml +++ b/.github/workflows/wails.yaml @@ -32,7 +32,7 @@ jobs: run: go install github.com/wailsapp/wails/v2/cmd/wails@latest shell: bash - name: Install Linux Wails deps - run: sudo apt-get update && sudo apt-get install libgtk-3-0 libwebkit2gtk-4.0-dev gcc-aarch64-linux-gnu + run: sudo apt-get update && sudo apt-get install libgtk-3-0 libwebkit2gtk-4.0-dev gcc-aarch64-linux-gnu libgtk-3-dev nsis shell: bash - name: Wails Doctor working-directory: . From 0fc655755320de2cc26668c8e9f6f2af26f4c26e Mon Sep 17 00:00:00 2001 From: Fmar Date: Thu, 1 Feb 2024 11:59:10 +0100 Subject: [PATCH 25/25] trying static --- Dockerfile | 8 +++++--- go.mod | 2 ++ go.sum | 4 ---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index f808444b..82584c89 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,7 @@ RUN apt-get update && \ ENV CGO_ENABLED=1 ENV GOOS=linux +ENV CGO_LDFLAGS=-static #ENV GOARCH=$GOARCH #RUN echo "AAA $GOARCH" @@ -25,6 +26,7 @@ WORKDIR /build # Copy and download dependency using go mod COPY go.mod . COPY go.sum . +COPY breez-sdk-go . RUN GOARCH=$(echo "$TARGETPLATFORM" | cut -d'/' -f2) go mod download # Copy the code into the container @@ -35,17 +37,17 @@ COPY --from=frontend /build/frontend/dist ./frontend/dist RUN GOARCH=$(echo "$TARGETPLATFORM" | cut -d'/' -f2) go build -o main . -RUN wget https://github.com/breez/breez-sdk-go/raw/main/breez_sdk/lib/linux-amd64/libbreez_sdk_bindings.so +#RUN wget https://github.com/breez/breez-sdk-go/raw/main/breez_sdk/lib/linux-amd64/libbreez_sdk_bindings.so # Start a new, final image to reduce size. FROM debian as final -ENV LD_LIBRARY_PATH=/usr/lib/libbreez +#ENV LD_LIBRARY_PATH=/usr/lib/libbreez # # # Copy the binaries and entrypoint from the builder image. COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=builder /build/libbreez_sdk_bindings.so /usr/lib/libbreez/ +#COPY --from=builder /build/libbreez_sdk_bindings.so /usr/lib/libbreez/ COPY --from=builder /build/main /bin/ ENTRYPOINT [ "/bin/main" ] diff --git a/go.mod b/go.mod index 4bd43956..198dfe48 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,8 @@ go 1.21 toolchain go1.21.1 +replace github.com/breez/breez-sdk-go => ./breez-sdk-go + require ( github.com/breez/breez-sdk-go v0.2.14 github.com/davrux/echo-logrus/v4 v4.0.3 diff --git a/go.sum b/go.sum index e7b6565d..3377ccd8 100644 --- a/go.sum +++ b/go.sum @@ -71,10 +71,6 @@ github.com/bep/debounce v1.2.1 h1:v67fRdBA9UQu2NhLFXrSg0Brw7CexQekrBwDMM8bzeY= github.com/bep/debounce v1.2.1/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/breez/breez-sdk-go v0.2.10 h1:D9mEtVTNWhwoV7L6esxpyjoFyFkFoJ2w2l7iZdfE7NA= -github.com/breez/breez-sdk-go v0.2.10/go.mod h1:EalYMEeQVwRzr6UXnF4QpLlpuWNwQQN9xwtDKNIutBo= -github.com/breez/breez-sdk-go v0.2.14 h1:d9AAbSWXQpE/nMZyVBvmg808zSe5jRl9PkyRLiMD298= -github.com/breez/breez-sdk-go v0.2.14/go.mod h1:EalYMEeQVwRzr6UXnF4QpLlpuWNwQQN9xwtDKNIutBo= github.com/btcsuite/btcd v0.0.0-20190824003749-130ea5bddde3/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=