From db625131de576e56af5573c22c2f0fe634386dc7 Mon Sep 17 00:00:00 2001 From: Attila Szakacs Date: Wed, 13 Dec 2023 10:03:30 +0100 Subject: [PATCH] debug image to alltilla Signed-off-by: Attila Szakacs --- .github/workflows/ssc-stable.yml | 4 ++-- .github/workflows/syslog-ng-docker.yml | 4 ++-- syslog-ng/alpine.dockerfile | 7 +++++++ syslog-ng/apkbuild/axoflow/syslog-ng/APKBUILD | 3 ++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ssc-stable.yml b/.github/workflows/ssc-stable.yml index 79053f49b2..66313616ec 100644 --- a/.github/workflows/ssc-stable.yml +++ b/.github/workflows/ssc-stable.yml @@ -18,7 +18,7 @@ on: - 'ssc-*' env: - DOCKER_IMAGE_NAME: ghcr.io/axoflow/axosyslog-splunk-connector + DOCKER_IMAGE_NAME: ghcr.io/alltilla/axosyslog-splunk-connector PLATFORMS: linux/amd64,linux/arm64 SC4S_REPO: ${{ inputs.repo || 'splunk/splunk-connect-for-syslog' }} SYSLOG_NG_IMG_VERSION: ${{ inputs.syslog-ng-image-version || 'latest' }} @@ -44,7 +44,7 @@ jobs: core.setOutput('ref', tag); publish-image: - if: github.repository_owner == 'axoflow' + if: github.repository_owner == 'alltilla' needs: version runs-on: ubuntu-latest steps: diff --git a/.github/workflows/syslog-ng-docker.yml b/.github/workflows/syslog-ng-docker.yml index 15faf96a21..e90bcdab04 100644 --- a/.github/workflows/syslog-ng-docker.yml +++ b/.github/workflows/syslog-ng-docker.yml @@ -14,13 +14,13 @@ on: type: string env: - DOCKER_IMAGE_NAME: ghcr.io/axoflow/axosyslog + DOCKER_IMAGE_NAME: ghcr.io/alltilla/axosyslog PLATFORMS: linux/amd64,linux/arm64,linux/arm/v7 jobs: docker: name: syslog-ng Docker - if: github.repository_owner == 'axoflow' + if: github.repository_owner == 'alltilla' runs-on: ubuntu-latest steps: - name: Checkout source diff --git a/syslog-ng/alpine.dockerfile b/syslog-ng/alpine.dockerfile index 22a91f5a44..67cb573608 100644 --- a/syslog-ng/alpine.dockerfile +++ b/syslog-ng/alpine.dockerfile @@ -73,6 +73,13 @@ RUN apk add --repository /axoflow -U --upgrade --no-cache \ syslog-ng-tags-parser \ syslog-ng-xml +RUN apk add -U --upgrade --no-cache \ + gdb \ + valgrind \ + strace \ + perf \ + vim + RUN /var/lib/syslog-ng-venv/bin/pip install -U urllib3==1.26.18 EXPOSE 514/udp diff --git a/syslog-ng/apkbuild/axoflow/syslog-ng/APKBUILD b/syslog-ng/apkbuild/axoflow/syslog-ng/APKBUILD index 76ded0bf45..5ebe5653fb 100644 --- a/syslog-ng/apkbuild/axoflow/syslog-ng/APKBUILD +++ b/syslog-ng/apkbuild/axoflow/syslog-ng/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Next generation logging daemon" url="https://www.syslog-ng.com/products/open-source-log-management/" arch="all" license="GPL-2.0-or-later" -options="!check" # unit tests require https://github.com/Snaipe/Criterion with deps +options="!check !strip" # unit tests require https://github.com/Snaipe/Criterion with deps makedepends=" bison bpftool @@ -92,6 +92,7 @@ build() { --with-ivykis=internal \ --with-jsonc=system \ --with-python-venv-dir=/var/lib/syslog-ng-venv \ + --enable-debug \ \ --enable-all-modules \ --enable-ebpf \