From 17004cac4e973ace96f6a40557340f186ad4c43b Mon Sep 17 00:00:00 2001 From: Patrick Stephens Date: Mon, 10 Oct 2022 15:37:27 +0100 Subject: [PATCH] packaging: completely remove td-agent-bit builds Signed-off-by: Patrick Stephens --- .../workflows/build-branch-containers.yaml | 4 +- .github/workflows/build-master-packages.yaml | 4 +- .github/workflows/call-build-images.yaml | 178 +------- .../workflows/call-build-linux-packages.yaml | 84 +--- .github/workflows/cron-unstable-build.yaml | 18 +- CMakeLists.txt | 25 +- appveyor.yml | 16 +- debian/changelog | 395 ------------------ debian/compat | 1 - debian/conffiles | 6 - debian/control | 17 - debian/copyright | 27 -- debian/rules | 10 - debian/source/format | 1 - debian/source/lintian-overrides | 11 - debian/td-agent-bit.lintian-overrides | 5 - dockerfiles/Dockerfile.centos7 | 23 +- init/upstart.in | 2 +- packaging/build.sh | 5 +- packaging/distros/amazonlinux/Dockerfile | 56 ++- packaging/distros/centos/Dockerfile | 60 ++- packaging/distros/debian/Dockerfile | 72 ++-- packaging/distros/raspbian/Dockerfile | 52 ++- packaging/distros/ubuntu/Dockerfile | 84 ++-- .../smoke/packages/Dockerfile.amazonlinux2 | 4 +- .../testing/smoke/packages/Dockerfile.centos7 | 4 +- .../testing/smoke/packages/Dockerfile.centos8 | 4 +- .../smoke/packages/Dockerfile.debian10 | 4 +- .../smoke/packages/Dockerfile.debian11 | 4 +- .../smoke/packages/Dockerfile.ubuntu1804 | 4 +- .../smoke/packages/Dockerfile.ubuntu2004 | 4 +- packaging/update-repos.sh | 4 +- 32 files changed, 228 insertions(+), 960 deletions(-) delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/conffiles delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100755 debian/rules delete mode 100644 debian/source/format delete mode 100644 debian/source/lintian-overrides delete mode 100644 debian/td-agent-bit.lintian-overrides diff --git a/.github/workflows/build-branch-containers.yaml b/.github/workflows/build-branch-containers.yaml index a14009ba65f..ea5d3c6cd3d 100644 --- a/.github/workflows/build-branch-containers.yaml +++ b/.github/workflows/build-branch-containers.yaml @@ -1,4 +1,4 @@ -name: Build containers for a specific branch +name: Build containers for a specific branch of 1.9+ on: workflow_dispatch: inputs: @@ -8,7 +8,7 @@ on: default: master jobs: build-branch-containers: - uses: fluent/fluent-bit/.github/workflows/call-build-images.yaml@master + uses: ./.github/workflows/call-build-images.yaml with: version: ${{ github.event.inputs.version }} ref: ${{ github.event.inputs.version }} diff --git a/.github/workflows/build-master-packages.yaml b/.github/workflows/build-master-packages.yaml index 06c7f4231c3..0532d50ad12 100644 --- a/.github/workflows/build-master-packages.yaml +++ b/.github/workflows/build-master-packages.yaml @@ -25,7 +25,7 @@ jobs: - id: set-matrix run: | matrix=$(( - echo '{ "distro" : [ "debian/bullseye", "ubuntu/16.04", "ubuntu/18.04", "ubuntu/20.04" ]}' + echo '{ "distro" : [ "debian/bullseye", "ubuntu/20.04", "ubuntu/22.04", "centos/7" ]}' ) | jq -c .) if [ -n "${{ github.event.inputs.target || '' }}" ]; then echo "Overriding matrix to build: ${{ github.event.inputs.target }}" @@ -42,7 +42,7 @@ jobs: master-build-packages: needs: master-build-generate-matrix - uses: fluent/fluent-bit/.github/workflows/call-build-linux-packages.yaml@master + uses: ./.github/workflows/call-build-linux-packages.yaml with: version: master ref: master diff --git a/.github/workflows/call-build-images.yaml b/.github/workflows/call-build-images.yaml index e3950cc3eee..566e909e6d7 100644 --- a/.github/workflows/call-build-images.yaml +++ b/.github/workflows/call-build-images.yaml @@ -32,7 +32,7 @@ on: description: Optionally add metadata to build to indicate an unstable build, set to the contents you want to add. type: string required: false - default: '' + default: "" secrets: token: description: The Github token or similar to authenticate with for the registry. @@ -47,7 +47,6 @@ jobs: call-build-images-meta: name: Extract any supporting metadata outputs: - build-type: ${{ steps.determine-build-type.outputs.BUILD_TYPE }} major-version: ${{ steps.determine-major-version.outputs.replaced }} runs-on: ubuntu-latest environment: ${{ inputs.environment }} @@ -59,19 +58,7 @@ jobs: with: ref: ${{ inputs.ref }} - # Determine if this is a 1.8 type of build which is different - - name: Determine build type - id: determine-build-type - run: | - BUILD_TYPE="1.8" - if [[ -f "dockerfiles/Dockerfile" ]]; then - BUILD_TYPE="modern" - fi - echo "Detected type: $BUILD_TYPE" - echo ::set-output name=BUILD_TYPE::$BUILD_TYPE - shell: bash - - # For main branch/releases we want to also tag with the major version. + # For main branch/releases we want to tag with the major version. # E.g. if we build version 1.9.2 we want to tag with 1.9.2 and 1.9. - name: Determine major version tag id: determine-major-version @@ -79,151 +66,12 @@ jobs: with: pattern: '^(\d+\.\d+).*$' string: ${{ inputs.version }} - replace-with: '$1' - flags: 'g' - - # For 1.8 builds it is a little more complex so we have this build matrix to handle it. - # This creates separate images for each architecture. - # The later step then creates a multi-arch manifest for all of these. - call-build-legacy-images-matrix: - if: needs.call-build-images-meta.outputs.build-type == '1.8' - name: Build single arch legacy images - runs-on: ubuntu-latest - environment: ${{ inputs.environment }} - needs: - - call-build-images-meta - strategy: - fail-fast: false - matrix: - arch: [ amd64, arm64, arm/v7 ] - include: - - arch: amd64 - suffix: x86_64 - - arch: arm/v7 - suffix: arm32v7 - - arch: arm64 - suffix: arm64v8 - permissions: - contents: read - packages: write - steps: - - name: Checkout the docker build repo for legacy builds - uses: actions/checkout@v3 - with: - repository: fluent/fluent-bit-docker-image - ref: '1.8' # Fixed to this branch - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Log in to the Container registry - uses: docker/login-action@v2 - with: - registry: ${{ inputs.registry }} - username: ${{ inputs.username }} - password: ${{ secrets.token }} - - - id: debug-meta - uses: docker/metadata-action@v4 - with: - images: ${{ inputs.registry }}/${{ inputs.image }} - tags: | - raw,${{ inputs.version }}-debug - raw,${{ needs.call-build-images-meta.outputs.major-version }}-debug - - - name: Build the legacy x86_64 debug image - if: matrix.arch == 'amd64' - uses: docker/build-push-action@v3 - with: - file: ./Dockerfile.x86_64.debug - context: . - tags: ${{ steps.debug-meta.outputs.tags }} - labels: ${{ steps.debug-meta.outputs.labels }} - platforms: linux/amd64 - push: true - load: false - build-args: | - FLB_TARBALL=https://github.com/fluent/fluent-bit/tarball/${{ inputs.ref }} - - - name: Extract metadata from Github - id: meta - uses: docker/metadata-action@v4 - with: - images: ${{ inputs.registry }}/${{ inputs.image }} - tags: | - raw,${{ matrix.suffix }}-${{ inputs.version }} - - - name: Build the legacy ${{ matrix.arch }} image - uses: docker/build-push-action@v3 - with: - file: ./Dockerfile.${{ matrix.suffix }} - context: . - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - platforms: linux/${{ matrix.arch }} - push: true - load: false - build-args: | - FLB_TARBALL=https://github.com/fluent/fluent-bit/tarball/${{ inputs.ref }} - - # Create a multi-arch manifest for the separate 1.8 images. - call-build-legacy-image-manifests: - if: needs.call-build-images-meta.outputs.build-type == '1.8' - name: Deploy multi-arch container image manifests - permissions: - contents: read - packages: write - runs-on: ubuntu-latest - environment: ${{ inputs.environment }} - needs: - - call-build-images-meta - - call-build-legacy-images-matrix - steps: - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Log in to the Container registry - uses: docker/login-action@v2 - with: - registry: ${{ inputs.registry }} - username: ${{ inputs.username }} - password: ${{ secrets.token }} - - - name: Pull all the images - # Use platform to trigger warnings on invalid image metadata - run: | - docker pull --platform=linux/amd64 ${{ inputs.registry }}/${{ inputs.image }}:x86_64-${{ inputs.version }} - docker pull --platform=linux/arm64 ${{ inputs.registry }}/${{ inputs.image }}:arm64v8-${{ inputs.version }} - docker pull --platform=linux/arm/v7 ${{ inputs.registry }}/${{ inputs.image }}:arm32v7-${{ inputs.version }} - - - name: Create manifests for images - # Latest is 1.9, not 1.8 now - run: | - docker manifest create ${{ inputs.registry }}/${{ inputs.image }}:${{ inputs.version }} \ - --amend ${{ inputs.registry }}/${{ inputs.image }}:x86_64-${{ inputs.version }} \ - --amend ${{ inputs.registry }}/${{ inputs.image }}:arm64v8-${{ inputs.version }} \ - --amend ${{ inputs.registry }}/${{ inputs.image }}:arm32v7-${{ inputs.version }} - docker manifest push --purge ${{ inputs.registry }}/${{ inputs.image }}:${{ inputs.version }} - env: - DOCKER_CLI_EXPERIMENTAL: enabled - shell: bash - - - name: Create major version manifest - if: needs.call-build-images-meta.outputs.major-version != inputs.version - run: | - docker manifest push --purge ${{ inputs.registry }}/${{ inputs.image }}:${{ needs.call-build-images-meta.outputs.major-version }} - env: - DOCKER_CLI_EXPERIMENTAL: enabled - shell: bash + replace-with: "$1" + flags: "g" # This is the intended approach to multi-arch image and all the other checks scanning, # signing, etc only trigger from this. - # 1.8 images are legacy and were not scanned or signed previously so this keeps it simple. call-build-images: - if: needs.call-build-images-meta.outputs.build-type != '1.8' needs: - call-build-images-meta name: Multiarch container images to GHCR @@ -304,7 +152,6 @@ jobs: needs: - call-build-images-meta - call-build-images - if: needs.call-build-images-meta.outputs.build-type != '1.8' runs-on: ubuntu-latest environment: ${{ inputs.environment }} permissions: @@ -332,7 +179,6 @@ jobs: if-no-files-found: error call-build-images-scan: - if: needs.call-build-images-meta.outputs.build-type != '1.8' needs: - call-build-images-meta - call-build-images @@ -353,22 +199,21 @@ jobs: - name: Trivy - multi-arch uses: aquasecurity/trivy-action@master with: - image-ref: '${{ inputs.registry }}/${{ inputs.image }}:${{ inputs.version }}' - format: 'table' - exit-code: '1' + image-ref: "${{ inputs.registry }}/${{ inputs.image }}:${{ inputs.version }}" + format: "table" + exit-code: "1" ignore-unfixed: true - vuln-type: 'os,library' - severity: 'CRITICAL,HIGH' + vuln-type: "os,library" + severity: "CRITICAL,HIGH" - name: Dockle - multi-arch uses: hands-lab/dockle-action@v1 with: - image: '${{ inputs.registry }}/${{ inputs.image }}:${{ inputs.version }}' - exit-code: '1' + image: "${{ inputs.registry }}/${{ inputs.image }}:${{ inputs.version }}" + exit-code: "1" exit-level: WARN call-build-images-sign: - if: needs.call-build-images-meta.outputs.build-type != '1.8' needs: - call-build-images-meta - call-build-images @@ -428,7 +273,6 @@ jobs: # This takes a long time... call-build-windows-container: - if: needs.call-build-images-meta.outputs.build-type != '1.8' name: Windows container image runs-on: windows-2019 environment: ${{ inputs.environment }} diff --git a/.github/workflows/call-build-linux-packages.yaml b/.github/workflows/call-build-linux-packages.yaml index 388775c10dc..d849b8a5e02 100644 --- a/.github/workflows/call-build-linux-packages.yaml +++ b/.github/workflows/call-build-linux-packages.yaml @@ -24,7 +24,7 @@ on: description: Optionally add metadata to build to indicate an unstable build, set to the contents you want to add. type: string required: false - default: '' + default: "" ignore_failing_targets: description: Optionally ignore any failing builds in the matrix and continue. type: boolean @@ -51,39 +51,11 @@ on: required: false jobs: - call-build-legacy-check: - # Determine if this is a 1.8 type of build which is different - name: Extract any supporting metadata - outputs: - build-type: ${{ steps.determine-build-type.outputs.BUILD_TYPE }} - runs-on: ubuntu-latest - environment: ${{ inputs.environment }} - permissions: - contents: read - steps: - - name: Checkout code - uses: actions/checkout@v3 - with: - ref: ${{ inputs.ref }} - - - name: Determine build type - id: determine-build-type - run: | - BUILD_TYPE="1.8" - if [[ -f "dockerfiles/Dockerfile" ]]; then - BUILD_TYPE="modern" - fi - echo "Detected type: $BUILD_TYPE" - echo ::set-output name=BUILD_TYPE::$BUILD_TYPE - shell: bash - call-build-capture-source: # Capture source tarball and generate checksum for it name: Extract any supporting metadata runs-on: ubuntu-latest environment: ${{ inputs.environment }} - needs: - - call-build-legacy-check permissions: contents: read steps: @@ -93,13 +65,6 @@ jobs: ref: ${{ inputs.ref }} path: source - - name: Checkout legacy packaging code - if: needs.call-build-legacy-check.outputs.build-type == '1.8' - uses: actions/checkout@v3 - with: - repository: fluent/fluent-bit-packaging - path: packaging - - name: Create tarball and checksums run: | tar -czvf $SOURCE_FILENAME_PREFIX.tar.gz -C source --exclude-vcs . @@ -125,7 +90,7 @@ jobs: path: source-packages/* if-no-files-found: error - # Required to support 1.8 style builds which will not have it + # Pick up latest master version - name: Checkout code for action if: inputs.environment == 'staging' uses: actions/checkout@v3 @@ -143,14 +108,10 @@ jobs: bucket-directory: "${{ inputs.version }}/source" source-directory: "source-packages/" - # We build both master/1.9 and 1.8 style packages in a single job as it is simpler to keep all the custom - # code and workflow together. We need to run the dependent job after this as well. call-build-linux-packages: name: ${{ matrix.distro }} package build and stage to S3 environment: ${{ inputs.environment }} runs-on: ubuntu-latest - needs: - - call-build-legacy-check permissions: contents: read strategy: @@ -160,18 +121,10 @@ jobs: continue-on-error: ${{ inputs.ignore_failing_targets || false }} steps: - name: Checkout code - if: needs.call-build-legacy-check.outputs.build-type != '1.8' uses: actions/checkout@v3 with: ref: ${{ inputs.ref }} - - name: Checkout legacy packaging code - if: needs.call-build-legacy-check.outputs.build-type == '1.8' - uses: actions/checkout@v3 - with: - repository: fluent/fluent-bit-packaging - path: packaging - - name: Set up QEMU uses: docker/setup-qemu-action@v2 @@ -183,46 +136,20 @@ jobs: with: pattern: '(.*)\/(.*)$' string: "${{ matrix.distro }}" - replace-with: '$1-$2' - flags: 'g' + replace-with: "$1-$2" + flags: "g" - name: fluent-bit - ${{ matrix.distro }} artifacts - if: needs.call-build-legacy-check.outputs.build-type != '1.8' run: | ./build.sh env: FLB_DISTRO: ${{ matrix.distro }} - # Align with 1.8 output FLB_OUT_DIR: ${{ inputs.version }}/staging FLB_TD: "Off" FLB_NIGHTLY_BUILD: ${{ inputs.unstable }} CMAKE_INSTALL_PREFIX: /opt/fluent-bit/ working-directory: packaging - - name: td-agent-bit - ${{ matrix.distro }} artifacts - if: needs.call-build-legacy-check.outputs.build-type != '1.8' - run: | - ./build.sh - env: - FLB_DISTRO: ${{ matrix.distro }} - # Align with 1.8 output - FLB_OUT_DIR: ${{ inputs.version }}/staging - FLB_TD: "On" - FLB_NIGHTLY_BUILD: ${{ inputs.unstable }} - CMAKE_INSTALL_PREFIX: /opt/td-agent-bit/ - working-directory: packaging - - - name: Legacy td-agent-bit - ${{ matrix.distro }} artifacts - if: needs.call-build-legacy-check.outputs.build-type == '1.8' - run: | - ./build.sh -v $FLB_VERSION -b $FLB_BRANCH -d $FLB_DISTRO - env: - FLB_VERSION: ${{ inputs.ref }} - FLB_BRANCH: ${{ inputs.ref }} - FLB_DISTRO: ${{ matrix.distro }} - FLB_OUT_DIR: staging - working-directory: packaging - - name: Upload the ${{ matrix.distro }} artifacts uses: actions/upload-artifact@v3 with: @@ -263,7 +190,7 @@ jobs: fi shell: bash - # Required to support 1.8 style builds which will not have it + # Pick up latest master version - name: Checkout code for action if: inputs.environment == 'staging' uses: actions/checkout@v3 @@ -281,7 +208,6 @@ jobs: bucket-directory: "${{ inputs.version }}/${{ steps.get-target-info.outputs.target }}/" source-directory: "packaging/packages/${{ matrix.distro }}/${{ inputs.version }}/staging/" - call-build-linux-packages-repo: name: Create repo metadata in S3 # Only upload for staging diff --git a/.github/workflows/cron-unstable-build.yaml b/.github/workflows/cron-unstable-build.yaml index f398b849126..2e5e1cfafbf 100644 --- a/.github/workflows/cron-unstable-build.yaml +++ b/.github/workflows/cron-unstable-build.yaml @@ -12,17 +12,13 @@ on: # Run nightly build at this time, bit of trial and error but this seems good. schedule: - - cron: "0 6 * * *" # master build - # Not available currently so will fail until it is - # - cron: "0 12 * * *" # 1.9 build - - cron: "0 18 * * *" # 1.8 build - # A 1.8 build requires merging all the changes from master to handle packaging from local + - cron: "0 6 * * *" # master build + - cron: "0 12 * * *" # 1.9 build # We do not want a new unstable build to run whilst we are releasing the current unstable build. concurrency: unstable-build-release jobs: - # This job provides this metadata for the other jobs to use. unstable-build-get-meta: name: Get metadata to add to build @@ -50,23 +46,17 @@ jobs: shell: bash - name: master run - if: github.event_name == 'schedule' && github.event.schedule=='0 6 * * *' + if: github.event_name == 'schedule' && github.event.schedule=='0 6 * * *' run: | echo "cron_branch=master" >> $GITHUB_ENV shell: bash - name: 1.9 run - if: github.event_name == 'schedule' && github.event.schedule=='0 12 * * *' + if: github.event_name == 'schedule' && github.event.schedule=='0 12 * * *' run: | echo "cron_branch=1.9" >> $GITHUB_ENV shell: bash - - name: 1.8 run - if: github.event_name == 'schedule' && github.event.schedule=='0 18 * * *' - run: | - echo "cron_branch=1.8" >> $GITHUB_ENV - shell: bash - - name: Output the branch to use id: branch run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index 9fb4c88ed27..038284c9190 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -820,16 +820,8 @@ else() endif() -# TD Agent options -if(FLB_TD) - FLB_DEFINITION(FLB_IS_TD_AGENT) - FLB_OPTION(FLB_JEMALLOC ON) - set(FLB_PROG_NAME "TD Agent Bit") - set(FLB_OUT_NAME "td-agent-bit") -else() - set(FLB_PROG_NAME "Fluent Bit") - set(FLB_OUT_NAME "fluent-bit") -endif() +set(FLB_PROG_NAME "Fluent Bit") +set(FLB_OUT_NAME "fluent-bit") if(FLB_PROXY_GO) FLB_DEFINITION(FLB_HAVE_PROXY_GO) @@ -1075,12 +1067,7 @@ endif() # ============================ set(CPACK_PACKAGE_VERSION ${FLB_VERSION_STR}) - -if(FLB_TD) - set(CPACK_PACKAGE_NAME "td-agent-bit") -else() - set(CPACK_PACKAGE_NAME "fluent-bit") -endif() +set(CPACK_PACKAGE_NAME "fluent-bit") set(CPACK_PACKAGE_RELEASE 1) set(CPACK_PACKAGE_CONTACT "Eduardo Silva ") @@ -1178,11 +1165,7 @@ set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) # CPack: Windows System if(CPACK_GENERATOR MATCHES "NSIS") set(CPACK_MONOLITHIC_INSTALL 1) - if(FLB_TD) - set(CPACK_PACKAGE_INSTALL_DIRECTORY "td-agent-bit") - else() - set(CPACK_PACKAGE_INSTALL_DIRECTORY "fluent-bit") - endif() + set(CPACK_PACKAGE_INSTALL_DIRECTORY "fluent-bit") endif() # CPack: Windows System w/ WiX diff --git a/appveyor.yml b/appveyor.yml index b575196a094..b13947a70dd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,11 +16,11 @@ configuration: skip_commits: files: - - '.github/**/*' - - 'packaging/**/*' - - 'dockerfiles/**/*' - - '**/*.md' - - '**/*.sh' + - ".github/**/*" + - "packaging/**/*" + - "dockerfiles/**/*" + - "**/*.md" + - "**/*.sh" install: - ps: Invoke-WebRequest -O winflexbison.zip $env:winflexbison @@ -38,15 +38,11 @@ build_script: - powershell ".\ci\do-ut.ps1;exit $LASTEXITCODE" - cd build - cpack - - cmake -G "NMake Makefiles" -D FLB_TD=On ..\ + - cmake -G "NMake Makefiles" ..\ - cmake --build . - cpack artifacts: - - path: build/td-agent-bit-*.exe - name: td-agent-bit - - path: build/td-agent-bit-*.zip - name: td-agent-bit-zip - path: build/fluent-bit-*.exe name: fluent-bit-installer - path: build/fluent-bit-*.zip diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 9d7399a9d30..00000000000 --- a/debian/changelog +++ /dev/null @@ -1,395 +0,0 @@ -td-agent-bit (1.3.0) stable; urgency=low - - * Fluent Bit v1.3.0 - - -- Eduardo Silva Thu, 25 Jul 2019 08:00:00 -0600 - -td-agent-bit (1.2.0) stable; urgency=low - - * Fluent Bit v1.2.0 - - -- Eduardo Silva Fri, 28 Jun 2019 08:00:00 -0600 - -td-agent-bit (1.1.0) stable; urgency=low - - * Fluent Bit v1.1.0 - - -- Eduardo Silva Mon, 29 Jan 2019 08:00:00 -0600 - -td-agent-bit (1.0.6) stable; urgency=low - - * Fluent Bit v1.0.6 - - -- Eduardo Silva Wed, 27 Mar 2019 11:00:00 -0600 - -td-agent-bit (1.0.5) stable; urgency=low - - * Fluent Bit v1.0.5 - - -- Eduardo Silva Wed, 20 Mar 2019 11:00:00 -0600 - -td-agent-bit (1.0.4) stable; urgency=low - - * Fluent Bit v1.0.4 - - -- Eduardo Silva Fri, 01 Feb 2019 08:00:00 -0600 - -td-agent-bit (1.0.3) stable; urgency=low - - * Fluent Bit v1.0.3 - - -- Eduardo Silva Fri, 18 Jan 2019 08:00:00 -0600 - -td-agent-bit (1.0.2) stable; urgency=low - - * Fluent Bit v1.0.2 - - -- Eduardo Silva Fri, 11 Jan 2019 08:00:00 -0600 - -td-agent-bit (1.0.1) stable; urgency=low - - * Fluent Bit v1.0.1 - - -- Eduardo Silva Thu, 20 Dec 2018 11:30:00 -0600 - -td-agent-bit (1.0.0) stable; urgency=low - - * Fluent Bit v1.0.0 - - -- Eduardo Silva Mon, 10 Dec 2018 08:00:00 -0600 - -td-agent-bit (0.14.7) stable; urgency=low - - * Fluent Bit v0.14.7 - - -- Eduardo Silva Wed, 07 Nov 2018 08:00:00 -0600 - -td-agent-bit (0.14.6) stable; urgency=low - - * Fluent Bit v0.14.6 - - -- Eduardo Silva Wed, 31 Oct 2018 08:00:00 -0600 - -td-agent-bit (0.14.5) stable; urgency=low - - * Fluent Bit v0.14.5 - - -- Eduardo Silva Fri, 05 Oct 2018 08:00:00 -0600 - -td-agent-bit (0.14.4) stable; urgency=low - - * Fluent Bit v0.14.4 - - -- Eduardo Silva Fri, 28 Sep 2018 08:00:00 -0600 - -td-agent-bit (0.14.3) stable; urgency=low - - * Fluent Bit v0.14.3 - - -- Eduardo Silva Fri, 21 Sep 2018 22:00:00 -0600 - -td-agent-bit (0.14.2) stable; urgency=low - - * Fluent Bit v0.14.2 - - -- Eduardo Silva Fri, 07 Sep 2018 22:00:00 -0600 - -td-agent-bit (0.14.1) stable; urgency=low - - * Fluent Bit v0.14.1 - - -- Eduardo Silva Thu, 30 Aug 2018 22:00:00 -0600 - -td-agent-bit (0.14.0) stable; urgency=low - - * Fluent Bit v0.14.0 - - -- Eduardo Silva Mon, 02 Jul 2018 22:00:00 -0600 - -td-agent-bit (0.13.0) stable; urgency=low - - * Based on Fluent Bit v0.13.0 - - -- Eduardo Silva Thu, 22 Feb 2018 22:00:00 -0600 - -td-agent-bit (0.12.19) stable; urgency=low - - * Based on Fluent Bit v0.12.19 - - -- Eduardo Silva Fri, 27 Apr 2018 17:30:00 -0600 - -td-agent-bit (0.12.18-2) stable; urgency=low - - * Based on Fluent Bit v0.12.18-2 - - -- Eduardo Silva Fri, 20 Apr 2018 17:30:00 -0600 - -td-agent-bit (0.12.18) stable; urgency=low - - * Based on Fluent Bit v0.12.18 - - -- Eduardo Silva Fri, 20 Apr 2018 11:30:00 -0600 - -td-agent-bit (0.12.17) stable; urgency=low - - * Based on Fluent Bit v0.12.17 - - -- Eduardo Silva Wed, 04 Apr 2018 22:00:00 -0600 - -td-agent-bit (0.12.16) stable; urgency=low - - * Based on Fluent Bit v0.12.16 - - -- Eduardo Silva Fri, 16 Mar 2018 22:00:00 -0600 - -td-agent-bit (0.12.15) stable; urgency=low - - * Based on Fluent Bit v0.12.15 - - -- Eduardo Silva Tue, 20 Feb 2018 22:00:00 -0600 - -td-agent-bit (0.12.14) stable; urgency=low - - * Based on Fluent Bit v0.12.14 - - -- Eduardo Silva Mon, 12 Feb 2018 22:00:00 -0600 - -td-agent-bit (0.12.13) stable; urgency=low - - * Based on Fluent Bit v0.12.13 - - -- Eduardo Silva Thu, 01 Feb 2018 22:00:00 -0600 - -td-agent-bit (0.12.12) stable; urgency=low - - * Based on Fluent Bit v0.12.12 - - -- Eduardo Silva Wed, 17 Jan 2018 22:00:00 -0600 - -td-agent-bit (0.12.11) stable; urgency=low - - * Based on Fluent Bit v0.12.11 - - -- Eduardo Silva Wed, 20 Dec 2017 22:00:00 -0600 - -td-agent-bit (0.12.10) stable; urgency=low - - * Based on Fluent Bit v0.12.10 - - -- Eduardo Silva Wed, 29 Nov 2017 22:00:00 -0600 - -td-agent-bit (0.12.9) stable; urgency=low - - * Based on Fluent Bit v0.12.9 - - -- Eduardo Silva Fri, 24 Nov 2017 22:00:00 -0600 - -td-agent-bit (0.12.8) stable; urgency=low - - * Based on Fluent Bit v0.12.8 - - -- Eduardo Silva Fri, 10 Nov 2017 22:00:00 -0600 - -td-agent-bit (0.12.7) stable; urgency=low - - * Based on Fluent Bit v0.12.7 - - -- Eduardo Silva Wed, 01 Nov 2017 22:00:00 -0600 - -td-agent-bit (0.12.6) stable; urgency=low - - * Based on Fluent Bit v0.12.6 - - -- Eduardo Silva Fri, 13 Oct 2017 22:00:00 -0600 - -td-agent-bit (0.12.5) stable; urgency=low - - * Based on Fluent Bit v0.12.5 - - -- Eduardo Silva Fri, 06 Oct 2017 22:00:00 -0600 - -td-agent-bit (0.12.4) stable; urgency=low - - * Based on Fluent Bit v0.12.4 - - -- Eduardo Silva Fri, 29 Sep 2017 22:00:00 -0600 - -td-agent-bit (0.12.3) stable; urgency=low - - * Based on Fluent Bit v0.12.3 - - -- Eduardo Silva Fri, 22 Sep 2017 22:00:00 -0600 - -td-agent-bit (0.12.2) stable; urgency=low - - * Based on Fluent Bit v0.12.2 - - -- Eduardo Silva Fri, 15 Sep 2017 22:00:00 -0600 - -td-agent-bit (0.12.1) stable; urgency=low - - * Based on Fluent Bit v0.12.1 - - -- Eduardo Silva Fri, 01 Sep 2017 22:00:00 -0600 - -td-agent-bit (0.12.0) stable; urgency=low - - * Based on Fluent Bit v0.12.0 - - -- Eduardo Silva Thu, 17 Aug 2017 22:00:00 -0600 - -td-agent-bit (0.11.17) stable; urgency=low - - * Based on Fluent Bit v0.11.17 - - -- Eduardo Silva Tue, 15 Aug 2017 22:00:00 -0600 - -td-agent-bit (0.11.16) stable; urgency=low - - * Based on Fluent Bit v0.11.16 - - -- Eduardo Silva Wed, 07 Aug 2017 10:00:00 -0600 - -td-agent-bit (0.11.15) stable; urgency=low - - * Based on Fluent Bit v0.11.15 - - -- Eduardo Silva Mon, 24 Jul 2017 10:00:00 -0600 - -td-agent-bit (0.11.14) stable; urgency=low - - * Based on Fluent Bit v0.11.14 - - -- Eduardo Silva Mon, 17 Jul 2017 10:00:00 -0600 - -td-agent-bit (0.11.13) stable; urgency=low - - * Based on Fluent Bit v0.11.13 - - -- Eduardo Silva Mon, 10 Jul 2017 10:00:00 -0600 - -td-agent-bit (0.11.12) stable; urgency=low - - * Based on Fluent Bit v0.11.12 - - -- Eduardo Silva Mon, 03 Jul 2017 10:00:00 -0600 - -td-agent-bit (0.11.11) stable; urgency=low - - * Based on Fluent Bit v0.11.11 - - -- Eduardo Silva Wed, 28 Jun 2017 10:00:00 -0600 - -td-agent-bit (0.11.10) stable; urgency=low - - * Based on Fluent Bit v0.11.10 - - -- Eduardo Silva Mon, 19 Jun 2017 10:00:00 -0600 - -td-agent-bit (0.11.9) stable; urgency=low - - * Based on Fluent Bit v0.11.9 - - -- Eduardo Silva Tue, 13 Jun 2017 10:00:00 -0600 - -td-agent-bit (0.11.8) stable; urgency=low - - * Based on Fluent Bit v0.11.8 - - -- Eduardo Silva Fri, 02 Jun 2017 10:00:00 -0600 - -td-agent-bit (0.11.7) stable; urgency=low - - * Based on Fluent Bit v0.11.7 - - -- Eduardo Silva Wed, 31 May 2017 10:00:00 -0600 - -td-agent-bit (0.11.6) stable; urgency=low - - * Based on Fluent Bit v0.11.6 - - -- Eduardo Silva Wed, 24 May 2017 10:00:00 -0600 - -td-agent-bit (0.11.5) stable; urgency=low - - * Based on Fluent Bit v0.11.5 - - -- Eduardo Silva Wed, 17 May 2017 10:00:00 -0600 - -td-agent-bit (0.11.4) stable; urgency=low - - * Based on Fluent Bit v0.11.4 - - -- Eduardo Silva Mon, 21 Apr 2017 09:00:00 -0600 - -td-agent-bit (0.11.3) stable; urgency=low - - * Based on Fluent Bit v0.11.3 - - -- Eduardo Silva Wed, 12 Apr 2017 09:00:00 -0600 - -td-agent-bit (0.11.2) stable; urgency=low - - * Based on Fluent Bit v0.11.2 - - -- Eduardo Silva Wed, 05 Apr 2017 09:00:00 -0600 - -td-agent-bit (0.11.1) stable; urgency=low - - * Based on Fluent Bit v0.11.1 - - -- Eduardo Silva Mon, 03 Apr 2017 09:00:00 -0600 - -td-agent-bit (0.11.0) stable; urgency=low - - * Based on Fluent Bit v0.11.0 - - -- Eduardo Silva Fri, 24 Mar 2017 09:00:00 -0600 - -td-agent-bit (0.10.1-1) stable; urgency=low - - * Based on Fluent Bit v0.10.1 - - -- Eduardo Silva Fri, 06 Jan 2017 09:00:00 -0600 - -td-agent-bit (0.10.0-1) stable; urgency=low - - * Based on Fluent Bit v0.10.0 - - -- Eduardo Silva Thu, 29 Dec 2016 16:00:00 -0600 - -td-agent-bit (0.9.1-1) stable; urgency=low - - * Based on Fluent Bit v0.9.1 - - -- Eduardo Silva Mon, 05 Dec 2016 16:00:00 -0600 - -td-agent-bit (0.9.0-1) stable; urgency=low - - * Based on Fluent Bit v0.9.0 - - -- Eduardo Silva Wed, 02 Nov 2016 16:00:00 -0600 - -td-agent-bit (0.8.5-1) stable; urgency=low - - * Based on Fluent Bit v0.8.5 - - -- Eduardo Silva Mon, 05 Sep 2016 16:00:00 -0600 - -td-agent-bit (0.8.4-1) stable; urgency=low - - * Based on Fluent Bit v0.8.4 - - -- Eduardo Silva Fri, 12 Aug 2016 16:00:00 -0600 - -td-agent-bit (0.8.3-1) stable; urgency=low - - * Based on Fluent Bit v0.8.3 - - -- Eduardo Silva Fri, 01 Jul 2016 14:00:00 -0600 - -td-agent-bit (0.8.2-1) stable; urgency=low - - * Based on Fluent Bit v0.8.2 - - -- Eduardo Silva Mon, 20 Jun 2016 14:00:00 -0600 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7f8f011eb73..00000000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/debian/conffiles b/debian/conffiles deleted file mode 100644 index 9e19f97be2c..00000000000 --- a/debian/conffiles +++ /dev/null @@ -1,6 +0,0 @@ -/etc/td-agent-bit/parsers.conf -/etc/td-agent-bit/plugins.conf -/etc/td-agent-bit/td-agent-bit.conf -/etc/fluent-bit/parsers.conf -/etc/fluent-bit/plugins.conf -/etc/fluent-bit/fluent-bit.conf diff --git a/debian/control b/debian/control deleted file mode 100644 index ab5c399930b..00000000000 --- a/debian/control +++ /dev/null @@ -1,17 +0,0 @@ -Source: td-agent-bit -Section: net -Priority: optional -Maintainer: Eduardo Silva -Build-Depends: debhelper (>= 7.0.50~), cmake (>= 2.6), flex, bison -Standards-Version: 4.3.0 -Homepage: http://fluentbit.io -Vcs-Git: https://github.com/fluent/fluent-bit -Vcs-Browser: https://github.com/fluent/fluent-bit - -Package: td-agent-bit -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: High performance Log Forwarder for Linux. - Fluent Bit is a high performance data collector and log forwarder for Linux. - It provides a flexible architecture and plugins to collect, parser, filter and - deliver logs to different backend types. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 9b89f7267b7..00000000000 --- a/debian/copyright +++ /dev/null @@ -1,27 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: fluentbit -Source: http://fluentbit.io - -Files: * -Copyright: 2015 Treasure Data - -License: - -Files: debian/* -Copyright: 2015 Treasure Data - -License: Apache 2.0 - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - . - http://www.apache.org/licenses/LICENSE-2.0 - . - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - . - On Debian systems, the complete text of the Apache License 2.0 can - be found in "/usr/share/common-licenses/Apache-2.0" diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 1b3c014471d..00000000000 --- a/debian/rules +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/make -f - -export DH_VERBOSE=1 - -%: - dh $@ --buildsystem=cmake - -override_dh_auto_configure: - - dh_auto_configure -- -DFLB_ALL=ON -DFLB_TD=1 -DFLB_WITHOUT_EXAMPLES=On -DFLB_HTTP_SERVER=On -DFLB_OUT_KAFKA=On diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8d82b..00000000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides deleted file mode 100644 index 388ec140f36..00000000000 --- a/debian/source/lintian-overrides +++ /dev/null @@ -1,11 +0,0 @@ -td-agent-bit source: configure-generated-file-in-source lib/onigmo/config.log -td-agent-bit source: configure-generated-file-in-source lib/onigmo/config.status -td-agent-bit source: source-is-missing lib/monkey/htdocs/js/bootstrap.min.js -td-agent-bit source: source-is-missing lib/monkey/htdocs/js/jquery.js line length is 32086 characters (>512) -td-agent-bit source: missing-field-in-dep5-copyright license (paragraph at line 10) -td-agent-bit source: missing-field-in-dep5-copyright license (paragraph at line 5) -td-agent-bit source: missing-notice-file-for-apache-license lib/monkey/NOTICE -td-agent-bit source: missing-license-text-in-dep5-copyright (paragraph at line 8) -td-agent-bit source: empty-short-license-in-dep5-copyright (paragraph at line 8) -td-agent-bit source: space-in-std-shortname-in-dep5-copyright apache 2.0 (paragraph at line 13) -td-agent-bit source: package-uses-deprecated-debhelper-compat-version 7 diff --git a/debian/td-agent-bit.lintian-overrides b/debian/td-agent-bit.lintian-overrides deleted file mode 100644 index 1d4b1483b0b..00000000000 --- a/debian/td-agent-bit.lintian-overrides +++ /dev/null @@ -1,5 +0,0 @@ -td-agent-bit: embedded-library * -td-agent-bit: package-name-doesnt-match-sonames libfluent-bit -td-agent-bit: embedded-library opt/td-agent-bit/bin/td-agent-bit: mbedtls -td-agent-bit: embedded-library opt/td-agent-bit/lib/x86_64-linux-gnu/libfluent-bit.so: mbedtls -td-agent-bit: missing-depends-line diff --git a/dockerfiles/Dockerfile.centos7 b/dockerfiles/Dockerfile.centos7 index 2c57d358108..2fb5c343fe4 100644 --- a/dockerfiles/Dockerfile.centos7 +++ b/dockerfiles/Dockerfile.centos7 @@ -3,12 +3,13 @@ # Based on https://github.com/fluent/fluent-bit-packaging/tree/master/distros/centos/7 FROM centos:7 +# hadolint ignore=DL3032, DL3033 RUN yum -y update && \ yum install -y rpm-build curl ca-certificates gcc gcc-c++ cmake make bash \ - wget unzip systemd-devel wget flex bison \ - cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \ - postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \ - wget http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ + wget unzip systemd-devel wget flex bison \ + cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \ + postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \ + wget-q http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ rpm -ivh epel-release-latest-7.noarch.rpm && \ yum install -y cmake3 @@ -16,11 +17,11 @@ COPY . /src/ WORKDIR /src/build RUN cmake3 -DCMAKE_INSTALL_PREFIX=/opt/td-agent-bit/ -DCMAKE_INSTALL_SYSCONFDIR=/etc/ \ - -DFLB_RELEASE=On -DFLB_TRACE=On -DFLB_TD=On \ - -DFLB_TESTS_INTERNAL=On -DFLB_TESTS_RUNTIME=On \ - -DFLB_SQLDB=On -DFLB_HTTP_SERVER=On \ - -DFLB_OUT_KAFKA=On \ - -DFLB_JEMALLOC=On \ - -DFLB_OUT_PGSQL=On ../ + -DFLB_RELEASE=On -DFLB_TRACE=On \ + -DFLB_TESTS_INTERNAL=On -DFLB_TESTS_RUNTIME=On \ + -DFLB_SQLDB=On -DFLB_HTTP_SERVER=On \ + -DFLB_OUT_KAFKA=On \ + -DFLB_JEMALLOC=On \ + -DFLB_OUT_PGSQL=On ../ -RUN make -j $(getconf _NPROCESSORS_ONLN) +RUN make -j "$(getconf _NPROCESSORS_ONLN)" diff --git a/init/upstart.in b/init/upstart.in index 64d6628604d..0356ae979d8 100644 --- a/init/upstart.in +++ b/init/upstart.in @@ -1,4 +1,4 @@ -# td-agent-bit - ligtweight log shipping for fluent +# fluent-bit - ligtweight log shipping for fluent description "@FLB_PROG_NAME@" diff --git a/packaging/build.sh b/packaging/build.sh index 07b50d973df..4bb43a129ab 100755 --- a/packaging/build.sh +++ b/packaging/build.sh @@ -66,12 +66,10 @@ if [[ ! -f "$IMAGE_CONTEXT_DIR/Dockerfile" ]]; then fi # CMake configuration variables, override via environment rather than parameters -CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX:-/opt/td-agent-bit/} -FLB_TD=${FLB_TD:-On} +CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX:-/opt/fluent-bit/} echo "IMAGE_CONTEXT_DIR => $IMAGE_CONTEXT_DIR" echo "CMAKE_INSTALL_PREFIX => $CMAKE_INSTALL_PREFIX" -echo "FLB_TD => $FLB_TD" echo "FLB_NIGHTLY_BUILD => $FLB_NIGHTLY_BUILD" echo "FLB_JEMALLOC => $FLB_JEMALLOC" @@ -81,7 +79,6 @@ export DOCKER_BUILDKIT=1 # shellcheck disable=SC2086 if ! docker build \ --build-arg CMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \ - --build-arg FLB_TD="$FLB_TD" \ --build-arg FLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \ --build-arg FLB_JEMALLOC="$FLB_JEMALLOC" \ $FLB_ARG \ diff --git a/packaging/distros/amazonlinux/Dockerfile b/packaging/distros/amazonlinux/Dockerfile index c51106dd693..7ad41885aa0 100644 --- a/packaging/distros/amazonlinux/Dockerfile +++ b/packaging/distros/amazonlinux/Dockerfile @@ -15,10 +15,10 @@ FROM amazonlinux:2 as amazonlinux-2-base # hadolint ignore=DL3033 RUN yum -y update && \ yum install -y rpm-build curl ca-certificates gcc gcc-c++ cmake make bash \ - wget unzip systemd-devel wget flex bison \ - cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \ - postgresql-devel postgresql-libs \ - cmake3 libyaml-devel && \ + wget unzip systemd-devel wget flex bison \ + cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \ + postgresql-devel postgresql-libs \ + cmake3 libyaml-devel && \ yum clean all # amazonlinux/2.arm64v8 base image @@ -29,10 +29,10 @@ COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64 # hadolint ignore=DL3033 RUN yum -y update && \ yum install -y rpm-build ca-certificates gcc gcc-c++ cmake make bash \ - wget unzip systemd-devel wget flex bison \ - cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \ - postgresql-devel postgresql-libs \ - cmake3 libyaml-devel && \ + wget unzip systemd-devel wget flex bison \ + cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \ + postgresql-devel postgresql-libs \ + cmake3 libyaml-devel && \ yum clean all FROM amazonlinux:2022 as amazonlinux-2022-base @@ -40,10 +40,10 @@ FROM amazonlinux:2022 as amazonlinux-2022-base # hadolint ignore=DL3033 RUN yum -y update && \ yum install -y rpm-build ca-certificates gcc gcc-c++ cmake make bash \ - wget unzip systemd-devel wget flex bison \ - cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \ - postgresql-devel postgresql-libs \ - cmake3 libyaml-devel && \ + wget unzip systemd-devel wget flex bison \ + cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \ + postgresql-devel postgresql-libs \ + cmake3 libyaml-devel && \ yum clean all # hadolint ignore=DL3029 @@ -54,10 +54,10 @@ COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64 # hadolint ignore=DL3033 RUN yum -y update && \ yum install -y rpm-build ca-certificates gcc gcc-c++ cmake make bash \ - wget unzip systemd-devel wget flex bison \ - cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \ - postgresql-devel postgresql-libs \ - cmake3 libyaml-devel && \ + wget unzip systemd-devel wget flex bison \ + cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \ + postgresql-devel postgresql-libs \ + cmake3 libyaml-devel && \ yum clean all # Common build for all distributions now @@ -75,9 +75,8 @@ WORKDIR /tmp/fluent-bit/build/ # CMake configuration variables # Unused ARG CFLAGS -ARG CMAKE_INSTALL_PREFIX=/opt/td-agent-bit/ +ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/ ARG CMAKE_INSTALL_SYSCONFDIR=/etc/ -ARG FLB_TD=On ARG FLB_RELEASE=On ARG FLB_TRACE=On ARG FLB_SQLDB=On @@ -87,17 +86,16 @@ ARG FLB_OUT_PGSQL=On ARG FLB_JEMALLOC=On RUN cmake3 -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \ - -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \ - -DFLB_RELEASE="$FLB_RELEASE" \ - -DFLB_TRACE="$FLB_TRACE" \ - -DFLB_TD="$FLB_TD" \ - -DFLB_SQLDB="$FLB_SQLDB" \ - -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \ - -DFLB_OUT_KAFKA="$FLB_OUT_KAFKA" \ - -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \ - -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \ - -DFLB_JEMALLOC="${FLB_JEMALLOC}" \ - ../ + -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \ + -DFLB_RELEASE="$FLB_RELEASE" \ + -DFLB_TRACE="$FLB_TRACE" \ + -DFLB_SQLDB="$FLB_SQLDB" \ + -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \ + -DFLB_OUT_KAFKA="$FLB_OUT_KAFKA" \ + -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \ + -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \ + -DFLB_JEMALLOC="${FLB_JEMALLOC}" \ + ../ VOLUME [ "/output" ] CMD [ "/bin/bash", "-c", "make -j 4 && cpack3 -G RPM && cp *.rpm /output/" ] diff --git a/packaging/distros/centos/Dockerfile b/packaging/distros/centos/Dockerfile index bc4e2d2a933..99a9c5724a5 100644 --- a/packaging/distros/centos/Dockerfile +++ b/packaging/distros/centos/Dockerfile @@ -15,9 +15,9 @@ FROM centos:7 as centos-7-base # hadolint ignore=DL3033 RUN yum -y update && \ yum install -y rpm-build curl ca-certificates gcc gcc-c++ cmake make bash \ - wget unzip systemd-devel wget flex bison \ - cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \ - postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \ + wget unzip systemd-devel wget flex bison \ + cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \ + postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \ wget -q http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ rpm -ivh epel-release-latest-7.noarch.rpm && \ yum install -y cmake3 && \ @@ -34,9 +34,9 @@ COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64 # hadolint ignore=DL3033 RUN yum -y update && \ yum install -y rpm-build curl ca-certificates gcc gcc-c++ cmake make bash \ - wget unzip systemd-devel wget flex bison \ - cyrus-sasl-lib openssl openss-libs openssl-devel \ - postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \ + wget unzip systemd-devel wget flex bison \ + cyrus-sasl-lib openssl openss-libs openssl-devel \ + postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \ wget -q http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ rpm -ivh epel-release-latest-7.noarch.rpm && \ yum install -y cmake3 && \ @@ -63,9 +63,9 @@ RUN sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/CentOS-Linux-PowerTools.re # hadolint ignore=DL3033 RUN yum -y update && \ yum install -y rpm-build curl ca-certificates gcc gcc-c++ cmake make bash \ - wget unzip systemd-devel wget flex bison \ - postgresql-libs postgresql-devel postgresql-server postgresql \ - cyrus-sasl-lib openssl openssl-libs openssl-devel libyaml-devel && \ + wget unzip systemd-devel wget flex bison \ + postgresql-libs postgresql-devel postgresql-server postgresql \ + cyrus-sasl-lib openssl openssl-libs openssl-devel libyaml-devel && \ yum clean all ARG FLB_OUT_PGSQL=On @@ -86,9 +86,9 @@ RUN sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/CentOS-Linux-PowerTools.re # hadolint ignore=DL3033 RUN yum -y update && \ yum install -y rpm-build curl ca-certificates gcc gcc-c++ cmake make bash \ - wget unzip systemd-devel wget flex bison \ - postgresql-libs postgresql-devel postgresql-server postgresql \ - cyrus-sasl-lib openssl openssl-libs openssl-devel libyaml-devel && \ + wget unzip systemd-devel wget flex bison \ + postgresql-libs postgresql-devel postgresql-server postgresql \ + cyrus-sasl-lib openssl openssl-libs openssl-devel libyaml-devel && \ yum clean all ARG FLB_OUT_PGSQL=On @@ -104,9 +104,9 @@ FROM quay.io/centos/centos:stream9 as centos-9-base # hadolint ignore=DL3033,DL3041 RUN dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled crb && \ dnf -y install rpm-build ca-certificates gcc gcc-c++ cmake make bash \ - wget unzip systemd-devel wget flex bison \ - postgresql-libs postgresql-devel postgresql-server postgresql \ - cyrus-sasl-lib openssl openssl-libs openssl-devel libyaml-devel && \ + wget unzip systemd-devel wget flex bison \ + postgresql-libs postgresql-devel postgresql-server postgresql \ + cyrus-sasl-lib openssl openssl-libs openssl-devel libyaml-devel && \ dnf clean all ARG FLB_OUT_PGSQL=On @@ -121,9 +121,9 @@ COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64 # hadolint ignore=DL3033,DL3041 RUN dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled crb && \ dnf -y install rpm-build ca-certificates gcc gcc-c++ cmake make bash \ - wget unzip systemd-devel wget flex bison \ - postgresql-libs postgresql-devel postgresql-server postgresql \ - cyrus-sasl-lib openssl openssl-libs openssl-devel libyaml-devel && \ + wget unzip systemd-devel wget flex bison \ + postgresql-libs postgresql-devel postgresql-server postgresql \ + cyrus-sasl-lib openssl openssl-libs openssl-devel libyaml-devel && \ dnf clean all ARG FLB_OUT_PGSQL=On @@ -150,7 +150,6 @@ WORKDIR /tmp/fluent-bit/build/ ARG CFLAGS ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/ ARG CMAKE_INSTALL_SYSCONFDIR=/etc/ -ARG FLB_TD=Off ARG FLB_RELEASE=On ARG FLB_TRACE=On ARG FLB_SQLDB=On @@ -160,18 +159,17 @@ ARG FLB_JEMALLOC=On # cmake3 exists in every image - cmake references the older cmake2 in centos 7 RUN cmake3 -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \ - -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \ - -DFLB_RELEASE="$FLB_RELEASE" \ - -DFLB_TRACE="$FLB_TRACE" \ - -DFLB_TD="$FLB_TD" \ - -DFLB_SQLDB="$FLB_SQLDB" \ - -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \ - -DFLB_OUT_KAFKA="$FLB_OUT_KAFKA" \ - -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \ - -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \ - -DFLB_JEMALLOC_OPTIONS="$FLB_JEMALLOC_OPTIONS" \ - -DFLB_JEMALLOC="${FLB_JEMALLOC}" \ - ../ + -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \ + -DFLB_RELEASE="$FLB_RELEASE" \ + -DFLB_TRACE="$FLB_TRACE" \ + -DFLB_SQLDB="$FLB_SQLDB" \ + -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \ + -DFLB_OUT_KAFKA="$FLB_OUT_KAFKA" \ + -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \ + -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \ + -DFLB_JEMALLOC_OPTIONS="$FLB_JEMALLOC_OPTIONS" \ + -DFLB_JEMALLOC="${FLB_JEMALLOC}" \ + ../ VOLUME [ "/output" ] CMD [ "/bin/bash", "-c", "make -j 4 && cpack3 -G RPM && cp *.rpm /output/" ] diff --git a/packaging/distros/debian/Dockerfile b/packaging/distros/debian/Dockerfile index 3eb95155bf0..e611ad25c4c 100644 --- a/packaging/distros/debian/Dockerfile +++ b/packaging/distros/debian/Dockerfile @@ -15,12 +15,12 @@ ENV DEBIAN_FRONTEND noninteractive # hadolint ignore=DL3008,DL3015 RUN apt-get -qq update && \ - apt-get install -y -qq curl ca-certificates build-essential \ - cmake make bash sudo wget unzip dh-make \ - libsystemd-dev zlib1g-dev flex bison \ - libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev && \ - apt-get install -y -qq --reinstall lsb-base lsb-release + apt-get install -y curl ca-certificates build-essential \ + cmake make bash sudo wget unzip dh-make \ + libsystemd-dev zlib1g-dev flex bison \ + libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ + libsasl2-2 libsasl2-dev libyaml-dev && \ + apt-get install -y --reinstall lsb-base lsb-release # debian/buster.arm64v8 base image FROM arm64v8/debian:buster-slim as debian-buster.arm64v8-base @@ -30,12 +30,12 @@ COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64 # hadolint ignore=DL3008,DL3015 RUN apt-get -qq update && \ - apt-get install -y -qq curl ca-certificates build-essential \ - cmake make bash sudo wget unzip dh-make \ - libsystemd-dev zlib1g-dev flex bison \ - libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev && \ - apt-get install -y -qq --reinstall lsb-base lsb-release + apt-get install -y curl ca-certificates build-essential \ + cmake make bash sudo wget unzip dh-make \ + libsystemd-dev zlib1g-dev flex bison \ + libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ + libsasl2-2 libsasl2-dev libyaml-dev && \ + apt-get install -y --reinstall lsb-base lsb-release # debian/bullseye base image FROM debian:bullseye-slim as debian-bullseye-base @@ -43,12 +43,12 @@ ENV DEBIAN_FRONTEND noninteractive # hadolint ignore=DL3008,DL3015 RUN apt-get -qq update && \ - apt-get install -y -qq curl ca-certificates build-essential \ - cmake make bash sudo wget unzip dh-make \ - libsystemd-dev zlib1g-dev flex bison \ - libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev && \ - apt-get install -y -qq --reinstall lsb-base lsb-release + apt-get install -y curl ca-certificates build-essential \ + cmake make bash sudo wget unzip dh-make \ + libsystemd-dev zlib1g-dev flex bison \ + libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ + libsasl2-2 libsasl2-dev libyaml-dev && \ + apt-get install -y --reinstall lsb-base lsb-release # debian/bullseye.arm64v8 base image FROM arm64v8/debian:bullseye-slim as debian-bullseye.arm64v8-base @@ -58,12 +58,12 @@ COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64 # hadolint ignore=DL3008,DL3015 RUN apt-get -qq update && \ - apt-get install -y -qq curl ca-certificates build-essential \ - cmake make bash sudo wget unzip dh-make \ - libsystemd-dev zlib1g-dev flex bison \ - libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev && \ - apt-get install -y -qq --reinstall lsb-base lsb-release + apt-get install -y curl ca-certificates build-essential \ + cmake make bash sudo wget unzip dh-make \ + libsystemd-dev zlib1g-dev flex bison \ + libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ + libsasl2-2 libsasl2-dev libyaml-dev && \ + apt-get install -y --reinstall lsb-base lsb-release # Common build for all distributions now # hadolint ignore=DL3006 @@ -79,9 +79,8 @@ COPY . ./ WORKDIR /tmp/fluent-bit/build/ # CMake configuration variables ARG CFLAGS="-std=gnu99" -ARG CMAKE_INSTALL_PREFIX=/opt/td-agent-bit/ +ARG CMAKE_INSTALL_PREFIX=/opt/fuent-bit/ ARG CMAKE_INSTALL_SYSCONFDIR=/etc/ -ARG FLB_TD=On ARG FLB_RELEASE=On ARG FLB_TRACE=On ARG FLB_SQLDB=On @@ -92,17 +91,16 @@ ARG FLB_JEMALLOC=On ENV CFLAGS=$CFLAGS RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \ - -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \ - -DFLB_RELEASE="$FLB_RELEASE" \ - -DFLB_TRACE="$FLB_TRACE" \ - -DFLB_TD="$FLB_TD" \ - -DFLB_SQLDB="$FLB_SQLDB" \ - -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \ - -DFLB_OUT_KAFKA="$FLB_OUT_KAFKA" \ - -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \ - -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \ - -DFLB_JEMALLOC="${FLB_JEMALLOC}" \ - ../ + -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \ + -DFLB_RELEASE="$FLB_RELEASE" \ + -DFLB_TRACE="$FLB_TRACE" \ + -DFLB_SQLDB="$FLB_SQLDB" \ + -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \ + -DFLB_OUT_KAFKA="$FLB_OUT_KAFKA" \ + -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \ + -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \ + -DFLB_JEMALLOC="${FLB_JEMALLOC}" \ + ../ VOLUME [ "/output" ] CMD [ "/bin/bash", "-c", "make -j 4 && cpack -G DEB && cp *.deb /output/" ] diff --git a/packaging/distros/raspbian/Dockerfile b/packaging/distros/raspbian/Dockerfile index a0e8ba98808..bf530241fd1 100644 --- a/packaging/distros/raspbian/Dockerfile +++ b/packaging/distros/raspbian/Dockerfile @@ -14,26 +14,26 @@ ENV DEBIAN_FRONTEND noninteractive # Builder image so dependencies can be latest, recommended and no need to wipe # hadolint ignore=DL3008,DL3015 -RUN apt-get -qq update && \ - apt-get install -y -qq curl ca-certificates build-essential \ - cmake make bash sudo wget unzip dh-make \ - libsystemd-dev zlib1g-dev flex bison \ - libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev && \ - apt-get install -y -qq --reinstall lsb-base lsb-release +RUN apt-get update && \ + apt-get install -y curl ca-certificates build-essential \ + cmake make bash sudo wget unzip dh-make \ + libsystemd-dev zlib1g-dev flex bison \ + libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ + libsasl2-2 libsasl2-dev libyaml-dev && \ + apt-get install -y --reinstall lsb-base lsb-release # raspbian/bullseye base image FROM balenalib/rpi-raspbian:bullseye as raspbian-bullseye-base ENV DEBIAN_FRONTEND noninteractive # hadolint ignore=DL3008,DL3015 -RUN apt-get -qq update && \ - apt-get install -y -qq curl ca-certificates build-essential \ - cmake make bash sudo wget unzip dh-make \ - libsystemd-dev zlib1g-dev flex bison \ - libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev && \ - apt-get install -y -qq --reinstall lsb-base lsb-release +RUN apt-get update && \ + apt-get install -y curl ca-certificates build-essential \ + cmake make bash sudo wget unzip dh-make \ + libsystemd-dev zlib1g-dev flex bison \ + libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ + libsasl2-2 libsasl2-dev libyaml-dev && \ + apt-get install -y --reinstall lsb-base lsb-release # Common build for all distributions now # hadolint ignore=DL3006 @@ -49,9 +49,8 @@ COPY . ./ WORKDIR /tmp/fluent-bit/build/ # CMake configuration variables ARG CFLAGS="-std=gnu99" -ARG CMAKE_INSTALL_PREFIX=/opt/td-agent-bit/ +ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/ ARG CMAKE_INSTALL_SYSCONFDIR=/etc/ -ARG FLB_TD=On ARG FLB_RELEASE=On ARG FLB_TRACE=On ARG FLB_SQLDB=On @@ -62,17 +61,16 @@ ARG FLB_JEMALLOC=On ENV CFLAGS=$CFLAGS RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \ - -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \ - -DFLB_RELEASE="$FLB_RELEASE" \ - -DFLB_TRACE="$FLB_TRACE" \ - -DFLB_TD="$FLB_TD" \ - -DFLB_SQLDB="$FLB_SQLDB" \ - -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \ - -DFLB_OUT_KAFKA="$FLB_OUT_KAFKA" \ - -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \ - -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \ - -DFLB_JEMALLOC="${FLB_JEMALLOC}" \ - ../ + -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \ + -DFLB_RELEASE="$FLB_RELEASE" \ + -DFLB_TRACE="$FLB_TRACE" \ + -DFLB_SQLDB="$FLB_SQLDB" \ + -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \ + -DFLB_OUT_KAFKA="$FLB_OUT_KAFKA" \ + -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \ + -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \ + -DFLB_JEMALLOC="${FLB_JEMALLOC}" \ + ../ VOLUME [ "/output" ] CMD [ "/bin/bash", "-c", "make -j 4 && cpack -G DEB && cp *.deb /output/" ] diff --git a/packaging/distros/ubuntu/Dockerfile b/packaging/distros/ubuntu/Dockerfile index ce1f2e6b660..0cdcd2424bb 100644 --- a/packaging/distros/ubuntu/Dockerfile +++ b/packaging/distros/ubuntu/Dockerfile @@ -16,35 +16,35 @@ ENV DEBIAN_FRONTEND noninteractive # Using pipe below SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3008,DL3015 -RUN apt-get -qq update && \ - apt-get install -y -qq curl ca-certificates build-essential libsystemd-dev cmake \ +RUN apt-get update && \ + apt-get install -y curl ca-certificates build-essential libsystemd-dev cmake \ make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all software-properties-common \ software-properties-common libyaml-dev \ apt-transport-https ca-certificates && \ wget -q -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \ - gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \ - apt-add-repository 'deb https://apt.kitware.com/ubuntu/ xenial main' && \ - apt-get -qq update && \ - apt-get install -y -qq --reinstall lsb-base lsb-release cmake + gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \ + apt-add-repository 'deb https://apt.kitware.com/ubuntu/ xenial main' && \ + apt-get update && \ + apt-get install -y --reinstall lsb-base lsb-release cmake # ubuntu/18.04 base image FROM ubuntu:18.04 as ubuntu-18.04-base ENV DEBIAN_FRONTEND noninteractive # hadolint ignore=DL3008,DL3015 -RUN apt-get -qq update && \ - apt-get install -y -qq curl ca-certificates build-essential libsystemd-dev \ +RUN apt-get update && \ + apt-get install -y curl ca-certificates build-essential libsystemd-dev \ cmake make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all \ libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 \ software-properties-common libyaml-dev \ apt-transport-https ca-certificates && \ wget -q -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \ - gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \ - apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && \ - apt-get -qq update && \ - apt-get install -y -qq --reinstall lsb-base lsb-release cmake + gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \ + apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && \ + apt-get update && \ + apt-get install -y --reinstall lsb-base lsb-release cmake # ubuntu/18.04.arm64v8 base image FROM arm64v8/ubuntu:18.04 as ubuntu-18.04.arm64v8-base @@ -53,30 +53,30 @@ ENV DEBIAN_FRONTEND noninteractive COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static # hadolint ignore=DL3008,DL3015 -RUN apt-get -qq update && \ - apt-get install -y -qq curl ca-certificates build-essential libsystemd-dev \ +RUN apt-get update && \ + apt-get install -y curl ca-certificates build-essential libsystemd-dev \ cmake make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all \ libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 \ software-properties-common libyaml-dev \ apt-transport-https ca-certificates && \ wget -q -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \ - gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \ - apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && \ - apt-get -qq update && \ - apt-get install -y -qq --reinstall lsb-base lsb-release cmake + gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \ + apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && \ + apt-get update && \ + apt-get install -y --reinstall lsb-base lsb-release cmake # ubuntu/20.04 base image FROM ubuntu:20.04 as ubuntu-20.04-base ENV DEBIAN_FRONTEND noninteractive # hadolint ignore=DL3008,DL3015 -RUN apt-get -qq update && \ - apt-get install -y -qq curl ca-certificates build-essential libsystemd-dev \ +RUN apt-get update && \ + apt-get install -y curl ca-certificates build-essential libsystemd-dev \ cmake make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all \ libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libyaml-dev && \ - apt-get install -y -qq --reinstall lsb-base lsb-release + apt-get install -y --reinstall lsb-base lsb-release # ubuntu/20.04.arm64v8 base image FROM arm64v8/ubuntu:20.04 as ubuntu-20.04.arm64v8-base @@ -85,24 +85,24 @@ ENV DEBIAN_FRONTEND noninteractive COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static # hadolint ignore=DL3008,DL3015 -RUN apt-get -qq update && \ - apt-get install -y -qq curl ca-certificates build-essential libsystemd-dev \ +RUN apt-get update && \ + apt-get install -y curl ca-certificates build-essential libsystemd-dev \ cmake make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all \ libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libyaml-dev && \ - apt-get install -y -qq --reinstall lsb-base lsb-release + apt-get install -y --reinstall lsb-base lsb-release # ubuntu/22.04 base image FROM ubuntu:22.04 as ubuntu-22.04-base ENV DEBIAN_FRONTEND noninteractive # hadolint ignore=DL3008,DL3015 -RUN apt-get -qq update && \ - apt-get install -y -qq curl ca-certificates build-essential libsystemd-dev \ +RUN apt-get update && \ + apt-get install -y curl ca-certificates build-essential libsystemd-dev \ cmake make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all libpq5 \ libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev && \ - apt-get install -y -qq --reinstall lsb-base lsb-release + apt-get install -y --reinstall lsb-base lsb-release # ubuntu/22.04.arm64v8 base image FROM arm64v8/ubuntu:22.04 as ubuntu-22.04.arm64v8-base @@ -111,12 +111,12 @@ ENV DEBIAN_FRONTEND noninteractive COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static # hadolint ignore=DL3008,DL3015 -RUN apt-get -qq update && \ - apt-get install -y -qq curl ca-certificates build-essential libsystemd-dev \ +RUN apt-get update && \ + apt-get install -y curl ca-certificates build-essential libsystemd-dev \ cmake make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all libpq5 \ libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev && \ - apt-get install -y -qq --reinstall lsb-base lsb-release + apt-get install -y --reinstall lsb-base lsb-release # Common build for all distributions now # hadolint ignore=DL3006 @@ -132,9 +132,8 @@ COPY . ./ WORKDIR /tmp/fluent-bit/build/ # CMake configuration variables ARG CFLAGS="-std=gnu99" -ARG CMAKE_INSTALL_PREFIX=/opt/td-agent-bit/ +ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/ ARG CMAKE_INSTALL_SYSCONFDIR=/etc/ -ARG FLB_TD=On ARG FLB_RELEASE=On ARG FLB_TRACE=On ARG FLB_SQLDB=On @@ -145,17 +144,16 @@ ARG FLB_JEMALLOC=On ENV CFLAGS=$CFLAGS RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \ - -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \ - -DFLB_RELEASE="$FLB_RELEASE" \ - -DFLB_TRACE="$FLB_TRACE" \ - -DFLB_TD="$FLB_TD" \ - -DFLB_SQLDB="$FLB_SQLDB" \ - -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \ - -DFLB_OUT_KAFKA="$FLB_OUT_KAFKA" \ - -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \ - -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \ - -DFLB_JEMALLOC="${FLB_JEMALLOC}" \ - ../ + -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \ + -DFLB_RELEASE="$FLB_RELEASE" \ + -DFLB_TRACE="$FLB_TRACE" \ + -DFLB_SQLDB="$FLB_SQLDB" \ + -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \ + -DFLB_OUT_KAFKA="$FLB_OUT_KAFKA" \ + -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \ + -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \ + -DFLB_JEMALLOC="${FLB_JEMALLOC}" \ + ../ VOLUME [ "/output" ] CMD [ "/bin/bash", "-c", "make -j 4 && cpack -G DEB && cp *.deb /output/" ] diff --git a/packaging/testing/smoke/packages/Dockerfile.amazonlinux2 b/packaging/testing/smoke/packages/Dockerfile.amazonlinux2 index b836c3aa124..b8f04befbf7 100644 --- a/packaging/testing/smoke/packages/Dockerfile.amazonlinux2 +++ b/packaging/testing/smoke/packages/Dockerfile.amazonlinux2 @@ -4,6 +4,7 @@ ARG STAGING_BASE=dokken/amazonlinux-2 ARG RELEASE_URL=https://packages.fluentbit.io ARG RELEASE_KEY=https://packages.fluentbit.io/fluentbit.key +# hadolint ignore=DL3006 FROM dokken/amazonlinux-2 as official-install ARG RELEASE_URL @@ -14,7 +15,7 @@ ENV FLUENT_BIT_PACKAGES_KEY=${RELEASE_KEY} SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN curl https://raw.githubusercontent.com/fluent/fluent-bit/master/install.sh | sh -RUN systemctl enable fluent-bit || systemctl enable td-agent-bit +RUN systemctl enable fluent-bit COPY ./test.sh /test.sh RUN chmod a+x /test.sh @@ -22,6 +23,7 @@ RUN chmod a+x /test.sh FROM official-install as staging-upgrade-prep RUN rm -f /etc/yum.repos.d/*-bit.repo +# hadolint ignore=DL3006 FROM ${STAGING_BASE} as staging-install ARG STAGING_VERSION ENV STAGING_VERSION=${STAGING_VERSION} diff --git a/packaging/testing/smoke/packages/Dockerfile.centos7 b/packaging/testing/smoke/packages/Dockerfile.centos7 index cbd6f229fcc..d55404a3c25 100644 --- a/packaging/testing/smoke/packages/Dockerfile.centos7 +++ b/packaging/testing/smoke/packages/Dockerfile.centos7 @@ -4,6 +4,7 @@ ARG STAGING_BASE=dokken/centos-7 ARG RELEASE_URL=https://packages.fluentbit.io ARG RELEASE_KEY=https://packages.fluentbit.io/fluentbit.key +# hadolint ignore=DL3006 FROM dokken/centos-7 as official-install ARG RELEASE_URL @@ -15,7 +16,7 @@ ENV FLUENT_BIT_PACKAGES_KEY=${RELEASE_KEY} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Use the one-line install RUN curl https://raw.githubusercontent.com/fluent/fluent-bit/master/install.sh | sh -RUN systemctl enable fluent-bit || systemctl enable td-agent-bit +RUN systemctl enable fluent-bit COPY ./test.sh /test.sh RUN chmod a+x /test.sh @@ -23,6 +24,7 @@ RUN chmod a+x /test.sh FROM official-install as staging-upgrade-prep RUN rm -f /etc/yum.repos.d/*-bit.repo +# hadolint ignore=DL3006 FROM ${STAGING_BASE} as staging-install ARG STAGING_VERSION ENV STAGING_VERSION=${STAGING_VERSION} diff --git a/packaging/testing/smoke/packages/Dockerfile.centos8 b/packaging/testing/smoke/packages/Dockerfile.centos8 index 30ef6dd3d36..eb04d3fcd4a 100644 --- a/packaging/testing/smoke/packages/Dockerfile.centos8 +++ b/packaging/testing/smoke/packages/Dockerfile.centos8 @@ -4,6 +4,7 @@ ARG STAGING_BASE=dokken/centos-8 ARG RELEASE_URL=https://packages.fluentbit.io ARG RELEASE_KEY=https://packages.fluentbit.io/fluentbit.key +# hadolint ignore=DL3006 FROM dokken/centos-8 as official-install # CentOS is now EOL so have to use the vault repos RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && \ @@ -17,7 +18,7 @@ ENV FLUENT_BIT_PACKAGES_KEY=${RELEASE_KEY} SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN curl https://raw.githubusercontent.com/fluent/fluent-bit/master/install.sh | sh -RUN systemctl enable fluent-bit || systemctl enable td-agent-bit +RUN systemctl enable fluent-bit COPY ./test.sh /test.sh RUN chmod a+x /test.sh @@ -25,6 +26,7 @@ RUN chmod a+x /test.sh FROM official-install as staging-upgrade-prep RUN rm -f /etc/yum.repos.d/*-bit.repo +# hadolint ignore=DL3006 FROM ${STAGING_BASE} as staging-install # CentOS is now EOL so have to use the vault repos RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && \ diff --git a/packaging/testing/smoke/packages/Dockerfile.debian10 b/packaging/testing/smoke/packages/Dockerfile.debian10 index 03242f8c8ac..ee18950c57e 100644 --- a/packaging/testing/smoke/packages/Dockerfile.debian10 +++ b/packaging/testing/smoke/packages/Dockerfile.debian10 @@ -4,6 +4,7 @@ ARG STAGING_BASE=dokken/debian-10 ARG RELEASE_URL=https://packages.fluentbit.io ARG RELEASE_KEY=https://packages.fluentbit.io/fluentbit.key +# hadolint ignore=DL3006 FROM dokken/debian-10 as official-install ARG RELEASE_URL @@ -15,7 +16,7 @@ ENV FLUENT_BIT_PACKAGES_KEY=${RELEASE_KEY} # Use the one-line install SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN curl https://raw.githubusercontent.com/fluent/fluent-bit/master/install.sh | sh -RUN systemctl enable fluent-bit || systemctl enable td-agent-bit +RUN systemctl enable fluent-bit COPY ./test.sh /test.sh RUN chmod a+x /test.sh @@ -23,6 +24,7 @@ RUN chmod a+x /test.sh FROM official-install as staging-upgrade-prep RUN rm -f /etc/apt/sources.list.d/fluent-bit.list +# hadolint ignore=DL3006 FROM ${STAGING_BASE} as staging-install ARG STAGING_VERSION ENV STAGING_VERSION=${STAGING_VERSION} diff --git a/packaging/testing/smoke/packages/Dockerfile.debian11 b/packaging/testing/smoke/packages/Dockerfile.debian11 index 1a8d3c045b1..7cc5396039f 100644 --- a/packaging/testing/smoke/packages/Dockerfile.debian11 +++ b/packaging/testing/smoke/packages/Dockerfile.debian11 @@ -4,6 +4,7 @@ ARG STAGING_BASE=dokken/debian-11 ARG RELEASE_URL=https://packages.fluentbit.io ARG RELEASE_KEY=https://packages.fluentbit.io/fluentbit.key +# hadolint ignore=DL3006 FROM dokken/debian-11 as official-install ARG RELEASE_URL @@ -14,7 +15,7 @@ ENV FLUENT_BIT_PACKAGES_KEY=${RELEASE_KEY} SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN curl https://raw.githubusercontent.com/fluent/fluent-bit/master/install.sh | sh -RUN systemctl enable fluent-bit || systemctl enable td-agent-bit +RUN systemctl enable fluent-bit COPY ./test.sh /test.sh RUN chmod a+x /test.sh @@ -22,6 +23,7 @@ RUN chmod a+x /test.sh FROM official-install as staging-upgrade-prep RUN rm -f /etc/apt/sources.list.d/fluent-bit.list +# hadolint ignore=DL3006 FROM ${STAGING_BASE} as staging-install ARG STAGING_VERSION ENV STAGING_VERSION=${STAGING_VERSION} diff --git a/packaging/testing/smoke/packages/Dockerfile.ubuntu1804 b/packaging/testing/smoke/packages/Dockerfile.ubuntu1804 index 8ffbff0b210..b832d305438 100644 --- a/packaging/testing/smoke/packages/Dockerfile.ubuntu1804 +++ b/packaging/testing/smoke/packages/Dockerfile.ubuntu1804 @@ -4,6 +4,7 @@ ARG STAGING_BASE=dokken/ubuntu-18.04 ARG RELEASE_URL=https://packages.fluentbit.io ARG RELEASE_KEY=https://packages.fluentbit.io/fluentbit.key +# hadolint ignore=DL3006 FROM dokken/ubuntu-18.04 as official-install SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -15,7 +16,7 @@ ENV FLUENT_BIT_PACKAGES_KEY=${RELEASE_KEY} # Use the one-line install RUN curl https://raw.githubusercontent.com/fluent/fluent-bit/master/install.sh | sh -RUN systemctl enable fluent-bit || systemctl enable td-agent-bit +RUN systemctl enable fluent-bit COPY ./test.sh /test.sh RUN chmod a+x /test.sh @@ -23,6 +24,7 @@ RUN chmod a+x /test.sh FROM official-install as staging-upgrade-prep RUN rm -f /etc/apt/sources.list.d/fluent-bit.list +# hadolint ignore=DL3006 FROM ${STAGING_BASE} as staging-install ARG STAGING_VERSION diff --git a/packaging/testing/smoke/packages/Dockerfile.ubuntu2004 b/packaging/testing/smoke/packages/Dockerfile.ubuntu2004 index 3132e74f1a8..fa96a0971bb 100644 --- a/packaging/testing/smoke/packages/Dockerfile.ubuntu2004 +++ b/packaging/testing/smoke/packages/Dockerfile.ubuntu2004 @@ -4,6 +4,7 @@ ARG STAGING_BASE=dokken/ubuntu-20.04 ARG RELEASE_URL=https://packages.fluentbit.io ARG RELEASE_KEY=https://packages.fluentbit.io/fluentbit.key +# hadolint ignore=DL3006 FROM dokken/ubuntu-20.04 as official-install SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -15,7 +16,7 @@ ENV FLUENT_BIT_PACKAGES_KEY=${RELEASE_KEY} # Use the one-line install RUN curl https://raw.githubusercontent.com/fluent/fluent-bit/master/install.sh | sh -RUN systemctl enable fluent-bit || systemctl enable td-agent-bit +RUN systemctl enable fluent-bit COPY ./test.sh /test.sh RUN chmod a+x /test.sh @@ -23,6 +24,7 @@ RUN chmod a+x /test.sh FROM official-install as staging-upgrade-prep RUN rm -f /etc/apt/sources.list.d/fluent-bit.list +# hadolint ignore=DL3006 FROM ${STAGING_BASE} as staging-install ARG STAGING_VERSION ENV STAGING_VERSION=${STAGING_VERSION} diff --git a/packaging/update-repos.sh b/packaging/update-repos.sh index 95b2321cee5..f8a2b7732bd 100755 --- a/packaging/update-repos.sh +++ b/packaging/update-repos.sh @@ -15,7 +15,7 @@ if [[ "$DISABLE_SIGNING" != "true" ]]; then rpm -q gpg-pubkey --qf '%{name}-%{version}-%{release} --> %{summary}\n' fi -RPM_REPO_PATHS=("amazonlinux/2" "centos/7" "centos/8" "centos/9") +RPM_REPO_PATHS=("amazonlinux/2" "amazonlinux/2022" "centos/7" "centos/8" "centos/9") for RPM_REPO in "${RPM_REPO_PATHS[@]}"; do echo "Updating $RPM_REPO" @@ -23,7 +23,7 @@ for RPM_REPO in "${RPM_REPO_PATHS[@]}"; do [[ ! -d "$REPO_DIR" ]] && continue if [[ "$DISABLE_SIGNING" != "true" ]]; then - # Sign all RPMs created for this target, cover both fluent-bit and td-agent-bit packages + # Sign all RPMs created for this target, cover both fluent-bit and legacy packages for 1.9 branch find "$REPO_DIR" -name "*-bit-*.rpm" -exec rpm --define "_gpg_name $GPG_KEY" --addsign {} \; fi # Create full metadata for all RPMs in the directory