From ebd7da05e1a21daaca632270ef9cf4eebfb3c9d1 Mon Sep 17 00:00:00 2001 From: smk762 <35845239+smk762@users.noreply.github.com> Date: Wed, 8 Nov 2023 15:35:50 +0800 Subject: [PATCH 01/14] use ubuntu 20.04 --- .github/workflows/komodod_cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/komodod_cd.yml b/.github/workflows/komodod_cd.yml index f56b0c4b587..b9a40eb25f9 100644 --- a/.github/workflows/komodod_cd.yml +++ b/.github/workflows/komodod_cd.yml @@ -135,7 +135,7 @@ jobs: publish-release: name: Publishing CD releases - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 needs: [linux-build, osx-build, windows-build] steps: - name: Download komodo-linux.zip From 8da1363f45bc3648982425de779213bf9a3b7595 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 8 Nov 2023 15:58:04 +0800 Subject: [PATCH 02/14] update deps --- .github/workflows/komodod_cd.yml | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/.github/workflows/komodod_cd.yml b/.github/workflows/komodod_cd.yml index b9a40eb25f9..ba01ee41e6e 100644 --- a/.github/workflows/komodod_cd.yml +++ b/.github/workflows/komodod_cd.yml @@ -39,13 +39,24 @@ jobs: sudo apt-get update sudo ACCEPT_EULA=Y apt-get upgrade -y sudo apt-get install -q \ - curl \ - python3 \ - python3-dev \ - python3-setuptools \ - python3-pip \ - libcurl4-openssl-dev \ - libssl-dev -y + build-essential \ + pkg-config \ + libc6-dev \ + m4 \ + g++-multilib \ + autoconf \ + libtool \ + ncurses-dev \ + unzip \ + git \ + python3-zmq \ + zlib1g-dev \ + wget \ + libcurl4-gnutls-dev \ + bsdmainutils \ + automake \ + curl \ + libsodium-dev -y - name: Build (Linux) if: runner.os == 'Linux' run: | From 188183ae045b9c8139d43f1a8725b0662d024943 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 8 Nov 2023 16:42:33 +0800 Subject: [PATCH 03/14] update dockerfiles --- Dockerfile | 2 +- Dockerfile.release | 35 ++++++++++++++++++++++++++++++----- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7a4308f7d41..32f3eab2c47 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM ubuntu:20.04 MAINTAINER Mihail Fedorov RUN apt-get -y update && \ diff --git a/Dockerfile.release b/Dockerfile.release index a10340fe2e9..7d3c5a10f42 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -1,8 +1,33 @@ FROM ubuntu:20.04 -RUN \ - apt-get update &&\ - apt-get install -y libgomp1 -CMD mkdir /komodo +RUN apt-get update -y && \ + ACCEPT_EULA=Y apt-get upgrade -y \ + apt-get install -q \ + build-essential \ + pkg-config \ + libc6-dev \ + m4 \ + g++-multilib \ + autoconf \ + libtool \ + ncurses-dev \ + unzip \ + git \ + python3-zmq \ + zlib1g-dev \ + wget \ + libcurl4-gnutls-dev \ + bsdmainutils \ + automake \ + curl \ + libsodium-dev -y && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + +RUN mkdir /komodo WORKDIR /komodo COPY src/komodod src/komodo-cli ./ -CMD ./komodod \ No newline at end of file + + +RUN ln -sf /komodo/komodod /usr/bin/komodod && \ + ln -sf /komodo/komodo-cli /usr/bin/komodo-cli + +CMD komodod \ No newline at end of file From 41dc3410d2fd25258a674b62e1d5a5d09e8806ae Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 8 Nov 2023 16:42:47 +0800 Subject: [PATCH 04/14] only build linux --- .github/workflows/komodod_cd.yml | 96 +------------------------------- 1 file changed, 3 insertions(+), 93 deletions(-) diff --git a/.github/workflows/komodod_cd.yml b/.github/workflows/komodod_cd.yml index ba01ee41e6e..d9566c520fe 100644 --- a/.github/workflows/komodod_cd.yml +++ b/.github/workflows/komodod_cd.yml @@ -80,87 +80,17 @@ jobs: - name: Push to docker hub uses: actions-hub/docker@master with: - args: push komodoofficial/komodo:cd_release_${{ steps.shortify_commit.outputs.sha_short }}_${{ steps.extract_branch.outputs.branch }} - - osx-build: - name: OSX Build - runs-on: macos-latest - steps: - - uses: actions/checkout@v2 - - name: Install deps (macOS) - run: | - brew update - brew upgrade || true - brew tap discoteq/discoteq; brew install flock - brew install autoconf autogen automake - brew install gcc@8 - brew install binutils - brew install protobuf - brew install coreutils - brew install wget - brew install python3 - brew install gmp - - name: Build (macOS) - run: | - ./zcutil/build-mac.sh -j4 - zip --junk-paths komodo-osx src/komodod src/komodo-cli - - name: Upload komodo-osx.zip as artifact - uses: actions/upload-artifact@v1 - with: - name: komodo-osx - path: ./komodo-osx.zip - - windows-build: - name: Windows Build (mingw) - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Install deps (Windows) - env: - DEBIAN_FRONTEND: noninteractive - run: | - sudo apt-get update # prevents repo404 errors on apt-remove below - sudo apt-get remove php* msodbcsql17 mysql* powershell containernetworking-* containers* dotn* - sudo apt-get update - sudo apt-get upgrade -y - sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool \ - libncurses-dev unzip wget bsdmainutils automake libboost-all-dev libssl-dev \ - libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev ntp ntpdate nano \ - software-properties-common curl libevent-dev libcurl4-gnutls-dev cmake clang \ - libsodium-dev ncurses-dev git python3 python3-zmq zlib1g-dev mingw-w64 -y - curl https://sh.rustup.rs -sSf | sh -s -- -y - source $HOME/.cargo/env - rustup target add x86_64-pc-windows-gnu - sudo update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix - sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix - - name: Build (Windows) - run: | - ./zcutil/build-win.sh -j$(nproc) - zip --junk-paths komodo-win src/komodod.exe src/komodo-cli.exe - - name: Upload komodo-win.zip as artifact - uses: actions/upload-artifact@v1 - with: - name: komodo-win - path: ./komodo-win.zip + args: push ${{ secrets.DOCKER_ORG }}/komodo:cd_release_${{ steps.shortify_commit.outputs.sha_short }}_${{ steps.extract_branch.outputs.branch }} publish-release: name: Publishing CD releases runs-on: ubuntu-20.04 - needs: [linux-build, osx-build, windows-build] + needs: [linux-build] steps: - name: Download komodo-linux.zip uses: actions/download-artifact@v1 with: name: komodo-linux - - name: Download komodo-osx.zip - uses: actions/download-artifact@v1 - with: - name: komodo-osx - - name: Download komodo-win.zip - uses: actions/download-artifact@v1 - with: - name: komodo-win - name: Extract branch name shell: bash @@ -191,24 +121,4 @@ jobs: upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps asset_path: komodo-linux/komodo-linux.zip asset_name: komodo_${{ steps.shortify_commit.outputs.sha_short }}_${{ steps.extract_branch.outputs.branch }}_linux.zip - asset_content_type: application/zip - - name: Upload OSX Release Asset - id: upload-osx-release-asset - uses: actions/upload-release-asset@latest - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: komodo-osx/komodo-osx.zip - asset_name: komodo_${{ steps.shortify_commit.outputs.sha_short }}_${{ steps.extract_branch.outputs.branch }}_osx.zip - asset_content_type: application/zip - - name: Upload Windows Release Asset - id: upload-windows-release-asset - uses: actions/upload-release-asset@latest - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: komodo-win/komodo-win.zip - asset_name: komodo_${{ steps.shortify_commit.outputs.sha_short }}_${{ steps.extract_branch.outputs.branch }}_win.zip - asset_content_type: application/zip + asset_content_type: application/zip \ No newline at end of file From 9f81f710fa60208dbf65478c3814d5e4336941e7 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 8 Nov 2023 17:25:07 +0800 Subject: [PATCH 05/14] and then --- Dockerfile.release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.release b/Dockerfile.release index 7d3c5a10f42..49c7ca7a15d 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -1,6 +1,6 @@ FROM ubuntu:20.04 RUN apt-get update -y && \ - ACCEPT_EULA=Y apt-get upgrade -y \ + ACCEPT_EULA=Y apt-get upgrade -y && \ apt-get install -q \ build-essential \ pkg-config \ From 9fcbedaafeda068dd2ae4309e41a893a0af2c34f Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 8 Nov 2023 17:34:37 +0800 Subject: [PATCH 06/14] noninteractve apt --- .github/workflows/komodod_cd.yml | 4 ++-- Dockerfile.release | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/komodod_cd.yml b/.github/workflows/komodod_cd.yml index d9566c520fe..a928fa9dd3f 100644 --- a/.github/workflows/komodod_cd.yml +++ b/.github/workflows/komodod_cd.yml @@ -38,7 +38,7 @@ jobs: sudo apt-get remove php* msodbcsql17 mysql* powershell dotn* sudo apt-get update sudo ACCEPT_EULA=Y apt-get upgrade -y - sudo apt-get install -q \ + sudo DEBIAN_FRONTEND=noninteractive apt-get install -y \ build-essential \ pkg-config \ libc6-dev \ @@ -56,7 +56,7 @@ jobs: bsdmainutils \ automake \ curl \ - libsodium-dev -y + libsodium-dev - name: Build (Linux) if: runner.os == 'Linux' run: | diff --git a/Dockerfile.release b/Dockerfile.release index 49c7ca7a15d..9b9a72a14e8 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -1,7 +1,7 @@ FROM ubuntu:20.04 RUN apt-get update -y && \ ACCEPT_EULA=Y apt-get upgrade -y && \ - apt-get install -q \ + DEBIAN_FRONTEND=noninteractive apt-get install -y \ build-essential \ pkg-config \ libc6-dev \ From cc8255a0ca599f931a0256ad62a649cbe01a6369 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 8 Nov 2023 18:16:25 +0800 Subject: [PATCH 07/14] update dockerfiles --- .github/workflows/komodod_cd.yml | 2 +- Dockerfile.release | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/komodod_cd.yml b/.github/workflows/komodod_cd.yml index a928fa9dd3f..1bbcac2d3f5 100644 --- a/.github/workflows/komodod_cd.yml +++ b/.github/workflows/komodod_cd.yml @@ -75,7 +75,7 @@ jobs: DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} - name: Build container - run: docker build -f Dockerfile.release -t komodoofficial/komodo:cd_release_${{ steps.shortify_commit.outputs.sha_short }}_${{ steps.extract_branch.outputs.branch }} . + run: docker build -f Dockerfile.release -t ${{ secrets.DOCKER_ORG }}/komodo:cd_release_${{ steps.shortify_commit.outputs.sha_short }}_${{ steps.extract_branch.outputs.branch }} . - name: Push to docker hub uses: actions-hub/docker@master diff --git a/Dockerfile.release b/Dockerfile.release index 9b9a72a14e8..c4a3779f023 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -24,8 +24,9 @@ RUN apt-get update -y && \ RUN mkdir /komodo WORKDIR /komodo -COPY src/komodod src/komodo-cli ./ - +COPY src/komodod src/komodo-cli zcutil/fetch-params.sh ./ +COPY contrib/debian/examples/komodo.conf /root/.komodo/komodo.conf +RUN ./fetch-params.sh RUN ln -sf /komodo/komodod /usr/bin/komodod && \ ln -sf /komodo/komodo-cli /usr/bin/komodo-cli From 6fb98bd78661540f356ee11950fc0851052439fb Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 8 Nov 2023 18:17:27 +0800 Subject: [PATCH 08/14] no double -y --- Dockerfile.release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.release b/Dockerfile.release index c4a3779f023..5341c68a70f 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -19,7 +19,7 @@ RUN apt-get update -y && \ bsdmainutils \ automake \ curl \ - libsodium-dev -y && \ + libsodium-dev && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN mkdir /komodo From fbb070bde0e9e73118650e7a5736921cf84fc979 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 8 Nov 2023 18:18:51 +0800 Subject: [PATCH 09/14] without zcash-params --- Dockerfile.release | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile.release b/Dockerfile.release index 5341c68a70f..c22477b3b38 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -24,9 +24,7 @@ RUN apt-get update -y && \ RUN mkdir /komodo WORKDIR /komodo -COPY src/komodod src/komodo-cli zcutil/fetch-params.sh ./ -COPY contrib/debian/examples/komodo.conf /root/.komodo/komodo.conf -RUN ./fetch-params.sh +COPY src/komodod src/komodo-cli ./ RUN ln -sf /komodo/komodod /usr/bin/komodod && \ ln -sf /komodo/komodo-cli /usr/bin/komodo-cli From 8761a4f4674dcdbcff6ed43d20fdf8eb90e5a5c9 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 8 Nov 2023 19:13:22 +0800 Subject: [PATCH 10/14] revert to 156dba601 --- .github/workflows/komodod_cd.yml | 125 +++++++++++++++++++++++++------ Dockerfile.release | 28 +------ 2 files changed, 106 insertions(+), 47 deletions(-) diff --git a/.github/workflows/komodod_cd.yml b/.github/workflows/komodod_cd.yml index 1bbcac2d3f5..129398999f6 100644 --- a/.github/workflows/komodod_cd.yml +++ b/.github/workflows/komodod_cd.yml @@ -9,7 +9,7 @@ on: - beta - dev - research - - master + jobs: @@ -38,25 +38,14 @@ jobs: sudo apt-get remove php* msodbcsql17 mysql* powershell dotn* sudo apt-get update sudo ACCEPT_EULA=Y apt-get upgrade -y - sudo DEBIAN_FRONTEND=noninteractive apt-get install -y \ - build-essential \ - pkg-config \ - libc6-dev \ - m4 \ - g++-multilib \ - autoconf \ - libtool \ - ncurses-dev \ - unzip \ - git \ - python3-zmq \ - zlib1g-dev \ - wget \ - libcurl4-gnutls-dev \ - bsdmainutils \ - automake \ - curl \ - libsodium-dev + sudo apt-get install -q \ + curl \ + python3 \ + python3-dev \ + python3-setuptools \ + python3-pip \ + libcurl4-openssl-dev \ + libssl-dev -y - name: Build (Linux) if: runner.os == 'Linux' run: | @@ -82,15 +71,85 @@ jobs: with: args: push ${{ secrets.DOCKER_ORG }}/komodo:cd_release_${{ steps.shortify_commit.outputs.sha_short }}_${{ steps.extract_branch.outputs.branch }} + osx-build: + name: OSX Build + runs-on: macos-latest + steps: + - uses: actions/checkout@v2 + - name: Install deps (macOS) + run: | + brew update + brew upgrade || true + brew tap discoteq/discoteq; brew install flock + brew install autoconf autogen automake + brew install gcc@8 + brew install binutils + brew install protobuf + brew install coreutils + brew install wget + brew install python3 + brew install gmp + - name: Build (macOS) + run: | + ./zcutil/build-mac.sh -j4 + zip --junk-paths komodo-osx src/komodod src/komodo-cli + - name: Upload komodo-osx.zip as artifact + uses: actions/upload-artifact@v1 + with: + name: komodo-osx + path: ./komodo-osx.zip + + windows-build: + name: Windows Build (mingw) + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Install deps (Windows) + env: + DEBIAN_FRONTEND: noninteractive + run: | + sudo apt-get update # prevents repo404 errors on apt-remove below + sudo apt-get remove php* msodbcsql17 mysql* powershell containernetworking-* containers* dotn* + sudo apt-get update + sudo apt-get upgrade -y + sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool \ + libncurses-dev unzip wget bsdmainutils automake libboost-all-dev libssl-dev \ + libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev ntp ntpdate nano \ + software-properties-common curl libevent-dev libcurl4-gnutls-dev cmake clang \ + libsodium-dev ncurses-dev git python3 python3-zmq zlib1g-dev mingw-w64 -y + curl https://sh.rustup.rs -sSf | sh -s -- -y + source $HOME/.cargo/env + rustup target add x86_64-pc-windows-gnu + sudo update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix + sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix + - name: Build (Windows) + run: | + ./zcutil/build-win.sh -j$(nproc) + zip --junk-paths komodo-win src/komodod.exe src/komodo-cli.exe + - name: Upload komodo-win.zip as artifact + uses: actions/upload-artifact@v1 + with: + name: komodo-win + path: ./komodo-win.zip + publish-release: name: Publishing CD releases - runs-on: ubuntu-20.04 - needs: [linux-build] + runs-on: ubuntu-latest + needs: [linux-build, osx-build, windows-build] steps: - name: Download komodo-linux.zip uses: actions/download-artifact@v1 with: name: komodo-linux + - name: Download komodo-osx.zip + uses: actions/download-artifact@v1 + with: + name: komodo-osx + - name: Download komodo-win.zip + uses: actions/download-artifact@v1 + with: + name: komodo-win - name: Extract branch name shell: bash @@ -121,4 +180,24 @@ jobs: upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps asset_path: komodo-linux/komodo-linux.zip asset_name: komodo_${{ steps.shortify_commit.outputs.sha_short }}_${{ steps.extract_branch.outputs.branch }}_linux.zip - asset_content_type: application/zip \ No newline at end of file + asset_content_type: application/zip + - name: Upload OSX Release Asset + id: upload-osx-release-asset + uses: actions/upload-release-asset@latest + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps + asset_path: komodo-osx/komodo-osx.zip + asset_name: komodo_${{ steps.shortify_commit.outputs.sha_short }}_${{ steps.extract_branch.outputs.branch }}_osx.zip + asset_content_type: application/zip + - name: Upload Windows Release Asset + id: upload-windows-release-asset + uses: actions/upload-release-asset@latest + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps + asset_path: komodo-win/komodo-win.zip + asset_name: komodo_${{ steps.shortify_commit.outputs.sha_short }}_${{ steps.extract_branch.outputs.branch }}_win.zip + asset_content_type: application/zip diff --git a/Dockerfile.release b/Dockerfile.release index c22477b3b38..42ed5412dbd 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -1,27 +1,7 @@ FROM ubuntu:20.04 -RUN apt-get update -y && \ - ACCEPT_EULA=Y apt-get upgrade -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - build-essential \ - pkg-config \ - libc6-dev \ - m4 \ - g++-multilib \ - autoconf \ - libtool \ - ncurses-dev \ - unzip \ - git \ - python3-zmq \ - zlib1g-dev \ - wget \ - libcurl4-gnutls-dev \ - bsdmainutils \ - automake \ - curl \ - libsodium-dev && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - +RUN \ + apt-get update &&\ + apt-get install -y libgomp1 RUN mkdir /komodo WORKDIR /komodo COPY src/komodod src/komodo-cli ./ @@ -29,4 +9,4 @@ COPY src/komodod src/komodo-cli ./ RUN ln -sf /komodo/komodod /usr/bin/komodod && \ ln -sf /komodo/komodo-cli /usr/bin/komodo-cli -CMD komodod \ No newline at end of file +CMD ./komodod From 1d70c67cf823ca00d8a0f2292225de1787b80b41 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 8 Nov 2023 19:16:50 +0800 Subject: [PATCH 11/14] test apt deps --- .github/workflows/komodod_cd.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/komodod_cd.yml b/.github/workflows/komodod_cd.yml index 129398999f6..e2756babd91 100644 --- a/.github/workflows/komodod_cd.yml +++ b/.github/workflows/komodod_cd.yml @@ -33,19 +33,18 @@ jobs: uses: actions/checkout@v2 - name: Install deps (Linux) + env: + DEBIAN_FRONTEND: noninteractive run: | sudo apt-get update # prevents repo404 errors on apt-remove below sudo apt-get remove php* msodbcsql17 mysql* powershell dotn* sudo apt-get update sudo ACCEPT_EULA=Y apt-get upgrade -y - sudo apt-get install -q \ - curl \ - python3 \ - python3-dev \ - python3-setuptools \ - python3-pip \ - libcurl4-openssl-dev \ - libssl-dev -y + sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool \ + libncurses-dev unzip wget bsdmainutils automake libboost-all-dev libssl-dev \ + libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev ntp ntpdate nano \ + software-properties-common curl libevent-dev libcurl4-gnutls-dev cmake clang \ + libsodium-dev ncurses-dev git python3 python3-zmq zlib1g-dev -y - name: Build (Linux) if: runner.os == 'Linux' run: | From 21016e34f7b4ae4335e529952ce7c8b5fcde302e Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 8 Nov 2023 19:50:55 +0800 Subject: [PATCH 12/14] use 22.04 for dockerfile --- Dockerfile.release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.release b/Dockerfile.release index 42ed5412dbd..1af1ae42bb6 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 RUN \ apt-get update &&\ apt-get install -y libgomp1 From 33d3ccbf4851d1883b04c15a6dca0565c8d96b93 Mon Sep 17 00:00:00 2001 From: Kadan Stadelmann Date: Wed, 8 Nov 2023 14:44:21 +0100 Subject: [PATCH 13/14] update dockerfile maintainer --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 32f3eab2c47..10ebc2f71a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:20.04 -MAINTAINER Mihail Fedorov +MAINTAINER smk762 RUN apt-get -y update && \ apt-get -y upgrade && \ From acdbfc7996f82d752e81631e4623f45ec60481c5 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 8 Nov 2023 22:02:15 +0800 Subject: [PATCH 14/14] update toolchain in container --- Dockerfile.release | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile.release b/Dockerfile.release index 1af1ae42bb6..7f4d5d6fb55 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -1,6 +1,10 @@ -FROM ubuntu:22.04 +FROM ubuntu:20.04 RUN \ - apt-get update &&\ + add-apt-repository ppa:ubuntu-toolchain-r/test && \ + apt-get update && \ + sudo apt-get upgrade && \ + sudo apt-get dist-upgrade && \ + apt-get update && \ apt-get install -y libgomp1 RUN mkdir /komodo WORKDIR /komodo