From 0ca02a3315305ca52f41e210c049bab21492fc97 Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Mon, 4 Apr 2022 19:21:02 +0000 Subject: [PATCH 01/29] Create Dockerfile Created working dockerfile for containerization of samplicator. --- Dockerfile | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..0de8ad8 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,28 @@ +#https://github.com/sleinen/samplicator +FROM ubuntu:latest +ENV DEBIAN_FRONTEND noninteractive +ENV container docker + +# Specify Samplicator Environment Variables +ENV samplicator_port=1700 +ENV samplicator_arguments='192.168.1.1/1700' + +# Open Samplicator Listening Ports +EXPOSE ${samplicator_port}:${samplicator_port} + +# Update Packages +RUN apt-get update && apt-get -y full-upgrade + +# Install Supporting Software +RUN apt-get install -y git cmake make htop wget systemctl gcc curl gpg automake + +# Install Samplicator +RUN git clone https://github.com/sleinen/samplicator.git +RUN cd ./samplicator && bash ./autogen.sh +RUN cd /samplicator && ./configure +RUN cd /samplicator && make +RUN cd /samplicator && make install + +RUN echo 'samplicate -p ${samplicator_port} ${samplicator_arguments}' > ./samplicator.sh + +CMD ["/bin/bash", "./samplicator.sh"] From 91886fef16f287572609c5c1dea23dd81d72b865 Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Mon, 4 Apr 2022 19:25:09 +0000 Subject: [PATCH 02/29] Create Docker Documentation --- INSTALL.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/INSTALL.md b/INSTALL.md index 737cca4..7365b87 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -44,3 +44,12 @@ Then install and start the new service. On my CentOS 7.2, it looks like this: cp samplicator.service /etc/systemd/system/samplicator.service systemctl daemon-reload systemctl start samplicator.service + +Run Samplicator in Docker +-------------------------- +Example: +```bash +docker run -td sleinen/samplicator \ + -e samplicator_port=1700 \ + -e samplicator_arguments='192.168.1.2/1700 192.168.1.16/1700 192.168.2.23/1700' +``` From 7762b7756358ae81cdef29efea705b1b98ad31e8 Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Mon, 4 Apr 2022 19:29:52 +0000 Subject: [PATCH 03/29] Corrected Docker Instructions --- INSTALL.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 7365b87..bc71306 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -49,7 +49,7 @@ Run Samplicator in Docker -------------------------- Example: ```bash -docker run -td sleinen/samplicator \ - -e samplicator_port=1700 \ - -e samplicator_arguments='192.168.1.2/1700 192.168.1.16/1700 192.168.2.23/1700' +docker run -e samplicator_port=1700 \ + -e samplicator_arguments='192.168.1.2/1700 192.168.1.16/1700 192.168.2.23/1700' \ + --name samplicator -td sleinen/samplicator ``` From 5f1081badd2376f0db56fad02ff849aa43804065 Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Tue, 5 Apr 2022 00:22:15 +0000 Subject: [PATCH 04/29] Create docker-image.yml --- .github/workflows/docker-image.yml | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 0000000..6ea2dd7 --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,31 @@ +name: Docker Image CI + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Build the Docker image + run: docker build . --file Dockerfile --tag simeononsecurity/helium_diy_middleman:latest + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - + name: Build and push + uses: docker/build-push-action@v2 + with: + context: . + push: true + tags: simeononsecurity/helium_diy_middleman:latest From 254ec615cc5b67609a0063c1aa4852e4b5334281 Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Tue, 5 Apr 2022 00:22:33 +0000 Subject: [PATCH 05/29] Update docker-image.yml --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 6ea2dd7..2a8b8ee 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -28,4 +28,4 @@ jobs: with: context: . push: true - tags: simeononsecurity/helium_diy_middleman:latest + tags: simeononsecurity/samplicator:latest From 670bace74166426329a9f17d9cc02e8baed52923 Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Tue, 5 Apr 2022 00:22:50 +0000 Subject: [PATCH 06/29] Update docker-image.yml --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 2a8b8ee..8bd0697 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Build the Docker image - run: docker build . --file Dockerfile --tag simeononsecurity/helium_diy_middleman:latest + run: docker build . --file Dockerfile --tag simeononsecurity/samplicator:latest - name: Login to DockerHub uses: docker/login-action@v1 From 7dee1ddd1d9d5eb42ccc1e413f79424e09a15a60 Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Tue, 5 Apr 2022 17:38:33 +0000 Subject: [PATCH 07/29] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0de8ad8..551651f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,6 +23,6 @@ RUN cd /samplicator && ./configure RUN cd /samplicator && make RUN cd /samplicator && make install -RUN echo 'samplicate -p ${samplicator_port} ${samplicator_arguments}' > ./samplicator.sh - +RUN cd /samplicator/ && chmod +x ./dockersetup.sh +RUN cd /samplicator/ && cat ./dockersetup.sh CMD ["/bin/bash", "./samplicator.sh"] From 0cca37bf9c53caa77e93fdafb976959d2ef941d4 Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Tue, 5 Apr 2022 17:38:46 +0000 Subject: [PATCH 08/29] Create dockersetup.sh --- dockersetup.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 dockersetup.sh diff --git a/dockersetup.sh b/dockersetup.sh new file mode 100644 index 0000000..4665bfe --- /dev/null +++ b/dockersetup.sh @@ -0,0 +1 @@ +samplicate -p ${samplicator_port} ${samplicator_arguments} From ad991d3f4dc4eb5c23318822989abcbc96502b1d Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Tue, 5 Apr 2022 17:40:48 +0000 Subject: [PATCH 09/29] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 551651f..7b4140a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,4 +25,4 @@ RUN cd /samplicator && make install RUN cd /samplicator/ && chmod +x ./dockersetup.sh RUN cd /samplicator/ && cat ./dockersetup.sh -CMD ["/bin/bash", "./samplicator.sh"] +CMD ["/bin/bash", "/samplicator/dockersetup.sh"] From 84a576d80892309ab93edee8473500560fef375d Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Tue, 5 Apr 2022 17:44:46 +0000 Subject: [PATCH 10/29] Update Docker Run Instructions --- INSTALL.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/INSTALL.md b/INSTALL.md index bc71306..cdf3004 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -50,6 +50,8 @@ Run Samplicator in Docker Example: ```bash docker run -e samplicator_port=1700 \ + --net='bridge' \ + -p '1700:1700' \ -e samplicator_arguments='192.168.1.2/1700 192.168.1.16/1700 192.168.2.23/1700' \ --name samplicator -td sleinen/samplicator ``` From 88d0fe1e5f32789345767cb46fc57d831099892c Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Tue, 5 Apr 2022 17:45:51 +0000 Subject: [PATCH 11/29] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7b4140a..ba4f301 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get update && apt-get -y full-upgrade RUN apt-get install -y git cmake make htop wget systemctl gcc curl gpg automake # Install Samplicator -RUN git clone https://github.com/sleinen/samplicator.git +RUN git clone https://github.com/simeononsecurity/samplicator.git RUN cd ./samplicator && bash ./autogen.sh RUN cd /samplicator && ./configure RUN cd /samplicator && make From aa5c63557609c473121334a6d00d0743694f02ca Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Tue, 5 Apr 2022 20:44:44 +0000 Subject: [PATCH 12/29] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ba4f301..6d7d570 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV samplicator_port=1700 ENV samplicator_arguments='192.168.1.1/1700' # Open Samplicator Listening Ports -EXPOSE ${samplicator_port}:${samplicator_port} +EXPOSE ${samplicator_port}:${samplicator_port}/udp # Update Packages RUN apt-get update && apt-get -y full-upgrade From fea397a4a4b926e35312c87732dc8ddcf63064cc Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Tue, 5 Apr 2022 20:47:11 +0000 Subject: [PATCH 13/29] Add udp to docker --- INSTALL.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index cdf3004..6413a3b 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -51,7 +51,7 @@ Example: ```bash docker run -e samplicator_port=1700 \ --net='bridge' \ - -p '1700:1700' \ + -p '1700:1700'/udp \ -e samplicator_arguments='192.168.1.2/1700 192.168.1.16/1700 192.168.2.23/1700' \ --name samplicator -td sleinen/samplicator ``` From 47dbcf4a0c597f7d25766a82450ff06a0f61cb4d Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Fri, 8 Apr 2022 02:22:50 +0000 Subject: [PATCH 14/29] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6d7d570..784d24f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ EXPOSE ${samplicator_port}:${samplicator_port}/udp RUN apt-get update && apt-get -y full-upgrade # Install Supporting Software -RUN apt-get install -y git cmake make htop wget systemctl gcc curl gpg automake +RUN apt-get install -y git cmake make htop wget systemctl gcc curl gpg automake autogen # Install Samplicator RUN git clone https://github.com/simeononsecurity/samplicator.git From 9c39dcb0132e0a800c20e0787b73af15f1c8ff93 Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Fri, 8 Apr 2022 02:26:02 +0000 Subject: [PATCH 15/29] Update samplicator.service --- samplicator.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samplicator.service b/samplicator.service index db3b2ca..d7a4f31 100644 --- a/samplicator.service +++ b/samplicator.service @@ -12,7 +12,7 @@ After=network.target [Service] Type=forking -ExecStart=/opt/samplicator/bin/samplicate -S -c /opt/samplicator/etc/samplicator.conf -p 162 -d 0 -f +ExecStart=/usr/local/bin/samplicator -S -c /opt/samplicator/etc/samplicator.conf -p 162 -d 0 -f [Install] WantedBy=multi-user.target From 5ff93a2a0aee5640198d21cbe97d9a5f367e3046 Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Fri, 8 Apr 2022 02:26:42 +0000 Subject: [PATCH 16/29] Update samplicator.service --- samplicator.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samplicator.service b/samplicator.service index d7a4f31..c2395a5 100644 --- a/samplicator.service +++ b/samplicator.service @@ -12,7 +12,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/local/bin/samplicator -S -c /opt/samplicator/etc/samplicator.conf -p 162 -d 0 -f +ExecStart=/usr/local/bin/samplicate -S -c /opt/samplicator/etc/samplicator.conf -p 162 -d 0 -f [Install] WantedBy=multi-user.target From 842d31d670f1374235c0f1b5c0df59ce2907a2dd Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Fri, 8 Apr 2022 02:29:54 +0000 Subject: [PATCH 17/29] Update samplicator.service --- samplicator.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samplicator.service b/samplicator.service index c2395a5..129e673 100644 --- a/samplicator.service +++ b/samplicator.service @@ -12,7 +12,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/local/bin/samplicate -S -c /opt/samplicator/etc/samplicator.conf -p 162 -d 0 -f +ExecStart=/usr/local/bin/samplicate -p ${samplicator_port} ${samplicator_arguments} [Install] WantedBy=multi-user.target From 6e37e42ed38305062de7bc10aa11e84e090a4274 Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Fri, 8 Apr 2022 02:33:43 +0000 Subject: [PATCH 18/29] Update Dockerfile --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 784d24f..71e8984 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ ENV DEBIAN_FRONTEND noninteractive ENV container docker # Specify Samplicator Environment Variables -ENV samplicator_port=1700 -ENV samplicator_arguments='192.168.1.1/1700' +#ENV samplicator_port=1700 +#ENV samplicator_arguments='192.168.1.1/1700' # Open Samplicator Listening Ports EXPOSE ${samplicator_port}:${samplicator_port}/udp @@ -23,6 +23,7 @@ RUN cd /samplicator && ./configure RUN cd /samplicator && make RUN cd /samplicator && make install -RUN cd /samplicator/ && chmod +x ./dockersetup.sh -RUN cd /samplicator/ && cat ./dockersetup.sh -CMD ["/bin/bash", "/samplicator/dockersetup.sh"] +#RUN cd /samplicator/ && chmod +x ./dockersetup.sh +#RUN cd /samplicator/ && cat ./dockersetup.sh +#CMD ["/bin/bash", "/samplicator/dockersetup.sh"] +ENTRYPOINT ["samplicate"] From 1195f4d2de2e3f7ff52f8bf348f48fdc7e1d48fc Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Fri, 8 Apr 2022 02:34:15 +0000 Subject: [PATCH 19/29] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 71e8984..236f7b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV container docker #ENV samplicator_arguments='192.168.1.1/1700' # Open Samplicator Listening Ports -EXPOSE ${samplicator_port}:${samplicator_port}/udp +#EXPOSE ${samplicator_port}:${samplicator_port}/udp # Update Packages RUN apt-get update && apt-get -y full-upgrade From 7860d3bc4c9830e400e1f25ef5aead39eb15928d Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Fri, 8 Apr 2022 02:41:04 +0000 Subject: [PATCH 20/29] Update INSTALL.md --- INSTALL.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 6413a3b..52ccb42 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -49,9 +49,9 @@ Run Samplicator in Docker -------------------------- Example: ```bash -docker run -e samplicator_port=1700 \ +docker run \ --net='bridge' \ -p '1700:1700'/udp \ - -e samplicator_arguments='192.168.1.2/1700 192.168.1.16/1700 192.168.2.23/1700' \ - --name samplicator -td sleinen/samplicator + -e samplicator_arguments='' \ + --name samplicator -td sleinen/samplicator -S 192.168.1.10 -x 10 -p 1700 192.168.1.11/1700 192.168.1.12/1700 ``` From fdc7236b401d48401f38028c294980c38380250f Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Sat, 9 Apr 2022 08:26:01 +0000 Subject: [PATCH 21/29] Update INSTALL.md --- INSTALL.md | 1 - 1 file changed, 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index 52ccb42..52bda12 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -52,6 +52,5 @@ Example: docker run \ --net='bridge' \ -p '1700:1700'/udp \ - -e samplicator_arguments='' \ --name samplicator -td sleinen/samplicator -S 192.168.1.10 -x 10 -p 1700 192.168.1.11/1700 192.168.1.12/1700 ``` From 0fdd37a9c64306653eadb2a70073bcf24ce99cd7 Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Sat, 9 Apr 2022 21:41:52 +0000 Subject: [PATCH 22/29] Delete dockersetup.sh --- dockersetup.sh | 1 - 1 file changed, 1 deletion(-) delete mode 100644 dockersetup.sh diff --git a/dockersetup.sh b/dockersetup.sh deleted file mode 100644 index 4665bfe..0000000 --- a/dockersetup.sh +++ /dev/null @@ -1 +0,0 @@ -samplicate -p ${samplicator_port} ${samplicator_arguments} From aafb096d367ee30e1589da2f74ec40bb81857c4a Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Wed, 13 Apr 2022 22:02:28 +0000 Subject: [PATCH 23/29] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 236f7b6..356e187 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ENV container docker #EXPOSE ${samplicator_port}:${samplicator_port}/udp # Update Packages -RUN apt-get update && apt-get -y full-upgrade +RUN apt-get update && apt-get install -y apt-utils && apt-get -y -f -m --show-progress full-upgrade # Install Supporting Software RUN apt-get install -y git cmake make htop wget systemctl gcc curl gpg automake autogen From fc266e82bdf6f6f0c2e28619e41f33d533d63681 Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Wed, 13 Apr 2022 22:03:21 +0000 Subject: [PATCH 24/29] Docker arm/arm64 support --- .github/workflows/docker-image.yml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 8bd0697..1348af9 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -6,22 +6,38 @@ on: pull_request: branches: [ master ] + jobs: build: runs-on: ubuntu-latest + env: + DOCKER_PLATFORMS: linux/amd64,linux/armhf,linux/arm64 + steps: - - uses: actions/checkout@v3 - - name: Build the Docker image - run: docker build . --file Dockerfile --tag simeononsecurity/samplicator:latest + - + name: Checkout + uses: actions/checkout@v3 + - + name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - + name: setup docker buildx + uses: docker/setup-buildx-action@v1 + id: buildx + with: + install: true - name: Login to DockerHub uses: docker/login-action@v1 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + - + name: Build the Docker image + run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes && docker buildx build --platform linux/amd64,linux/armhf,linux/arm64 -t simeononsecurity/samplicator:latest --progress=plain --push . - name: Build and push uses: docker/build-push-action@v2 From c141e235de5df16eb3b1e0ce0cf777fa33e9dd09 Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Fri, 29 Apr 2022 22:05:36 +0000 Subject: [PATCH 25/29] Update docker-image.yml --- .github/workflows/docker-image.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 1348af9..0e488ec 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -3,8 +3,6 @@ name: Docker Image CI on: push: branches: [ master ] - pull_request: - branches: [ master ] jobs: From a5e767c09a399bd38ff4dd6020b8438da2f951d6 Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Mon, 27 Jun 2022 03:36:10 +0000 Subject: [PATCH 26/29] Create auto-update-from-base-docker.yml --- .../auto-update-from-base-docker.yml | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/auto-update-from-base-docker.yml diff --git a/.github/workflows/auto-update-from-base-docker.yml b/.github/workflows/auto-update-from-base-docker.yml new file mode 100644 index 0000000..84e2448 --- /dev/null +++ b/.github/workflows/auto-update-from-base-docker.yml @@ -0,0 +1,58 @@ +name: Docker Base Auto Update CI + +on: + schedule: + - cron: "23 13 3 * *" + + +jobs: + + build: + + runs-on: ubuntu-latest + env: + DOCKER_PLATFORMS: linux/amd64,linux/armhf,linux/arm64 + + + steps: + - + name: Docker Image Update Checker + id: baseupdatecheck + uses: lucacome/docker-image-update-checker@v1 + with: + base-image: library/ubuntu:latest + image: simeononsecurity/samplicator:latest + - + name: Checkout + uses: actions/checkout@v3 + if: steps.check.outputs.needs-updating == 'true' + - + name: Set up QEMU + uses: docker/setup-qemu-action@v1 + if: steps.check.outputs.needs-updating == 'true' + - + name: setup docker buildx + uses: docker/setup-buildx-action@v1 + id: buildx + with: + install: true + if: steps.check.outputs.needs-updating == 'true' + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + if: steps.check.outputs.needs-updating == 'true' + - + name: Build the Docker image + run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes && docker buildx build --platform linux/amd64,linux/armhf,linux/arm64 -t simeononsecurity/samplicator:latest --progress=plain --push . + if: steps.check.outputs.needs-updating == 'true' + - + name: Build and push + uses: docker/build-push-action@v2 + with: + context: . + push: true + tags: simeononsecurity/samplicator:latest + if: steps.check.outputs.needs-updating == 'true' From ea8bd47728f9370ffffeee6fadd3421287afcb84 Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Wed, 6 Jul 2022 12:52:48 -0500 Subject: [PATCH 27/29] Implement Labels --- Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index 356e187..297c2c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,10 @@ #https://github.com/sleinen/samplicator FROM ubuntu:latest + +LABEL org.opencontainers.image.source="https://github.com/simeononsecurity/samplicator" +LABEL org.opencontainers.image.description="Send copies of (UDP) datagrams to multiple receivers, with optional sampling and spoofing" +LABEL org.opencontainers.image.authors="simeononsecurity" + ENV DEBIAN_FRONTEND noninteractive ENV container docker From d8eb0634e4c120669afd6623a454c01aa1aa1f95 Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Wed, 6 Jul 2022 13:08:53 -0500 Subject: [PATCH 28/29] Update docker-image.yml --- .github/workflows/docker-image.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 0e488ec..62b4631 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -43,3 +43,14 @@ jobs: context: . push: true tags: simeononsecurity/samplicator:latest + + - name: Login to GitHub Container Registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.PAT_TOKEN }} + + - name: Build the simeononsecurity/samplicator:latest Docker image for Github Registry + run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes && docker buildx build --platform linux/amd64,linux/armhf,linux/arm64 -t ghcr.io/simeononsecurity/samplicator:latest --progress=plain --push . + From 18c272a5772a4e9cdfdaeecfc84f10f9e329d5b2 Mon Sep 17 00:00:00 2001 From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com> Date: Sun, 1 Oct 2023 07:55:46 +0000 Subject: [PATCH 29/29] Update Dockerfile --- Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 297c2c5..9c70f7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,10 +16,10 @@ ENV container docker #EXPOSE ${samplicator_port}:${samplicator_port}/udp # Update Packages -RUN apt-get update && apt-get install -y apt-utils && apt-get -y -f -m --show-progress full-upgrade +RUN apt-get update && apt-get install -y --no-install-recommends apt-utils && apt-get -y -f -m --show-progress --no-install-recommends full-upgrade # Install Supporting Software -RUN apt-get install -y git cmake make htop wget systemctl gcc curl gpg automake autogen +RUN apt-get install -y --no-install-recommends git cmake make htop wget systemctl gcc curl gpg automake autogen # Install Samplicator RUN git clone https://github.com/simeononsecurity/samplicator.git @@ -31,4 +31,8 @@ RUN cd /samplicator && make install #RUN cd /samplicator/ && chmod +x ./dockersetup.sh #RUN cd /samplicator/ && cat ./dockersetup.sh #CMD ["/bin/bash", "/samplicator/dockersetup.sh"] + +# Clean APT +RUN apt-get clean && rm -rf /var/lib/apt/lists/* + ENTRYPOINT ["samplicate"]