From 5be9b37e55c9966a7fbbe504461189097448f4c0 Mon Sep 17 00:00:00 2001 From: Marta Date: Tue, 22 Oct 2024 14:44:03 +0100 Subject: [PATCH] Merge other repos into this. --- .github/workflows/action.yaml | 14 +++++++++++--- Dockerfile => Dockerfile.dnsmasq | 0 Dockerfile.netshoot | 5 +++++ 3 files changed, 16 insertions(+), 3 deletions(-) rename Dockerfile => Dockerfile.dnsmasq (100%) create mode 100644 Dockerfile.netshoot diff --git a/.github/workflows/action.yaml b/.github/workflows/action.yaml index dbd8215..775f9ee 100644 --- a/.github/workflows/action.yaml +++ b/.github/workflows/action.yaml @@ -1,4 +1,4 @@ -name: Build and Push Docker Image +name: Build and Push Docker Images on: push: @@ -9,6 +9,14 @@ on: jobs: build-and-push: runs-on: ubuntu-latest + strategy: + matrix: + dockerfile: + - Dockerfile.dnsmasq + - Dockerfile.netshoot + name: + - dnsmasq + - netshoot steps: - name: Checkout Repository @@ -28,6 +36,6 @@ jobs: uses: docker/build-push-action@v5 with: context: . - file: ./Dockerfile + file: ./${{ matrix.dockerfile }} push: true - tags: ghcr.io/${{ github.repository }}/dnsmasq:latest + tags: ghcr.io/${{ github.repository }}/${{ matrix.name }}:latest diff --git a/Dockerfile b/Dockerfile.dnsmasq similarity index 100% rename from Dockerfile rename to Dockerfile.dnsmasq diff --git a/Dockerfile.netshoot b/Dockerfile.netshoot new file mode 100644 index 0000000..5d1ebe5 --- /dev/null +++ b/Dockerfile.netshoot @@ -0,0 +1,5 @@ +FROM ghcr.io/nicolaka/netshoot:v0.13 + +RUN apk add htop smartmontools nvme-cli iotop lm-sensors hdparm +RUN mkdir -p /root/.config/htop/ +RUN echo "IyBCZXdhcmUhIFRoaXMgZmlsZSBpcyByZXdyaXR0ZW4gYnkgaHRvcCB3aGVuIHNldHRpbmdzIGFyZSBjaGFuZ2VkIGluIHRoZSBpbnRlcmZhY2UuCiMgVGhlIHBhcnNlciBpcyBhbHNvIHZlcnkgcHJpbWl0aXZlLCBhbmQgbm90IGh1bWFuLWZyaWVuZGx5LgpodG9wX3ZlcnNpb249My4zLjAKY29uZmlnX3JlYWRlcl9taW5fdmVyc2lvbj0zCmZpZWxkcz0wIDQ4IDE3IDE4IDM4IDM5IDQwIDIgNDYgNDcgNDkgMQpoaWRlX2tlcm5lbF90aHJlYWRzPTEKaGlkZV91c2VybGFuZF90aHJlYWRzPTAKaGlkZV9ydW5uaW5nX2luX2NvbnRhaW5lcj0wCnNoYWRvd19vdGhlcl91c2Vycz0wCnNob3dfdGhyZWFkX25hbWVzPTAKc2hvd19wcm9ncmFtX3BhdGg9MQpoaWdobGlnaHRfYmFzZV9uYW1lPTAKaGlnaGxpZ2h0X2RlbGV0ZWRfZXhlPTEKc2hhZG93X2Rpc3RyaWJ1dGlvbl9wYXRoX3ByZWZpeD0wCmhpZ2hsaWdodF9tZWdhYnl0ZXM9MQpoaWdobGlnaHRfdGhyZWFkcz0xCmhpZ2hsaWdodF9jaGFuZ2VzPTAKaGlnaGxpZ2h0X2NoYW5nZXNfZGVsYXlfc2Vjcz01CmZpbmRfY29tbV9pbl9jbWRsaW5lPTEKc3RyaXBfZXhlX2Zyb21fY21kbGluZT0xCnNob3dfbWVyZ2VkX2NvbW1hbmQ9MApoZWFkZXJfbWFyZ2luPTEKc2NyZWVuX3RhYnM9MQpkZXRhaWxlZF9jcHVfdGltZT0xCmNwdV9jb3VudF9mcm9tX29uZT0wCnNob3dfY3B1X3VzYWdlPTEKc2hvd19jcHVfZnJlcXVlbmN5PTEKc2hvd19jcHVfdGVtcGVyYXR1cmU9MQpkZWdyZWVfZmFocmVuaGVpdD0wCnVwZGF0ZV9wcm9jZXNzX25hbWVzPTAKYWNjb3VudF9ndWVzdF9pbl9jcHVfbWV0ZXI9MApjb2xvcl9zY2hlbWU9MAplbmFibGVfbW91c2U9MQpkZWxheT0xNQpoaWRlX2Z1bmN0aW9uX2Jhcj0wCmhlYWRlcl9sYXlvdXQ9dHdvXzUwXzUwCmNvbHVtbl9tZXRlcnNfMD1MZWZ0Q1BVczIgTWVtb3J5IFN3YXAKY29sdW1uX21ldGVyX21vZGVzXzA9MSAxIDEKY29sdW1uX21ldGVyc18xPVJpZ2h0Q1BVczIgVGFza3MgTG9hZEF2ZXJhZ2UgVXB0aW1lCmNvbHVtbl9tZXRlcl9tb2Rlc18xPTEgMiAyIDIKdHJlZV92aWV3PTAKc29ydF9rZXk9NDYKdHJlZV9zb3J0X2tleT0wCnNvcnRfZGlyZWN0aW9uPS0xCnRyZWVfc29ydF9kaXJlY3Rpb249MQp0cmVlX3ZpZXdfYWx3YXlzX2J5X3BpZD0wCmFsbF9icmFuY2hlc19jb2xsYXBzZWQ9MApzY3JlZW46TWFpbj1QSUQgVVNFUiBQUklPUklUWSBOSUNFIE1fVklSVCBNX1JFU0lERU5UIE1fU0hBUkUgU1RBVEUgUEVSQ0VOVF9DUFUgUEVSQ0VOVF9NRU0gVElNRSBDb21tYW5kCi5zb3J0X2tleT1QRVJDRU5UX0NQVQoudHJlZV9zb3J0X2tleT1QSUQKLnRyZWVfdmlld19hbHdheXNfYnlfcGlkPTAKLnRyZWVfdmlldz0wCi5zb3J0X2RpcmVjdGlvbj0tMQoudHJlZV9zb3J0X2RpcmVjdGlvbj0xCi5hbGxfYnJhbmNoZXNfY29sbGFwc2VkPTAKc2NyZWVuOkkvTz1QSUQgVVNFUiBJT19QUklPUklUWSBJT19SQVRFIElPX1JFQURfUkFURSBJT19XUklURV9SQVRFIENvbW1hbmQKLnNvcnRfa2V5PUlPX1JBVEUKLnRyZWVfc29ydF9rZXk9UElECi50cmVlX3ZpZXdfYWx3YXlzX2J5X3BpZD0wCi50cmVlX3ZpZXc9MAouc29ydF9kaXJlY3Rpb249LTEKLnRyZWVfc29ydF9kaXJlY3Rpb249MQouYWxsX2JyYW5jaGVzX2NvbGxhcHNlZD0wCg==" | base64 -d >/root/.config/htop/htoprc \ No newline at end of file