diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000000000..d5375e5f1285b --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,10 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +version: 2 +# Check for updates to GitHub Actions every week +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" \ No newline at end of file diff --git a/.github/workflows/.env b/.github/workflows/.env deleted file mode 100644 index fc3aa13b28ccb..0000000000000 --- a/.github/workflows/.env +++ /dev/null @@ -1,9 +0,0 @@ -BITNAMI_TEAM='["Akinorev","CeliaGMqrz","ClaaudiaGarcia","FraPazGal","Javirln","Mauraza","agarcia-oss","alemorcuq","alexherp","alvneiayu","andresbono","antgamdia","aoterolorenzo","beltran-rubo","bitnami-bot","carlossm","carrodher","castelblanque","corico44","cscazorla","dani8art","dariver","dcristobalhMad","dgomezleon","fevisera","fjagugar","fmulero","gdelgadot","gfichtenholt","gongomgra","javsalgar","jbianquetti-nami","jiparis","joancafom","jotadrilo","jotamartos","juamedgod","juan131","kaysavps","mdhont","migruiz4","mpermar","pablogalegoc","ppbaena","rafariossaa","rloporp","rogelio-o","tompizmor","xoanteis","zubero"]' -IN_PROGRESS_COLUMN_ID=19026822 -TRIAGE_COLUMN_ID=19026814 -SOLVED_COLUMN_ID=19026825 -ON_HOLD_COLUMN_ID=19026824 -BITNAMI_COLUMN_ID=19026818 -PENDING_COLUMN_ID=19026823 -SUPPORT_TEAM_NAME='containers-support' -TRIAGE_TEAM_NAME='containers-triage' diff --git a/.github/workflows/assign-asset-label.yml b/.github/workflows/assign-asset-label.yml index fa7a0d6dd8131..89786fb049f20 100644 --- a/.github/workflows/assign-asset-label.yml +++ b/.github/workflows/assign-asset-label.yml @@ -1,3 +1,6 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + name: '[Support] Assign asset label' on: pull_request_target: @@ -34,7 +37,7 @@ jobs: echo "name=${assets}" >> $GITHUB_OUTPUT fi - name: Show messages - uses: actions/github-script@v6 + uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea with: script: | if ("${{ steps.get-asset.outputs.result }}" != "ok" ) { @@ -44,6 +47,6 @@ jobs: } - name: Labeling if: ${{ steps.get-asset.outputs.result == 'ok' }} - uses: fmulero/labeler@1.1.0 + uses: fmulero/labeler@d3ef0aadb212cd1656bd6d5ce1e772787bf1682b with: add-labels: "${{ steps.get-asset.outputs.name }}" diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml index 4b19332d71154..4272158b0b49d 100644 --- a/.github/workflows/ci-pipeline.yml +++ b/.github/workflows/ci-pipeline.yml @@ -8,57 +8,15 @@ on: # rebuild any PRs and main branch changes - main - bitnami:main permissions: {} -env: - CSP_API_URL: https://console.cloud.vmware.com - CSP_API_TOKEN: ${{ secrets.CSP_API_TESTING_TOKEN }} - VIB_PUBLIC_URL: https://cp.bromelia.vmware.com # Avoid concurrency over the same PR concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number }} jobs: - license-headers-linter: - runs-on: ubuntu-latest - name: License Headers Linter - permissions: - contents: read - pull-requests: write - steps: - - uses: actions/checkout@v3 - name: Checkout Repository - with: - ref: ${{ github.event.pull_request.head.ref }} - repository: ${{ github.event.pull_request.head.repo.full_name }} - - id: get-modified-files - name: 'Get modified files' - env: - DIFF_URL: "${{github.event.pull_request.diff_url}}" - TEMP_FILE: "${{runner.temp}}/pr-${{github.event.number}}.diff" - run: | - # This request doesn't consume API calls. - curl -Lkso $TEMP_FILE $DIFF_URL - files_changed="$(sed -nr 's/[\-\+]{3} [ab]\/(.*)/\1/p' $TEMP_FILE | sort | uniq)" - dockerfiles=() - while read -r file_changed; do - # Avoid removed files - if [[ -f "${file_changed}" ]]; then - dockerfiles+=("${file_changed}") - fi - done <<< "$(echo "$files_changed" | grep -oE ".*/Dockerfile$" | sort | uniq || true)" - if [[ ${#dockerfiles[@]} -gt 0 ]]; then - # There are modifications on dockerfiles - export dockerfiles_json=$(printf "%s\n" "${dockerfiles[@]}" | jq -R . | jq -cs .) - # Overwrite configuration file to analyze only changed dockerfiles - yq -i '. | .header.paths=env(dockerfiles_json)' .licenserc.yaml - echo "result=success" >> $GITHUB_OUTPUT - else - echo "result=skip" >> $GITHUB_OUTPUT - fi - - name: Check license Headers - uses: apache/skywalking-eyes/header@v0.4.0 - if: ${{ steps.get-modified-files.outputs.result == 'success' }} get-containers: runs-on: ubuntu-latest name: Get modified containers + permissions: + pull-requests: read if: | github.event.pull_request.state != 'closed' && ( @@ -67,20 +25,20 @@ jobs: outputs: result: ${{ steps.get-containers.outputs.result }} containers: ${{ steps.get-containers.outputs.containers }} + dockerfiles: ${{ steps.get-containers.outputs.dockerfiles }} steps: - id: get-containers name: Get modified containers env: - DIFF_URL: "${{github.event.pull_request.diff_url}}" - TEMP_FILE: "${{runner.temp}}/pr-${{github.event.number}}.diff" + PULL_REQUEST_NUMBER: "${{ github.event.pull_request.number }}" + GITHUB_TOKEN: "${{ github.token }}" run: | - # This request doesn't consume API calls. - curl -Lkso $TEMP_FILE $DIFF_URL - files_changed="$(sed -nr 's/[\-\+]{3} [ab]\/(.*)/\1/p' $TEMP_FILE | sort | uniq)" + files_changed="$(gh api --paginate /repos/${GITHUB_REPOSITORY}/pulls/${PULL_REQUEST_NUMBER}/files | jq -r '.[] | .filename')" # Adding || true to avoid "Process exited with code 1" errors flavors=($(echo "$files_changed" | xargs dirname | grep -o "^bitnami/[^/]*/[^/]*/[^/]*" | sort | uniq || true)) assets=($(echo "$files_changed" | xargs dirname | sed -nr "s|bitnami/([^/]*)/.*|\1|p" | sort | uniq || true)) non_readme_files=$(echo "$files_changed" | grep -vc "\.md" || true) + dockerfiles=($(echo "$files_changed" | grep -oE ".*/Dockerfile$" | sort | uniq || true)) if [[ "$non_readme_files" -le "0" ]]; then # The only changes are .md files -> SKIP @@ -90,9 +48,39 @@ jobs: echo "result=skip" >> $GITHUB_OUTPUT else containers_json=$(printf "%s\n" "${flavors[@]}" | jq -R . | jq -cs .) + dockerfiles_json=$(printf "%s\n" "${dockerfiles[@]}" | jq -R . | jq -cs .) echo "result=ok" >> $GITHUB_OUTPUT echo "containers=${containers_json}" >> $GITHUB_OUTPUT + echo "dockerfiles=${dockerfiles_json}" >> $GITHUB_OUTPUT fi + license-headers-linter: + runs-on: ubuntu-latest + name: License Headers Linter + permissions: + contents: read + pull-requests: write + needs: get-containers + steps: + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + name: Checkout Repository + with: + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} + - id: get-modified-files + name: 'Get modified files' + env: + DOCKERFILES: "${{ needs.get-containers.outputs.dockerfiles }}" + run: | + if [[ -n "${DOCKERFILES}" ]]; then + # Overwrite configuration file to analyze only changed dockerfiles + yq -i '. | .header.paths=env(DOCKERFILES)' .licenserc.yaml + echo "result=success" >> $GITHUB_OUTPUT + else + echo "result=skip" >> $GITHUB_OUTPUT + fi + - name: Check license Headers + uses: apache/skywalking-eyes/header@6b2529214f6b1ccee3ec92bb0adfeabf6f66f538 + if: ${{ steps.get-modified-files.outputs.result == 'success' }} vib-verify: runs-on: ubuntu-latest needs: get-containers @@ -103,6 +91,10 @@ jobs: name: VIB Verify permissions: contents: read + env: + CSP_API_URL: https://console.cloud.vmware.com + CSP_API_TOKEN: ${{ secrets.CSP_API_TESTING_TOKEN }} + VIB_PUBLIC_URL: https://cp.bromelia.vmware.com continue-on-error: false strategy: fail-fast: false @@ -110,7 +102,7 @@ jobs: matrix: container: ${{ fromJSON(needs.get-containers.outputs.containers) }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 name: Checkout Repository with: # Full history is not required anymore @@ -174,7 +166,7 @@ jobs: steps: - id: get-status name: Check Status - uses: actions/github-script@v6 + uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea with: result-encoding: string script: | @@ -224,12 +216,20 @@ jobs: # Approve the CI's PR automatically, as it has been tested in our internal pipeline already # Approved by the 'github-actions' user; a PR can't be approved by its author - name: PR Approval - uses: hmarr/auto-approve-action@v3.0.0 + uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea with: - pull-request-number: ${{ github.event.number }} + result-encoding: string + retries: 3 + script: | + github.rest.pulls.createReview({ + owner: context.repo.owner, + repo: context.repo.repo, + pull_number: context.issue.number, + event: 'APPROVE', + }); - name: Merge id: merge - uses: actions/github-script@v6 + uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea with: result-encoding: string retries: 3 @@ -246,10 +246,18 @@ jobs: # post a comment on the PR and assign a maintainer agent to review it - name: Manual review required if: ${{ always() && steps.merge.outcome != 'success' }} - uses: peter-evans/create-or-update-comment@v3.0.0 - with: - issue-number: ${{ github.event.number }} - # Necessary to trigger support workflows - token: ${{ secrets.BITNAMI_BOT_TOKEN }} - body: | + uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea + env: + BODY: | There has been an error during the automated release process. Manual revision is now required. + Please check the related [action_run#${{ github.run_id }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) for more information. + with: + retries: 3 + script: | + const {BODY} = process.env + github.rest.issues.createComment({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + body: `${BODY}` + }) diff --git a/.github/workflows/clossing-issues.yml b/.github/workflows/clossing-issues.yml index 8d2c612fd9e9d..4663144092d77 100644 --- a/.github/workflows/clossing-issues.yml +++ b/.github/workflows/clossing-issues.yml @@ -1,5 +1,9 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + name: '[Support] Close Solved issues' on: + workflow_dispatch: schedule: # Hourly - cron: '0 * * * *' @@ -9,7 +13,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v6.0.1 + - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e with: any-of-labels: 'solved' stale-issue-label: 'solved' diff --git a/.github/workflows/comments.yml b/.github/workflows/comments.yml index b8eaaa1d5caf3..017f8837f594a 100644 --- a/.github/workflows/comments.yml +++ b/.github/workflows/comments.yml @@ -1,54 +1,19 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + name: '[Support] Comments based card movements' on: issue_comment: types: - created -# Remove all permissions by default -permissions: {} +permissions: + contents: read + pull-requests: write + issues: write # Avoid concurrency over the same issue concurrency: group: card-movement-${{ github.event.issue.number }} jobs: - comments_handler: - runs-on: ubuntu-latest - permissions: - contents: read - repository-projects: write - issues: read - pull-requests: read - steps: - - name: Repo checkout - uses: actions/checkout@v3 - - name: Load .env file - uses: xom9ikk/dotenv@v2 - with: - path: .github/workflows/ - - name: Move into Pending - uses: peter-evans/create-or-update-project-card@v2 - if: | - (github.actor != 'bitnami-bot' || github.event.issue.user.login != 'bitnami-bot' || github.event.issue.pull_request == null) && - contains(fromJson(env.BITNAMI_TEAM), github.actor) && - (!contains(github.event.issue.labels.*.name, 'bitnami')) - with: - project-name: Support - column-name: Pending - - name: Move into In Progress - uses: peter-evans/create-or-update-project-card@v2 - if: | - (github.actor != 'bitnami-bot' || github.event.issue.user.login != 'bitnami-bot' || github.event.issue.pull_request == null) && - (!contains(fromJson(env.BITNAMI_TEAM), github.actor)) && - contains(github.event.issue.labels.*.name, 'in-progress') - with: - project-name: Support - column-name: In progress - - name: Move into Triage - uses: peter-evans/create-or-update-project-card@v2 - if: | - (github.actor != 'bitnami-bot' || github.event.issue.user.login != 'bitnami-bot' || github.event.issue.pull_request == null) && - (!contains(fromJson(env.BITNAMI_TEAM), github.actor)) && - (!contains(github.event.issue.labels.*.name, 'in-progress')) - with: - project-name: Support - column-name: Triage - # Needs reasignation of the task - token: "${{ secrets.BITNAMI_BOT_TOKEN }}" + call-comments-workflow: + uses: bitnami/support/.github/workflows/comment-created.yml@main + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/delete-solved-cards.yml b/.github/workflows/delete-solved-cards.yml deleted file mode 100644 index 4b9bd59bf8668..0000000000000 --- a/.github/workflows/delete-solved-cards.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: '[Support] Delete Solved cards' -on: - workflow_dispatch: - schedule: - # Every 2 hours - - cron: '15 0/2 * * *' -# Remove all permissions by default -permissions: {} -jobs: - delete-cards: - runs-on: ubuntu-latest - permissions: - repository-projects: write - contents: read - steps: - - name: Repo checkout - uses: actions/checkout@v3 - with: - fetch-depth: 1 - - name: Load .env file - uses: xom9ikk/dotenv@v2 - with: - path: .github/workflows/ - - uses: actions/github-script@v6 - with: - script: | - const {data: cards} = await github.rest.projects.listCards({ - column_id: ${{ env.SOLVED_COLUMN_ID }}, - archived_state: 'all', - per_page: 100 - }); - // Remove cards without updates in last week. - const comparedDate = new Date(); - comparedDate.setDate(comparedDate.getDate() - 7); - cards.forEach(card => { - const lastUpdate = new Date(card.updated_at); - if (card.archived || lastUpdate < comparedDate ) { - github.rest.projects.deleteCard({ - card_id: card.id - }); - } - }); diff --git a/.github/workflows/markdown-linter.yml b/.github/workflows/markdown-linter.yml index a63138114c149..3721df4bb6d6d 100644 --- a/.github/workflows/markdown-linter.yml +++ b/.github/workflows/markdown-linter.yml @@ -1,3 +1,6 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + name: '[CI/CD] Markdown linter' on: pull_request: @@ -16,20 +19,21 @@ jobs: - name: Install mardownlint run: npm install -g markdownlint-cli@0.33.0 - name: Checkout project - uses: actions/checkout@v3 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - name: Execute markdownlint env: DIFF_URL: "${{github.event.pull_request.diff_url}}" TEMP_FILE: "${{runner.temp}}/pr-${{github.event.number}}.diff" + TEMP_OUTPUT: "${{runner.temp}}/output" run: | # This request doesn't consume API calls. curl -Lkso $TEMP_FILE $DIFF_URL files_changed="$(sed -nr 's/[\-\+]{3} [ab]\/(.*)/\1/p' $TEMP_FILE | sort | uniq)" md_files="$(echo "$files_changed" | grep -o ".*\.md$" | sort | uniq || true)" # Create an empty file, useful when the PR changes ignored files - touch ${{runner.temp}}/output + touch "${TEMP_OUTPUT}" exit_code=0 - markdownlint -o ${{runner.temp}}/output ${md_files[@]} || exit_code=$? + markdownlint -o "${TEMP_OUTPUT}" ${md_files[@]} || exit_code=$? while read -r line; do # line format: # file:row[:column] message @@ -45,7 +49,7 @@ jobs: else echo "::warning:: Error processing: ${line}" fi - done < ${{runner.temp}}/output + done < "${TEMP_OUTPUT}" if [[ $exit_code -ne 0 ]]; then echo "::error:: Please review linter messages" exit "$exit_code" diff --git a/.github/workflows/migration.yml b/.github/workflows/migration.yml new file mode 100644 index 0000000000000..ae86cb4fb5a13 --- /dev/null +++ b/.github/workflows/migration.yml @@ -0,0 +1,17 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +name: '[Support] Cards migration' +on: [ workflow_dispatch ] +permissions: {} +jobs: + call-migration-workflow: + uses: bitnami/support/.github/workflows/migrate-reusable.yml@main + with: + organization: bitnami + legacy_project_board_name: Support + new_project_number: 4 + repo: ${{ github.event.repository.name }} + secrets: + # This token should have access to both projects and at least read:project permissions + token: ${{ secrets.MIGRATION_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/move-closed-issues.yml b/.github/workflows/move-closed-issues.yml index e2113f094aa3c..7abde6b9ad9a4 100644 --- a/.github/workflows/move-closed-issues.yml +++ b/.github/workflows/move-closed-issues.yml @@ -1,3 +1,6 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + name: '[Support] Move closed issues' on: issues: @@ -6,24 +9,13 @@ on: pull_request_target: types: - closed -# Remove all permissions by default. Actions are performed by Bitnami Bot -permissions: {} +permissions: + issues: write + pull-requests: write # Avoid concurrency over the same issue concurrency: - group: card-movement-${{ github.event_name != 'issues' && github.event.number || github.event.issue.number }} + group: card-movement-${{ github.event.issue != null && github.event.issue.number || github.event.number }} jobs: - send_to_solved: - runs-on: ubuntu-latest - steps: - - name: Send to the Solved column - id: send-solved - uses: peter-evans/create-or-update-project-card@v2 - # Send to solve only the issues and PRs created by users or the automated PRs with human review required - if: | - (github.event.issue != null && github.event.issue.user.login != 'bitnami-bot') || - (github.event.issue == null && (github.event.pull_request.user.login != 'bitnami-bot' || contains(github.event.pull_request.labels.*.name, 'review-required'))) - with: - project-name: Support - column-name: 'Solved' - token: "${{ secrets.BITNAMI_BOT_TOKEN }}" - issue-number: ${{ github.event_name != 'issues' && github.event.number || github.event.issue.number }} + call-move-closed-workflow: + uses: bitnami/support/.github/workflows/item-closed.yml@main + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/moving-cards.yml b/.github/workflows/moving-cards.yml deleted file mode 100644 index 93d6b353c16d4..0000000000000 --- a/.github/workflows/moving-cards.yml +++ /dev/null @@ -1,146 +0,0 @@ -# This workflow is built to manage the triage support by using GH issues. -name: '[Support] Cards movements' -on: - project_card: - types: - - created - - moved -# Remove all permissions by default -permissions: {} -jobs: - get-issue: - runs-on: ubuntu-latest - name: Get issue info - permissions: - issues: read - pull-requests: read - outputs: - assignees: ${{ steps.get-issue-step.outputs.assignees }} - author: ${{ steps.get-issue-step.outputs.author }} - type: ${{ steps.get-issue-step.outputs.type }} - draft: ${{ steps.get-issue-step.outputs.draft }} - number: ${{ steps.get-issue-step.outputs.number }} - steps: - - name: Get issue info - id: get-issue-step - run: | - issue_info=$(curl -s --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' -X GET -G "${{ github.event.project_card.content_url }}" ) - assignees="$(echo $issue_info | jq -cr '.assignees')" - author="$(echo $issue_info | jq -r '.user.login')" - pull_request="$(echo $issue_info | jq -r '.pull_request')" - draft="$(echo $issue_info | jq -r '.draft' | sed -r "s|null|false|g")" - number="$(echo $issue_info | jq -r '.number')" - type="pull_request" - if [[ "${pull_request}" == "null" ]]; then - type="issue" - fi - echo "assignees=${assignees}" >> $GITHUB_OUTPUT - echo "author=${author}" >> $GITHUB_OUTPUT - echo "type=${type}" >> $GITHUB_OUTPUT - echo "draft=${draft}" >> $GITHUB_OUTPUT - echo "number=${number}" >> $GITHUB_OUTPUT - label-card: - runs-on: ubuntu-latest - permissions: - contents: read - issues: write - pull-requests: write - needs: - - get-issue - steps: - - name: Repo checkout - uses: actions/checkout@v3 - with: - fetch-depth: 1 - - name: Load .env file - uses: xom9ikk/dotenv@v2 - with: - path: .github/workflows/ - # Now handling the needed labeling - - name: Triage labeling - # Only if moved into triage - if: ${{ github.event.project_card.column_id == env.TRIAGE_COLUMN_ID }} - uses: fmulero/labeler@1.1.0 - with: - add-labels: triage - remove-labels: on-hold, in-progress, solved - - name: From Bitnami labeling - if: ${{ github.event.project_card.column_id == env.BITNAMI_COLUMN_ID }} - uses: fmulero/labeler@1.1.0 - with: - add-labels: ${{ (needs.get-issue.outputs.author == 'bitnami-bot' && needs.get-issue.outputs.type == 'pull_request') && 'automated, auto-merge' || 'bitnami' }} - remove-labels: on-hold, in-progress, triage, solved - - name: Verify labeling - # Only if moved into bitnami column and the PR is ready for review - # Consecutive calls were fixed in fmulero/labeler@1.1.0, see https://github.com/fmulero/labeler/pull/2 - if: | - github.event.project_card.column_id == env.BITNAMI_COLUMN_ID && - needs.get-issue.outputs.type == 'pull_request' && needs.get-issue.outputs.draft == 'false' - uses: fmulero/labeler@1.1.0 - with: - repo-token: ${{ secrets.BITNAMI_BOT_TOKEN }} - add-labels: verify - - name: On hold labeling - # Only if moved into on hold - if: ${{ github.event.project_card.column_id == env.ON_HOLD_COLUMN_ID }} - uses: fmulero/labeler@1.1.0 - with: - add-labels: on-hold - remove-labels: triage, in-progress, solved - - name: In progress labeling - # Only if moved into In progress - if: ${{ github.event.project_card.column_id == env.IN_PROGRESS_COLUMN_ID }} - uses: fmulero/labeler@1.1.0 - with: - add-labels: in-progress - remove-labels: on-hold, triage, solved - - name: Solved labeling - # Only if moved into Solved and the issue author is not bitnami-bot - if: | - github.event.project_card.column_id == env.SOLVED_COLUMN_ID && - (needs.get-issue.outputs.author != 'bitnami-bot') - uses: fmulero/labeler@1.1.0 - with: - add-labels: solved - # Triage is not on the list to know how many issues/PRs are solved - # directly on triage - remove-labels: in-progress, on-hold - assign-assignee-if-needed: - runs-on: ubuntu-latest - permissions: - contents: read - needs: - - get-issue - # The job shouldn't run for solved cards - steps: - - name: Repo checkout - uses: actions/checkout@v3 - with: - fetch-depth: 1 - - name: Load .env file - uses: xom9ikk/dotenv@v2 - with: - path: .github/workflows/ - - name: Assign to a person to work on it - # Assign when there is nobody assigned or the card is new. - if: | - github.event.project_card.column_id != env.SOLVED_COLUMN_ID && (needs.get-issue.outputs.assignees == '[]' || github.event.action == 'created') - uses: pozil/auto-assign-issue@v1.11.0 - with: - numOfAssignee: 1 - teams: ${{ github.event.project_card.column_id == env.BITNAMI_COLUMN_ID && env.SUPPORT_TEAM_NAME || env.TRIAGE_TEAM_NAME }} - repo-token: ${{ secrets.BITNAMI_BOT_TOKEN }} - allowSelfAssign: false - - name: Reassign when moved into 'In progress' from 'Triage' - # Reassigned when moved into In progress FROM Triage - if: | - github.event.action == 'moved' && needs.get-issue.outputs.assignees != '[]' && - github.event.project_card.column_id == env.IN_PROGRESS_COLUMN_ID && - github.event.changes.column_id.from == env.TRIAGE_COLUMN_ID - uses: pozil/auto-assign-issue@v1.11.0 - with: - numOfAssignee: 1 - removePreviousAssignees: true - teams: ${{ env.SUPPORT_TEAM_NAME }} - repo-token: ${{ secrets.BITNAMI_BOT_TOKEN }} - allowSelfAssign: false diff --git a/.github/workflows/pr-review-hack.yml b/.github/workflows/pr-review-hack.yml new file mode 100644 index 0000000000000..00c8e1da1a322 --- /dev/null +++ b/.github/workflows/pr-review-hack.yml @@ -0,0 +1,58 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +# This is a hack to run reusable workflows in the main repo context and not from the forked repository. +# We this hack we can use secrets configured in the organization. +name: '[Support] PR review comment trigger' +on: + workflow_run: + workflows: + - '\[Support\] PR review comment card movements' + types: + - completed +permissions: {} +jobs: + pr-info: + runs-on: ubuntu-latest + permissions: + pull-requests: read + actions: read + outputs: + author: ${{ steps.get-info.outputs.author }} + actor: ${{ steps.get-info.outputs.actor }} + labels: ${{ steps.get-info.outputs.labels }} + resource_url: ${{ steps.get-info.outputs.resource_url }} + if: ${{ github.event.workflow_run.conclusion == 'success' }} + steps: + - id: get-info + env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + run: | + actor="${{ github.event.workflow_run.actor.login }}" + download_url="$(gh api "${{ github.event.workflow_run.artifacts_url }}" | jq -cr '.artifacts[] | select(.name == "pull_request_number") | .archive_download_url')" + curl -sSL -o pull_request_number.zip -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" -H "Authorization: Bearer $GITHUB_TOKEN" $download_url + unzip pull_request_number.zip + pull_request_number=$(cat pull_request_number) + pull_request="$(gh api "repos/${GITHUB_REPOSITORY}/pulls/${pull_request_number}")" + author="$(echo $pull_request | jq -cr '.user.login')" + author_association="$(echo $pull_request | jq -cr '.author_association')" + labels="$(echo $pull_request | jq -cr '[.labels[].name]')" + resource_url="$(echo $pull_request | jq -cr '.html_url')" + + echo "::notice:: Managing PR #${pull_request_number}" + echo "actor=${actor}" >> $GITHUB_OUTPUT + echo "author=${author}" >> $GITHUB_OUTPUT + echo "author_association=${author_association}" >> $GITHUB_OUTPUT + echo "labels=${labels}" >> $GITHUB_OUTPUT + echo "resource_url=${resource_url}" >> $GITHUB_OUTPUT + call-pr-review-comment: + uses: bitnami/support/.github/workflows/pr-review-comment.yml@main + needs: pr-info + permissions: + contents: read + secrets: inherit + with: + author: ${{ needs.pr-info.outputs.author }} + actor: ${{ needs.pr-info.outputs.actor }} + labels: ${{ needs.pr-info.outputs.labels }} + resource_url: ${{ needs.pr-info.outputs.resource_url }} diff --git a/.github/workflows/pr-reviews-requested.yml b/.github/workflows/pr-reviews-requested.yml new file mode 100644 index 0000000000000..2f3725fbaee47 --- /dev/null +++ b/.github/workflows/pr-reviews-requested.yml @@ -0,0 +1,18 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +name: '[Support] Review based card movements' +on: + pull_request_target: + types: + - review_requested + - synchronize +permissions: + contents: read +# Avoid concurrency over the same issue +concurrency: + group: card-movement-${{ github.event.number }} +jobs: + call-pr-review-workflow: + uses: bitnami/support/.github/workflows/pr-review-requested-sync.yml@main + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/pr-reviews.yml b/.github/workflows/pr-reviews.yml index da70c967394d0..46d1ca4e5fb24 100644 --- a/.github/workflows/pr-reviews.yml +++ b/.github/workflows/pr-reviews.yml @@ -1,39 +1,25 @@ -name: '[Support] Review based card movements' +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +name: '[Support] PR review comment card movements' on: - pull_request_target: + pull_request_review_comment: types: - - review_requested - - synchronize -# Remove all permissions by default + - created permissions: {} +# Avoid concurrency over the same issue concurrency: - group: card-movement-${{ github.event.number }} + group: card-movement-${{ github.event.pull_request.number }} jobs: - handler: + just-notice: + # This is a dummy workflow that triggers a workflow_run runs-on: ubuntu-latest - permissions: - repository-projects: write - contents: read - pull-requests: read - # This job will ignore: - # * Events triggered by bitnami-bot (README commits for example). - # * Events triggered over automated PRs (They are managed in comments.yml workflow). - # * PRs with 'bitnami' label. - if: | - github.actor != 'bitnami-bot' && github.event.pull_request.user.login != 'bitnami-bot' && - (!contains(github.event.pull_request.labels.*.name, 'bitnami')) && (!contains(github.event.pull_request.labels.*.name, 'triage')) steps: - - name: Repo checkout - uses: actions/checkout@v3 - - name: Load .env file - uses: xom9ikk/dotenv@v2 + - run: | + echo "::notice:: Comment on PR #${{ github.event.pull_request.number }}" + echo "${{ github.event.pull_request.number }}" > pull_request_number + - name: Upload the PR number + uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 with: - path: .github/workflows/ - - name: Move into In Progress - # Move the card only if the actor is not a Bitnami member - if: ${{ !contains(fromJson(env.BITNAMI_TEAM), github.actor) }} - uses: peter-evans/create-or-update-project-card@v2 - with: - project-name: Support - column-name: In progress - issue-number: ${{ github.event.number }} + name: pull_request_number + path: ./pull_request_number \ No newline at end of file diff --git a/.github/workflows/reasign.yml b/.github/workflows/reasign.yml new file mode 100644 index 0000000000000..ce670f71b28cf --- /dev/null +++ b/.github/workflows/reasign.yml @@ -0,0 +1,22 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +name: '[Support] Review based card movements' +on: + pull_request_target: + types: + - labeled + issues: + types: + - labeled +permissions: + contents: read + pull-requests: write + issues: write +# Avoid concurrency over the same issue +concurrency: + group: card-movement-${{ github.event.issue != null && github.event.issue.number || github.event.number }} +jobs: + call-reasign-workflow: + uses: bitnami/support/.github/workflows/item-labeled.yml@main + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/srp-report.yml b/.github/workflows/srp-report.yml index 3557b8e514330..d5628d2fea4b1 100644 --- a/.github/workflows/srp-report.yml +++ b/.github/workflows/srp-report.yml @@ -1,3 +1,6 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + name: '[SRP] Secure Release Pipeline Report' on: schedule: @@ -24,7 +27,7 @@ jobs: sudo tar xf /tmp/srp-cli.tgz -C /usr/local/bin/ srp config --srp-endpoint ${BAC_SRP_ENDPOINT} srp config auth --client-id=${BAC_SRP_CLIENT_ID} --client-secret=${BAC_SRP_CLIENT_SECRET} - - uses: actions/checkout@v3 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 name: Checkout Repository with: # No full history required @@ -40,11 +43,13 @@ jobs: --version "1.0" --all-ephemeral true --build-type release echo "uid=${SRP_UID}" >> $GITHUB_OUTPUT - name: Archive SRP report - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 with: name: source-provenance path: source-provenance.json - id: submit-report name: Submit SRP report + env: + SRP_UID: "${{ steps.build-report.outputs.uid }}" run: | - srp metadata submit --verbose --path ./source-provenance.json --uid "uid.mtd.provenance_2_5.fragment(obj_uid=${{ steps.build-report.outputs.uid }},revision='')" + srp metadata submit --verbose --path ./source-provenance.json --uid "uid.mtd.provenance_2_5.fragment(obj_uid=${SRP_UID},revision='')" diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 424fef0f74a09..f93451e9c0846 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -1,3 +1,6 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + name: '[Support] Close stale issues and PRs' on: workflow_dispatch: @@ -14,7 +17,7 @@ jobs: pull-requests: write steps: # This step will add the stale comment and label for the first 15 days without activity. It won't close any task - - uses: actions/stale@v6.0.1 + - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-message: 'This Issue has been automatically marked as "stale" because it has not had recent activity (for 15 days). It will be closed if no further activity occurs. Thanks for the feedback.' @@ -25,7 +28,7 @@ jobs: exempt-pr-labels: 'on-hold' operations-per-run: 500 # This step will add the 'solved' label and the last comment before closing the issue or PR. Note that it won't close any issue or PR, they will be closed by the clossing-issues workflow - - uses: actions/stale@v6.0.1 + - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-message: 'Due to the lack of activity in the last 5 days since it was marked as "stale", we proceed to close this Issue. Do not hesitate to reopen it later if necessary.' diff --git a/.github/workflows/sync-teams.yml b/.github/workflows/sync-teams.yml deleted file mode 100644 index c9a2e045b8b81..0000000000000 --- a/.github/workflows/sync-teams.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: '[Support] Synchronize team members in the .env file' -on: - schedule: - # Daily - - cron: '0 5 * * *' -# Remove all permissions by default. Write actions are done by Bitnami Bot -permissions: {} -jobs: - sync-support-teams: - runs-on: ubuntu-latest - steps: - - name: Repo checkout - uses: actions/checkout@v3 - with: - token: ${{ secrets.BITNAMI_BOT_TOKEN }} - fetch-depth: 1 - - name: Load .env file - uses: xom9ikk/dotenv@v2 - with: - path: .github/workflows/ - - name: Updating members of the Bitnami team - run: | - TEAM_MEMBERS=$(curl --request GET \ - --url https://api.github.com/orgs/bitnami/teams/developers/members?per_page=100 \ - --header 'authorization: Bearer ${{ secrets.BITNAMI_BOT_TOKEN }}' \ - --header 'content-type: application/json' \ - | jq 'sort_by(.login)|map(.login)|join(",")') - TEAM_MEMBERS='['${TEAM_MEMBERS//','/'","'}']' - if [ $TEAM_MEMBERS != $BITNAMI_TEAM ]; then - echo "Replacing $BITNAMI_TEAM for $TEAM_MEMBERS" - sed -i "s|BITNAMI_TEAM=.*$|BITNAMI_TEAM='${TEAM_MEMBERS}'|g" .github/workflows/.env - git config user.name "bitnami-bot" - git config user.email "bitnami-bot@vmware.com" - git commit -s -m"[bitnami-bot] Updating Bitnami team members" .github/workflows/.env - git push - else - echo "BITNAMI_TEAM is updated and nothing should be done" - fi \ No newline at end of file diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml index f96bd2605a4b5..880031782dc83 100644 --- a/.github/workflows/triage.yml +++ b/.github/workflows/triage.yml @@ -1,3 +1,6 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + # This workflow is built to manage the triage support by using GH issues. name: '[Support] Organize triage' on: @@ -9,62 +12,14 @@ on: types: - reopened - opened -# Remove all permissions by default -permissions: {} +permissions: + contents: read + pull-requests: write + issues: write # Avoid concurrency over the same issue concurrency: - group: card-movement-${{ github.event_name != 'issues' && github.event.number || github.event.issue.number }} + group: card-movement-${{ github.event.issue != null && github.event.issue.number || github.event.number }} jobs: - # For any opened or reopened issue, should be sent into Triage - send_to_board: - name: Organize triage - runs-on: ubuntu-latest - # Please note that projects cards are created/moved with Bitnami Bot - permissions: - contents: read - steps: - - name: Repo checkout - uses: actions/checkout@v3 - with: - fetch-depth: 1 - - name: Load .env file - uses: xom9ikk/dotenv@v2 - with: - path: .github/workflows/ - - name: Get author - id: get-issue - run: | - author="${{ github.event.issue != null && github.event.issue.user.login || github.event.pull_request.user.login }}" - number="${{ github.event_name != 'issues' && github.event.number || github.event.issue.number }}" - type="${{ github.event_name != 'issues' && 'pull_request' || 'issue' }}" - echo "author=${author}" >> $GITHUB_OUTPUT - echo "number=${number}" >> $GITHUB_OUTPUT - echo "type=${type}" >> $GITHUB_OUTPUT - - name: Send to the board - if: ${{steps.get-issue.outputs.author != 'bitnami-bot' || steps.get-issue.outputs.type != 'pull_request'}} - uses: peter-evans/create-or-update-project-card@v2 - with: - project-name: Support - # If the author comes from Bitnami, send it to Bitnami. Otherwise, all to Triage - column-name: ${{ (contains(fromJson(env.BITNAMI_TEAM), steps.get-issue.outputs.author)) && 'From Bitnami' || 'Triage' }} - token: "${{ secrets.BITNAMI_BOT_TOKEN }}" - issue-number: ${{ steps.get-issue.outputs.number }} - labeling: - name: Set labels for Automated PRs - runs-on: ubuntu-latest - permissions: - pull-requests: write - if: ${{ github.event_name != 'issues' && github.event.pull_request.user.login == 'bitnami-bot' }} - # The project API is not efficient and requires several requests to create the project card. For that reason we decided to create - # a card for the automated PRs only when it is needed. - steps: - - name: From Bitnami labeling - uses: fmulero/labeler@1.1.0 - with: - add-labels: 'automated, auto-merge' - - name: Verify labeling - uses: fmulero/labeler@1.1.0 - with: - # Bitnami bot token is required to trigger CI workflows - repo-token: ${{ secrets.BITNAMI_BOT_TOKEN }} - add-labels: verify + call-triage-workflow: + uses: bitnami/support/.github/workflows/item-opened.yml@main + secrets: inherit \ No newline at end of file diff --git a/.vib/airflow-scheduler/vib-verify.json b/.vib/airflow-scheduler/vib-verify.json index beb4fc6665968..1bee81b564199 100644 --- a/.vib/airflow-scheduler/vib-verify.json +++ b/.vib/airflow-scheduler/vib-verify.json @@ -19,8 +19,10 @@ } }, "architectures": [ - "linux/amd64" - ] + "linux/amd64", + "linux/arm64" + ], + "timeout_minutes": 50 } }, { diff --git a/.vib/airflow-worker/vib-verify.json b/.vib/airflow-worker/vib-verify.json index d1083aca04524..270e9b02f138a 100644 --- a/.vib/airflow-worker/vib-verify.json +++ b/.vib/airflow-worker/vib-verify.json @@ -19,8 +19,10 @@ } }, "architectures": [ - "linux/amd64" - ] + "linux/amd64", + "linux/arm64" + ], + "timeout_minutes": 50 } }, { diff --git a/.vib/airflow/vib-verify.json b/.vib/airflow/vib-verify.json index 7e79de6ce0616..c520d67a8fbb6 100644 --- a/.vib/airflow/vib-verify.json +++ b/.vib/airflow/vib-verify.json @@ -19,8 +19,10 @@ } }, "architectures": [ - "linux/amd64" - ] + "linux/amd64", + "linux/arm64" + ], + "timeout_minutes": 50 } }, { diff --git a/.vib/apache/goss/vars.yaml b/.vib/apache/goss/vars.yaml index bde23c5cf596c..3ff3ee07d3858 100644 --- a/.vib/apache/goss/vars.yaml +++ b/.vib/apache/goss/vars.yaml @@ -33,6 +33,7 @@ modules: # Explicitly disabled in postunpack - http2 - proxy_hcheck + - proxy_html extra: # Not enabled, but compiled - mpm_event diff --git a/.vib/fluentd/goss/vars.yaml b/.vib/fluentd/goss/vars.yaml index e7a17c75bc920..646399bda4ff3 100644 --- a/.vib/fluentd/goss/vars.yaml +++ b/.vib/fluentd/goss/vars.yaml @@ -30,6 +30,10 @@ modules: - fluentd - activesupport - elasticsearch-xpack +sed_in_place: + exclude_paths: + # Ignore gems directory (not bitnami-related) + - /opt/bitnami/fluentd/gems version: bin_name: fluentd flag: --version diff --git a/.vib/grafana/goss/grafana.yaml b/.vib/grafana/goss/grafana.yaml index 96ea8f7c47024..62795d16bbe25 100644 --- a/.vib/grafana/goss/grafana.yaml +++ b/.vib/grafana/goss/grafana.yaml @@ -4,7 +4,7 @@ command: check-grafana-plugins: exit-status: 0 - exec: grafana-cli --pluginsDir /opt/bitnami/grafana/default-plugins/ plugins ls + exec: grafana cli --pluginsDir /opt/bitnami/grafana/default-plugins/ plugins ls stdout: {{ range $plugin := .Vars.plugins }} - "{{ $plugin }}" diff --git a/.vib/grafana/goss/vars.yaml b/.vib/grafana/goss/vars.yaml index 74a49ed84fcbb..c2c33d3261be9 100644 --- a/.vib/grafana/goss/vars.yaml +++ b/.vib/grafana/goss/vars.yaml @@ -1,6 +1,5 @@ binaries: - grafana - - grafana-cli root_dir: /opt/bitnami version: bin_name: grafana diff --git a/.vib/kibana/vib-verify.json b/.vib/kibana/vib-verify.json index 8e8a88b77389d..4fa8b498743c2 100644 --- a/.vib/kibana/vib-verify.json +++ b/.vib/kibana/vib-verify.json @@ -66,6 +66,14 @@ "OS" ] } + }, + { + "action_id": "clamav", + "params": { + "allowlist": [ + "Win.Tool.UACBypass-5474404-0" + ] + } } ] } diff --git a/.vib/mxnet/goss/goss.yaml b/.vib/kuberay-apiserver/goss/goss.yaml similarity index 84% rename from .vib/mxnet/goss/goss.yaml rename to .vib/kuberay-apiserver/goss/goss.yaml index c7534384d6942..4d85fbc760f51 100644 --- a/.vib/mxnet/goss/goss.yaml +++ b/.vib/kuberay-apiserver/goss/goss.yaml @@ -3,12 +3,11 @@ gossfile: # Goss tests exclusive to the current container - ../../mxnet/goss/mxnet.yaml: {} + ../../kuberay-apiserver/goss/kuberay-apiserver.yaml: {} # Load scripts from .vib/common/goss/templates ../../common/goss/templates/check-binaries.yaml: {} ../../common/goss/templates/check-broken-symlinks.yaml: {} ../../common/goss/templates/check-ca-certs.yaml: {} - ../../common/goss/templates/check-directories.yaml: {} ../../common/goss/templates/check-linked-libraries.yaml: {} ../../common/goss/templates/check-sed-in-place.yaml: {} ../../common/goss/templates/check-spdx.yaml: {} diff --git a/.vib/kuberay-apiserver/goss/kuberay-apiserver.yaml b/.vib/kuberay-apiserver/goss/kuberay-apiserver.yaml new file mode 100644 index 0000000000000..7dd2821b66f48 --- /dev/null +++ b/.vib/kuberay-apiserver/goss/kuberay-apiserver.yaml @@ -0,0 +1,15 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +user: + kuberay-apiserver: + exists: true + uid: 1001 + gid: 0 + +command: + check-kuberay-apiserver: + exec: kuberay-apiserver --help + exit-status: 0 + stderr: + - "Paths to a kubeconfig" diff --git a/.vib/kuberay-apiserver/goss/vars.yaml b/.vib/kuberay-apiserver/goss/vars.yaml new file mode 100644 index 0000000000000..6ac7441d4e162 --- /dev/null +++ b/.vib/kuberay-apiserver/goss/vars.yaml @@ -0,0 +1,6 @@ +binaries: + - kuberay-apiserver +root_dir: /opt/bitnami +directories: + - paths: + - /opt/bitnami/kuberay-apiserver diff --git a/.vib/mxnet/vib-verify.json b/.vib/kuberay-apiserver/vib-verify.json similarity index 78% rename from .vib/mxnet/vib-verify.json rename to .vib/kuberay-apiserver/vib-verify.json index 04976254dd5b5..6301edc707551 100644 --- a/.vib/mxnet/vib-verify.json +++ b/.vib/kuberay-apiserver/vib-verify.json @@ -18,9 +18,7 @@ "tag": "{VIB_ENV_TAG}" } }, - "architectures": [ - "linux/amd64" - ] + "architectures": ["linux/amd64", "linux/arm64"] } }, { @@ -34,36 +32,32 @@ "verify": { "actions": [ { - "action_id": "goss", + "action_id": "trivy", "params": { - "resources": { - "path": "/.vib" - }, - "tests_file": "mxnet/goss/goss.yaml", - "vars_file": "mxnet/goss/vars.yaml", - "remote": { - "pod": { - "workload": "deploy-mxnet" - } - } + "threshold": "CRITICAL", + "vuln_type": ["OS"] } }, { - "action_id": "trivy", + "action_id": "grype", "params": { "threshold": "CRITICAL", - "vuln_type": [ - "OS" - ] + "package_type": ["OS"] } }, { - "action_id": "grype", + "action_id": "goss", "params": { - "threshold": "CRITICAL", - "package_type": [ - "OS" - ] + "resources": { + "path": "/.vib" + }, + "tests_file": "kuberay-apiserver/goss/goss.yaml", + "vars_file": "kuberay-apiserver/goss/vars.yaml", + "remote": { + "pod": { + "workload": "deploy-kuberay-apiserver" + } + } } } ] diff --git a/.vib/kuberay-operator/goss/goss.yaml b/.vib/kuberay-operator/goss/goss.yaml new file mode 100644 index 0000000000000..0041ef3907dca --- /dev/null +++ b/.vib/kuberay-operator/goss/goss.yaml @@ -0,0 +1,13 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +gossfile: + # Goss tests exclusive to the current container + ../../kuberay-operator/goss/kuberay-operator.yaml: {} + # Load scripts from .vib/common/goss/templates + ../../common/goss/templates/check-binaries.yaml: {} + ../../common/goss/templates/check-broken-symlinks.yaml: {} + ../../common/goss/templates/check-ca-certs.yaml: {} + ../../common/goss/templates/check-linked-libraries.yaml: {} + ../../common/goss/templates/check-sed-in-place.yaml: {} + ../../common/goss/templates/check-spdx.yaml: {} diff --git a/.vib/kuberay-operator/goss/kuberay-operator.yaml b/.vib/kuberay-operator/goss/kuberay-operator.yaml new file mode 100644 index 0000000000000..567b5e268e90d --- /dev/null +++ b/.vib/kuberay-operator/goss/kuberay-operator.yaml @@ -0,0 +1,15 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +user: + kuberay: + exists: true + uid: 1001 + gid: 0 + +command: + check-kuberay-operator: + exec: manager --help + exit-status: 0 + stderr: + - "Forced cluster upgrade" diff --git a/.vib/kuberay-operator/goss/vars.yaml b/.vib/kuberay-operator/goss/vars.yaml new file mode 100644 index 0000000000000..6e787d05035e6 --- /dev/null +++ b/.vib/kuberay-operator/goss/vars.yaml @@ -0,0 +1,6 @@ +binaries: + - manager +root_dir: /opt/bitnami +directories: + - paths: + - /opt/bitnami/kuberay diff --git a/.vib/kuberay-operator/vib-verify.json b/.vib/kuberay-operator/vib-verify.json new file mode 100644 index 0000000000000..d943eb95926e8 --- /dev/null +++ b/.vib/kuberay-operator/vib-verify.json @@ -0,0 +1,66 @@ +{ + "context": { + "resources": { + "url": "{SHA_ARCHIVE}", + "path": "{VIB_ENV_PATH}" + }, + "runtime_parameters": "Y29tbWFuZDogWyJ0YWlsIiwgIi1mIiwgIi9kZXYvbnVsbCJd" + }, + "phases": { + "package": { + "actions": [ + { + "action_id": "container-image-package", + "params": { + "application": { + "details": { + "name": "{VIB_ENV_CONTAINER}", + "tag": "{VIB_ENV_TAG}" + } + }, + "architectures": ["linux/amd64", "linux/arm64"] + } + }, + { + "action_id": "container-image-lint", + "params": { + "threshold": "error" + } + } + ] + }, + "verify": { + "actions": [ + { + "action_id": "trivy", + "params": { + "threshold": "CRITICAL", + "vuln_type": ["OS"] + } + }, + { + "action_id": "grype", + "params": { + "threshold": "CRITICAL", + "package_type": ["OS"] + } + }, + { + "action_id": "goss", + "params": { + "resources": { + "path": "/.vib" + }, + "tests_file": "kuberay-operator/goss/goss.yaml", + "vars_file": "kuberay-operator/goss/vars.yaml", + "remote": { + "pod": { + "workload": "deploy-kuberay-operator" + } + } + } + } + ] + } + } +} diff --git a/.vib/milvus/goss/milvus.yaml b/.vib/milvus/goss/milvus.yaml index d331268942924..d8b282770e64e 100644 --- a/.vib/milvus/goss/milvus.yaml +++ b/.vib/milvus/goss/milvus.yaml @@ -21,7 +21,7 @@ file: linked-to: /opt/bitnami/milvus/tmp command: run-milvus: - exec: cd /opt/bitnami/milvus; timeout --preserve-status 15 milvus run standalone || true + exec: cd /opt/bitnami/milvus; timeout --preserve-status --kill-after=2 15 milvus run datanode || true timeout: 20000 exit-status: 0 stdout: diff --git a/.vib/moodle/goss/moodle.yaml b/.vib/moodle/goss/moodle.yaml index cef73bfa91a05..3f3483ea8c350 100644 --- a/.vib/moodle/goss/moodle.yaml +++ b/.vib/moodle/goss/moodle.yaml @@ -6,7 +6,7 @@ file: exists: true contents: {{ range $rule := .Vars.apache.rules }} - - "{{ $rule }}" + - {{ $rule }} {{ end }} /opt/bitnami/php/etc/php.ini: exists: true diff --git a/.vib/mxnet/goss/mxnet.yaml b/.vib/mxnet/goss/mxnet.yaml deleted file mode 100644 index 530417bff6794..0000000000000 --- a/.vib/mxnet/goss/mxnet.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -command: - check-app-version: - exec: python -c 'import mxnet; print(mxnet.__version__)' - exit-status: 0 - stdout: - - "{{ .Env.APP_VERSION }}" - # From: https://mxnet.apache.org/versions/1.8.0/api/python/docs/tutorials/packages/ndarray/02-ndarray-operations.html - check-mxnet-operation: - exec: python -c 'import mxnet as mx; a = mx.nd.ones((2, 3)); b = a * 2 + 1; b.asnumpy()' - exit-status: 0 - check-mxnet-features: - # Transform enabled features in a python command of the type "is_enabled(A) and is_enabled(B)" - {{ $check_enabled := "" }} - {{ range $i, $e := .Vars.features.enabled }} - {{ if $i }} - {{ $check_enabled = (printf "%s and" $check_enabled)}} - {{ end }} - {{ $check_enabled = (printf "%s (fs.is_enabled(%s))" $check_enabled ($e | quote))}} - {{ end }} - # Transform disabled features in a python command of the type "(not is_enabled(A)) and (not is_enabled(B))" - {{ $check_disabled := "" }} - {{ range $i, $e := .Vars.features.disabled }} - {{ if $i }} - {{ $check_disabled = (printf "%s and" $check_disabled)}} - {{ end }} - {{ $check_disabled = (printf "%s (not fs.is_enabled(%s))" $check_disabled ($e | quote))}} - {{ end }} - exec: python -c 'import mxnet as mx; import mxnet.runtime; fs = mx.runtime.Features(); res=({{$check_enabled}} and {{$check_disabled}}); print(res)' - exit-status: 0 - stdout: - - 'True' \ No newline at end of file diff --git a/.vib/mxnet/goss/vars.yaml b/.vib/mxnet/goss/vars.yaml deleted file mode 100644 index 4ac3bb6b2acd8..0000000000000 --- a/.vib/mxnet/goss/vars.yaml +++ /dev/null @@ -1,15 +0,0 @@ -binaries: - - python -directories: - - mode: "0775" - paths: - - /app - - /opt/bitnami/python -features: - enabled: - - "BLAS_OPEN" - - "DIST_KVSTORE" - disabled: - - "CUDA" - - "MKLDNN" -root_dir: /opt/bitnami \ No newline at end of file diff --git a/.vib/ray/goss/goss.yaml b/.vib/ray/goss/goss.yaml new file mode 100644 index 0000000000000..2f90a468c144f --- /dev/null +++ b/.vib/ray/goss/goss.yaml @@ -0,0 +1,14 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +gossfile: + # Goss tests exclusive to the current container + ../../ray/goss/ray.yaml: {} + # Load scripts from .vib/common/goss/templates + ../../common/goss/templates/check-app-version.yaml: {} + ../../common/goss/templates/check-binaries.yaml: {} + ../../common/goss/templates/check-broken-symlinks.yaml: {} + ../../common/goss/templates/check-ca-certs.yaml: {} + ../../common/goss/templates/check-directories.yaml: {} + ../../common/goss/templates/check-linked-libraries.yaml: {} + ../../common/goss/templates/check-spdx.yaml: {} diff --git a/.vib/ray/goss/ray.yaml b/.vib/ray/goss/ray.yaml new file mode 100644 index 0000000000000..4dd3ba11b312e --- /dev/null +++ b/.vib/ray/goss/ray.yaml @@ -0,0 +1,15 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +user: + ray: + exists: true + uid: 1001 + gid: 0 +command: + basic-example: + exec: python ./ray/goss/testfiles/basic_example.py + timeout: 120000 + stdout: + - /Estimated value.*3.14/ + exit-status: 0 diff --git a/.vib/ray/goss/testfiles/basic_example.py b/.vib/ray/goss/testfiles/basic_example.py new file mode 100644 index 0000000000000..b9360a4d1cab4 --- /dev/null +++ b/.vib/ray/goss/testfiles/basic_example.py @@ -0,0 +1,69 @@ +# Taken from https://docs.ray.io/en/latest/ray-core/examples/gentle_walkthrough.html + +import ray +import math +import time +import random + +ray.init() + +@ray.remote +class ProgressActor: + def __init__(self, total_num_samples: int): + self.total_num_samples = total_num_samples + self.num_samples_completed_per_task = {} + + def report_progress(self, task_id: int, num_samples_completed: int) -> None: + self.num_samples_completed_per_task[task_id] = num_samples_completed + + def get_progress(self) -> float: + return ( + sum(self.num_samples_completed_per_task.values()) / self.total_num_samples + ) + +@ray.remote +def sampling_task(num_samples: int, task_id: int, + progress_actor: ray.actor.ActorHandle) -> int: + num_inside = 0 + for i in range(num_samples): + x, y = random.uniform(-1, 1), random.uniform(-1, 1) + if math.hypot(x, y) <= 1: + num_inside += 1 + + # Report progress every 1 million samples. + if (i + 1) % 1_000_000 == 0: + # This is async. + progress_actor.report_progress.remote(task_id, i + 1) + + # Report the final progress. + progress_actor.report_progress.remote(task_id, num_samples) + return num_inside + +# Change this to match your cluster scale. +NUM_SAMPLING_TASKS = 10 +NUM_SAMPLES_PER_TASK = 10_000_000 +TOTAL_NUM_SAMPLES = NUM_SAMPLING_TASKS * NUM_SAMPLES_PER_TASK + +# Create the progress actor. +progress_actor = ProgressActor.remote(TOTAL_NUM_SAMPLES) + +# Create and execute all sampling tasks in parallel. +results = [ + sampling_task.remote(NUM_SAMPLES_PER_TASK, i, progress_actor) + for i in range(NUM_SAMPLING_TASKS) +] + +# Query progress periodically. +while True: + progress = ray.get(progress_actor.get_progress.remote()) + print(f"Progress: {int(progress * 100)}%") + + if progress == 1: + break + + time.sleep(1) + +# Get all the sampling tasks results. +total_num_inside = sum(ray.get(results)) +pi = (total_num_inside * 4) / TOTAL_NUM_SAMPLES +print(f"Estimated value of π is: {pi}") diff --git a/.vib/ray/goss/vars.yaml b/.vib/ray/goss/vars.yaml new file mode 100644 index 0000000000000..568406f069c0c --- /dev/null +++ b/.vib/ray/goss/vars.yaml @@ -0,0 +1,10 @@ +binaries: + - python +root_dir: /opt/bitnami +directories: + - paths: + # Paths to the client and server directories + - /opt/bitnami/python +version: + bin_name: python + flag: "-c 'import ray; print(ray.__version__)'" diff --git a/.vib/ray/vib-verify.json b/.vib/ray/vib-verify.json new file mode 100644 index 0000000000000..bc0d0356cbba2 --- /dev/null +++ b/.vib/ray/vib-verify.json @@ -0,0 +1,66 @@ +{ + "context": { + "resources": { + "url": "{SHA_ARCHIVE}", + "path": "{VIB_ENV_PATH}" + }, + "runtime_parameters": "Y29tbWFuZDogWyJ0YWlsIiwgIi1mIiwgIi9kZXYvbnVsbCJd" + }, + "phases": { + "package": { + "actions": [ + { + "action_id": "container-image-package", + "params": { + "application": { + "details": { + "name": "{VIB_ENV_CONTAINER}", + "tag": "{VIB_ENV_TAG}" + } + }, + "architectures": ["linux/amd64", "linux/arm64"] + } + }, + { + "action_id": "container-image-lint", + "params": { + "threshold": "error" + } + } + ] + }, + "verify": { + "actions": [ + { + "action_id": "goss", + "params": { + "resources": { + "path": "/.vib" + }, + "tests_file": "ray/goss/goss.yaml", + "vars_file": "ray/goss/vars.yaml", + "remote": { + "pod": { + "workload": "deploy-ray" + } + } + } + }, + { + "action_id": "trivy", + "params": { + "threshold": "CRITICAL", + "vuln_type": ["OS"] + } + }, + { + "action_id": "grype", + "params": { + "threshold": "CRITICAL", + "package_type": ["OS"] + } + } + ] + } + } +} diff --git a/.vib/sealed-secrets-kubeseal/vib-verify.json b/.vib/sealed-secrets-kubeseal/vib-verify.json new file mode 100644 index 0000000000000..82f78c1a2b77e --- /dev/null +++ b/.vib/sealed-secrets-kubeseal/vib-verify.json @@ -0,0 +1,57 @@ +{ + "context": { + "resources": { + "url": "{SHA_ARCHIVE}", + "path": "{VIB_ENV_PATH}" + } + }, + "phases": { + "package": { + "actions": [ + { + "action_id": "container-image-package", + "params": { + "application": { + "details": { + "name": "{VIB_ENV_CONTAINER}", + "tag": "{VIB_ENV_TAG}" + } + }, + "architectures": [ + "linux/amd64", + "linux/arm64" + ] + } + }, + { + "action_id": "container-image-lint", + "params": { + "threshold": "error" + } + } + ] + }, + "verify": { + "actions": [ + { + "action_id": "trivy", + "params": { + "threshold": "CRITICAL", + "vuln_type": [ + "OS" + ] + } + }, + { + "action_id": "grype", + "params": { + "threshold": "CRITICAL", + "package_type": [ + "OS" + ] + } + } + ] + } + } +} diff --git a/.vib/suitecrm/goss/suitecrm.yaml b/.vib/suitecrm/goss/suitecrm.yaml index 31d3f654a9258..1cf206be986c7 100644 --- a/.vib/suitecrm/goss/suitecrm.yaml +++ b/.vib/suitecrm/goss/suitecrm.yaml @@ -7,7 +7,7 @@ command: exec: find /opt/bitnami/suitecrm -maxdepth 3 -type f -name suitecrm_version.php -exec grep -Eo "version = '([0-9.]+)'" {} \; exit-status: 0 stdout: - - 'version = "{{ .Env.APP_VERSION }}"' + - /version = .{{ .Env.APP_VERSION }}./ check-enabled-modules: exec: php -m exit-status: 0 diff --git a/.vib/supabase-studio/goss/supabase-studio.yaml b/.vib/supabase-studio/goss/supabase-studio.yaml index 6e843ac1c9678..66eb898a87ebb 100644 --- a/.vib/supabase-studio/goss/supabase-studio.yaml +++ b/.vib/supabase-studio/goss/supabase-studio.yaml @@ -8,4 +8,4 @@ command: exit-status: 0 stdout: - "next start" - - "started server" + - "Ready" diff --git a/README.md b/README.md index 956971ca035fb..6d4118287f018 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Popular applications, provided by [Bitnami](https://bitnami.com), containerized * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/TESTING.md b/TESTING.md index 939539535a953..4212d93568d08 100644 --- a/TESTING.md +++ b/TESTING.md @@ -270,7 +270,7 @@ Sometimes it is of interest to run the tests locally, for example during develop ```bash $ docker exec e6961 chmod +x /usr/local/bin/gossctl - $ docker exec e6961 gossctl --gossfile /goss/app_name/goss/goss.yaml --vars /goss/app_name/goss/vars.yaml validate + $ docker exec e6961 bash -c 'cd /goss && gossctl --gossfile /goss/app_name/goss/goss.yaml --vars /goss/app_name/goss/vars.yaml validate' ......... Total Duration: 1.203s diff --git a/bitnami/acmesolver/1/debian-11/Dockerfile b/bitnami/acmesolver/1/debian-11/Dockerfile index cb796ab960470..429b075063767 100644 --- a/bitnami/acmesolver/1/debian-11/Dockerfile +++ b/bitnami/acmesolver/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-30T13:51:08Z" \ + org.opencontainers.image.created="2023-12-08T12:56:40Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.13.2-debian-11-r0" \ + org.opencontainers.image.ref.name="1.13.3-debian-11-r0" \ org.opencontainers.image.title="acmesolver" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.13.2" + org.opencontainers.image.version="1.13.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "acmesolver-1.13.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "acmesolver-1.13.3-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="1.13.2" \ +ENV APP_VERSION="1.13.3" \ BITNAMI_APP_NAME="acmesolver" \ PATH="/opt/bitnami/acmesolver/bin:$PATH" diff --git a/bitnami/acmesolver/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/acmesolver/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 21837e737b3d3..87dd4ffbb833c 100644 --- a/bitnami/acmesolver/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/acmesolver/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.13.2-0" + "version": "1.13.3-0" } } \ No newline at end of file diff --git a/bitnami/acmesolver/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/acmesolver/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/acmesolver/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/acmesolver/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/acmesolver/1/debian-11/tags-info.yaml b/bitnami/acmesolver/1/debian-11/tags-info.yaml index 7de74d5f6663d..8b7cb6b6e6d01 100644 --- a/bitnami/acmesolver/1/debian-11/tags-info.yaml +++ b/bitnami/acmesolver/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.13.2 +- 1.13.3 - latest diff --git a/bitnami/acmesolver/README.md b/bitnami/acmesolver/README.md index 1aa781d5c03e2..8f69369867a39 100644 --- a/bitnami/acmesolver/README.md +++ b/bitnami/acmesolver/README.md @@ -1,4 +1,4 @@ -# ACME Solver packaged by Bitnami +# Bitnami package for ACME Solver ## What is ACME Solver? @@ -32,7 +32,7 @@ Kubernetes cluster with `CustomResourceDefinition` or `ThirdPartyResource suppor * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/airflow-exporter/0/debian-11/Dockerfile b/bitnami/airflow-exporter/0/debian-11/Dockerfile index 7c8e7e7438394..3618addfeec50 100644 --- a/bitnami/airflow-exporter/0/debian-11/Dockerfile +++ b/bitnami/airflow-exporter/0/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-30T12:53:02Z" \ + org.opencontainers.image.created="2023-12-06T13:49:06Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.20220314.0-debian-11-r439" \ + org.opencontainers.image.ref.name="0.20220314.0-debian-11-r441" \ org.opencontainers.image.title="airflow-exporter" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="0.20220314.0" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "airflow-exporter-0.20220314.0-167-linux-${OS_ARCH}-debian-11" \ - ) && \ + "airflow-exporter-0.20220314.0-169-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/airflow-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/airflow-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 1599914534544..0f95c856909a2 100644 --- a/bitnami/airflow-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/airflow-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.20220314.0-167" + "version": "0.20220314.0-169" } } \ No newline at end of file diff --git a/bitnami/airflow-exporter/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/airflow-exporter/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/airflow-exporter/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/airflow-exporter/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/airflow-exporter/README.md b/bitnami/airflow-exporter/README.md index 1a45161b8d472..738e090171a76 100644 --- a/bitnami/airflow-exporter/README.md +++ b/bitnami/airflow-exporter/README.md @@ -1,4 +1,4 @@ -# Airflow Exporter packaged by Bitnami +# Bitnami package for Airflow Exporter ## What is Airflow Exporter? @@ -18,7 +18,7 @@ docker run --name airflow-exporter bitnami/airflow-exporter:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/airflow-scheduler/2/debian-11/Dockerfile b/bitnami/airflow-scheduler/2/debian-11/Dockerfile index 2f88ee765a741..2e0117e24cfb7 100644 --- a/bitnami/airflow-scheduler/2/debian-11/Dockerfile +++ b/bitnami/airflow-scheduler/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-30T21:46:28Z" \ + org.opencontainers.image.created="2023-11-27T16:27:54Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.7.2-debian-11-r2" \ + org.opencontainers.image.ref.name="2.7.3-debian-11-r3" \ org.opencontainers.image.title="airflow-scheduler" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.7.2" + org.opencontainers.image.version="2.7.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,24 +21,24 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages ca-certificates curl krb5-user libbsd0 libbz2-1.0 libcdt5 libcgraph6 libcom-err2 libcrypt1 libedit2 libexpat1 libffi7 libgcc-s1 libgmp10 libgnutls30 libgss-dev libgssapi-krb5-2 libgvc6 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5-dev libkrb5support0 libldap-2.4-2 libltdl7 liblz4-1 liblzma5 libmariadb3 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpathplan4 libreadline8 libsasl2-2 libsasl2-modules libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libudev1 libunistring2 libuuid1 libxml2 libxslt1.1 locales netbase procps tzdata zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN install_packages ca-certificates curl krb5-user libbsd0 libbz2-1.0 libcdt5 libcgraph6 libcom-err2 libcrypt1 libedit2 libexpat1 libffi7 libgcc-s1 libgmp10 libgnutls30 libgss-dev libgssapi-krb5-2 libgvc6 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5-dev libkrb5support0 libldap-2.4-2 libltdl7 liblz4-1 liblzma5 libmariadb3 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpathplan4 libreadline8 libsasl2-2 libsasl2-modules libsqlite3-0 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libxml2 libxslt1.1 locales netbase procps tzdata zlib1g +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "python-3.11.6-8-linux-${OS_ARCH}-debian-11" \ - "postgresql-client-16.0.0-0-linux-${OS_ARCH}-debian-11" \ - "ini-file-1.4.6-2-linux-${OS_ARCH}-debian-11" \ - "airflow-scheduler-2.7.2-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "wait-for-port-1.0.7-3-linux-${OS_ARCH}-debian-11" \ + "python-3.11.6-11-linux-${OS_ARCH}-debian-11" \ + "postgresql-client-16.1.0-0-linux-${OS_ARCH}-debian-11" \ + "ini-file-1.4.6-3-linux-${OS_ARCH}-debian-11" \ + "airflow-scheduler-2.7.3-4-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -55,7 +55,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/airflow-scheduler/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh ENV AIRFLOW_HOME="/opt/bitnami/airflow" \ - APP_VERSION="2.7.2" \ + APP_VERSION="2.7.3" \ BITNAMI_APP_NAME="airflow-scheduler" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ diff --git a/bitnami/airflow-scheduler/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/airflow-scheduler/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index b201da80d5130..d6edc73a0d666 100644 --- a/bitnami/airflow-scheduler/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/airflow-scheduler/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,30 +3,30 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.7.2-2" + "version": "2.7.3-4" }, "ini-file": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-2" + "version": "1.4.6-3" }, "postgresql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.0.0-0" + "version": "16.1.0-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-8" + "version": "3.11.6-11" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-3" } } \ No newline at end of file diff --git a/bitnami/airflow-scheduler/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/airflow-scheduler/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/airflow-scheduler/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/airflow-scheduler/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/airflow-scheduler/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh b/bitnami/airflow-scheduler/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh index be3f4b0cb488b..b21d4cb26ed70 100644 --- a/bitnami/airflow-scheduler/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh +++ b/bitnami/airflow-scheduler/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh @@ -185,8 +185,8 @@ airflow_execute() { ######################### airflow_generate_config() { # Create Airflow confirguration from default files - cp "$(find "$AIRFLOW_BASE_DIR" -name default_airflow.cfg)" "$AIRFLOW_CONF_FILE" - [[ -n "$AIRFLOW_WEBSERVER_CONF_FILE" ]] && cp "$(find "$AIRFLOW_BASE_DIR" -name default_webserver_config.py)" "$AIRFLOW_WEBSERVER_CONF_FILE" + [[ ! -f "$AIRFLOW_CONF_FILE" ]] && cp "$(find "$AIRFLOW_BASE_DIR" -name default_airflow.cfg)" "$AIRFLOW_CONF_FILE" + [[ -n "$AIRFLOW_WEBSERVER_CONF_FILE" ]] && [[ ! -f "$AIRFLOW_WEBSERVER_CONF_FILE" ]] && cp "$(find "$AIRFLOW_BASE_DIR" -name default_webserver_config.py)" "$AIRFLOW_WEBSERVER_CONF_FILE" # Setup Airflow base URL airflow_configure_base_url diff --git a/bitnami/airflow-scheduler/2/debian-11/tags-info.yaml b/bitnami/airflow-scheduler/2/debian-11/tags-info.yaml index 1a1c56c9d1edd..6e9a1935312e7 100644 --- a/bitnami/airflow-scheduler/2/debian-11/tags-info.yaml +++ b/bitnami/airflow-scheduler/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.7.2 +- 2.7.3 - latest diff --git a/bitnami/airflow-scheduler/README.md b/bitnami/airflow-scheduler/README.md index 2a630612a744e..29bf5e2fb37f5 100644 --- a/bitnami/airflow-scheduler/README.md +++ b/bitnami/airflow-scheduler/README.md @@ -1,4 +1,4 @@ -# Apache Airflow Scheduler packaged by Bitnami +# Bitnami package for Apache Airflow Scheduler ## What is Apache Airflow Scheduler? @@ -23,7 +23,7 @@ You can find the default credentials and available configuration options in the * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/airflow-worker/2/debian-11/Dockerfile b/bitnami/airflow-worker/2/debian-11/Dockerfile index ef62daa58499a..0658eec55f603 100644 --- a/bitnami/airflow-worker/2/debian-11/Dockerfile +++ b/bitnami/airflow-worker/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-30T15:39:52Z" \ + org.opencontainers.image.created="2023-12-02T11:50:16Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.7.2-debian-11-r3" \ + org.opencontainers.image.ref.name="2.7.3-debian-11-r4" \ org.opencontainers.image.title="airflow-worker" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.7.2" + org.opencontainers.image.version="2.7.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,24 +21,24 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages ca-certificates curl git krb5-user libbsd0 libbz2-1.0 libcdt5 libcgraph6 libcom-err2 libcrypt1 libedit2 libexpat1 libffi7 libgcc-s1 libgmp10 libgnutls30 libgss-dev libgssapi-krb5-2 libgvc6 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5-dev libkrb5support0 libldap-2.4-2 libltdl7 liblz4-1 liblzma5 libmariadb3 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpathplan4 libreadline8 libsasl2-2 libsasl2-modules libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libudev1 libunistring2 libuuid1 libxml2 libxslt1.1 locales netbase procps tzdata zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN install_packages ca-certificates curl git krb5-user libbsd0 libbz2-1.0 libcdt5 libcgraph6 libcom-err2 libcrypt1 libedit2 libexpat1 libffi7 libgcc-s1 libgmp10 libgnutls30 libgss-dev libgssapi-krb5-2 libgvc6 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5-dev libkrb5support0 libldap-2.4-2 libltdl7 liblz4-1 liblzma5 libmariadb3 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpathplan4 libreadline8 libsasl2-2 libsasl2-modules libsqlite3-0 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libxml2 libxslt1.1 locales netbase procps tzdata zlib1g +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "python-3.11.6-8-linux-${OS_ARCH}-debian-11" \ - "postgresql-client-16.0.0-0-linux-${OS_ARCH}-debian-11" \ - "ini-file-1.4.6-2-linux-${OS_ARCH}-debian-11" \ - "airflow-worker-2.7.2-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "wait-for-port-1.0.7-3-linux-${OS_ARCH}-debian-11" \ + "python-3.11.6-11-linux-${OS_ARCH}-debian-11" \ + "postgresql-client-16.1.0-0-linux-${OS_ARCH}-debian-11" \ + "ini-file-1.4.6-3-linux-${OS_ARCH}-debian-11" \ + "airflow-worker-2.7.3-5-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -55,7 +55,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/airflow-worker/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh ENV AIRFLOW_HOME="/opt/bitnami/airflow" \ - APP_VERSION="2.7.2" \ + APP_VERSION="2.7.3" \ BITNAMI_APP_NAME="airflow-worker" \ C_FORCE_ROOT="True" \ LANG="en_US.UTF-8" \ diff --git a/bitnami/airflow-worker/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/airflow-worker/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 9065bad151ede..f905a1272b5ea 100644 --- a/bitnami/airflow-worker/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/airflow-worker/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,30 +3,30 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.7.2-2" + "version": "2.7.3-5" }, "ini-file": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-2" + "version": "1.4.6-3" }, "postgresql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.0.0-0" + "version": "16.1.0-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-8" + "version": "3.11.6-11" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-3" } } \ No newline at end of file diff --git a/bitnami/airflow-worker/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/airflow-worker/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/airflow-worker/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/airflow-worker/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/airflow-worker/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/airflow-worker/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/airflow-worker/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/airflow-worker/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/airflow-worker/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh b/bitnami/airflow-worker/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh index be3f4b0cb488b..b21d4cb26ed70 100644 --- a/bitnami/airflow-worker/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh +++ b/bitnami/airflow-worker/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh @@ -185,8 +185,8 @@ airflow_execute() { ######################### airflow_generate_config() { # Create Airflow confirguration from default files - cp "$(find "$AIRFLOW_BASE_DIR" -name default_airflow.cfg)" "$AIRFLOW_CONF_FILE" - [[ -n "$AIRFLOW_WEBSERVER_CONF_FILE" ]] && cp "$(find "$AIRFLOW_BASE_DIR" -name default_webserver_config.py)" "$AIRFLOW_WEBSERVER_CONF_FILE" + [[ ! -f "$AIRFLOW_CONF_FILE" ]] && cp "$(find "$AIRFLOW_BASE_DIR" -name default_airflow.cfg)" "$AIRFLOW_CONF_FILE" + [[ -n "$AIRFLOW_WEBSERVER_CONF_FILE" ]] && [[ ! -f "$AIRFLOW_WEBSERVER_CONF_FILE" ]] && cp "$(find "$AIRFLOW_BASE_DIR" -name default_webserver_config.py)" "$AIRFLOW_WEBSERVER_CONF_FILE" # Setup Airflow base URL airflow_configure_base_url diff --git a/bitnami/airflow-worker/2/debian-11/tags-info.yaml b/bitnami/airflow-worker/2/debian-11/tags-info.yaml index 1a1c56c9d1edd..6e9a1935312e7 100644 --- a/bitnami/airflow-worker/2/debian-11/tags-info.yaml +++ b/bitnami/airflow-worker/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.7.2 +- 2.7.3 - latest diff --git a/bitnami/airflow-worker/README.md b/bitnami/airflow-worker/README.md index eb78fd4a7520c..1a945e683c87e 100644 --- a/bitnami/airflow-worker/README.md +++ b/bitnami/airflow-worker/README.md @@ -1,4 +1,4 @@ -# Apache Airflow Worker packaged by Bitnami +# Bitnami package for Apache Airflow Worker ## What is Apache Airflow Worker? @@ -23,7 +23,7 @@ You can find the default credentials and available configuration options in the * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/airflow/2/debian-11/Dockerfile b/bitnami/airflow/2/debian-11/Dockerfile index ec250113851ff..8a4e525d38c0a 100644 --- a/bitnami/airflow/2/debian-11/Dockerfile +++ b/bitnami/airflow/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-30T21:46:26Z" \ + org.opencontainers.image.created="2023-12-14T16:01:21Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.7.2-debian-11-r2" \ + org.opencontainers.image.ref.name="2.7.3-debian-11-r5" \ org.opencontainers.image.title="airflow" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.7.2" + org.opencontainers.image.version="2.7.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,24 +21,24 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages ca-certificates curl git krb5-user libbsd0 libbz2-1.0 libcdt5 libcgraph6 libcom-err2 libcrypt1 libedit2 libexpat1 libffi7 libgcc-s1 libgmp10 libgnutls30 libgss-dev libgssapi-krb5-2 libgvc6 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5-dev libkrb5support0 libldap-2.4-2 libltdl7 liblz4-1 liblzma5 libmariadb3 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpathplan4 libreadline8 libsasl2-2 libsasl2-modules libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libudev1 libunistring2 libuuid1 libxml2 libxslt1.1 locales netbase procps tzdata zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN install_packages ca-certificates curl git krb5-user libbsd0 libbz2-1.0 libcdt5 libcgraph6 libcom-err2 libcrypt1 libedit2 libexpat1 libffi7 libgcc-s1 libgmp10 libgnutls30 libgss-dev libgssapi-krb5-2 libgvc6 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5-dev libkrb5support0 libldap-2.4-2 libltdl7 liblz4-1 liblzma5 libmariadb3 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpathplan4 libreadline8 libsasl2-2 libsasl2-modules libsqlite3-0 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libxml2 libxslt1.1 locales netbase procps tzdata zlib1g +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "python-3.11.6-8-linux-${OS_ARCH}-debian-11" \ - "postgresql-client-16.0.0-0-linux-${OS_ARCH}-debian-11" \ - "ini-file-1.4.6-2-linux-${OS_ARCH}-debian-11" \ - "airflow-2.7.2-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "python-3.11.7-0-linux-${OS_ARCH}-debian-11" \ + "postgresql-client-16.1.0-0-linux-${OS_ARCH}-debian-11" \ + "ini-file-1.4.6-4-linux-${OS_ARCH}-debian-11" \ + "airflow-2.7.3-6-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -55,7 +55,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/airflow/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh ENV AIRFLOW_HOME="/opt/bitnami/airflow" \ - APP_VERSION="2.7.2" \ + APP_VERSION="2.7.3" \ BITNAMI_APP_NAME="airflow" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ diff --git a/bitnami/airflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/airflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 317f2c13056db..9d9a0faaa3654 100644 --- a/bitnami/airflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/airflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,30 +3,30 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.7.2-2" + "version": "2.7.3-6" }, "ini-file": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-2" + "version": "1.4.6-4" }, "postgresql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.0.0-0" + "version": "16.1.0-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-8" + "version": "3.11.7-0" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" } } \ No newline at end of file diff --git a/bitnami/airflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/airflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/airflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/airflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/airflow/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/airflow/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/airflow/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/airflow/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/airflow/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh b/bitnami/airflow/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh index be3f4b0cb488b..b21d4cb26ed70 100644 --- a/bitnami/airflow/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh +++ b/bitnami/airflow/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh @@ -185,8 +185,8 @@ airflow_execute() { ######################### airflow_generate_config() { # Create Airflow confirguration from default files - cp "$(find "$AIRFLOW_BASE_DIR" -name default_airflow.cfg)" "$AIRFLOW_CONF_FILE" - [[ -n "$AIRFLOW_WEBSERVER_CONF_FILE" ]] && cp "$(find "$AIRFLOW_BASE_DIR" -name default_webserver_config.py)" "$AIRFLOW_WEBSERVER_CONF_FILE" + [[ ! -f "$AIRFLOW_CONF_FILE" ]] && cp "$(find "$AIRFLOW_BASE_DIR" -name default_airflow.cfg)" "$AIRFLOW_CONF_FILE" + [[ -n "$AIRFLOW_WEBSERVER_CONF_FILE" ]] && [[ ! -f "$AIRFLOW_WEBSERVER_CONF_FILE" ]] && cp "$(find "$AIRFLOW_BASE_DIR" -name default_webserver_config.py)" "$AIRFLOW_WEBSERVER_CONF_FILE" # Setup Airflow base URL airflow_configure_base_url diff --git a/bitnami/airflow/2/debian-11/tags-info.yaml b/bitnami/airflow/2/debian-11/tags-info.yaml index 1a1c56c9d1edd..6e9a1935312e7 100644 --- a/bitnami/airflow/2/debian-11/tags-info.yaml +++ b/bitnami/airflow/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.7.2 +- 2.7.3 - latest diff --git a/bitnami/airflow/README.md b/bitnami/airflow/README.md index f515d1badce67..a343e2f79b726 100644 --- a/bitnami/airflow/README.md +++ b/bitnami/airflow/README.md @@ -1,4 +1,4 @@ -# Apache Airflow packaged by Bitnami +# Bitnami package for Apache Airflow ## What is Apache Airflow? @@ -23,7 +23,7 @@ docker-compose up * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/alertmanager/0/debian-11/Dockerfile b/bitnami/alertmanager/0/debian-11/Dockerfile index b8d3ea7a6ee8f..08c2993852f48 100644 --- a/bitnami/alertmanager/0/debian-11/Dockerfile +++ b/bitnami/alertmanager/0/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-10T23:02:32Z" \ + org.opencontainers.image.created="2023-12-06T13:36:58Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.26.0-debian-11-r43" \ + org.opencontainers.image.ref.name="0.26.0-debian-11-r45" \ org.opencontainers.image.title="alertmanager" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="0.26.0" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "alertmanager-0.26.0-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "alertmanager-0.26.0-5-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/alertmanager/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/alertmanager/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8af7a9a479b47..902af5c9f81dc 100644 --- a/bitnami/alertmanager/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/alertmanager/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.26.0-3" + "version": "0.26.0-5" } } \ No newline at end of file diff --git a/bitnami/alertmanager/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/alertmanager/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/alertmanager/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/alertmanager/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/alertmanager/README.md b/bitnami/alertmanager/README.md index d4a10275b510d..baed9c2354fd9 100644 --- a/bitnami/alertmanager/README.md +++ b/bitnami/alertmanager/README.md @@ -1,4 +1,4 @@ -# AlertManager packaged by Bitnami +# Bitnami package for AlertManager ## What is AlertManager? @@ -18,7 +18,7 @@ docker run --name alertmanager bitnami/alertmanager:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/apache-exporter/1/debian-11/Dockerfile b/bitnami/apache-exporter/1/debian-11/Dockerfile index 8e00fc8ceca9f..5781abf63d314 100644 --- a/bitnami/apache-exporter/1/debian-11/Dockerfile +++ b/bitnami/apache-exporter/1/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-19T01:31:10Z" \ + org.opencontainers.image.created="2023-12-06T14:24:09Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.0.3-debian-11-r0" \ + org.opencontainers.image.ref.name="1.0.3-debian-11-r2" \ org.opencontainers.image.title="apache-exporter" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.0.3" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "apache-exporter-1.0.3-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "apache-exporter-1.0.3-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y ca-certificates curl && \ diff --git a/bitnami/apache-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/apache-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8f72ac19f7400..31359b290fd39 100644 --- a/bitnami/apache-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/apache-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.3-0" + "version": "1.0.3-2" } } \ No newline at end of file diff --git a/bitnami/apache-exporter/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/apache-exporter/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/apache-exporter/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/apache-exporter/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/apache-exporter/README.md b/bitnami/apache-exporter/README.md index 4bd417c7fe3a5..2bab9f11b344f 100644 --- a/bitnami/apache-exporter/README.md +++ b/bitnami/apache-exporter/README.md @@ -1,4 +1,4 @@ -# Apache Exporter packaged by Bitnami +# Bitnami package for Apache Exporter ## What is Apache Exporter? @@ -18,7 +18,7 @@ docker run --name apache-exporter bitnami/apache-exporter:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/apache/2.4/debian-11/Dockerfile b/bitnami/apache/2.4/debian-11/Dockerfile index c6fe5566c430e..d93ab473ac630 100644 --- a/bitnami/apache/2.4/debian-11/Dockerfile +++ b/bitnami/apache/2.4/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-19T13:47:23Z" \ + org.opencontainers.image.created="2023-12-07T08:33:03Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.4.58-debian-11-r0" \ + org.opencontainers.image.ref.name="2.4.58-debian-11-r3" \ org.opencontainers.image.title="apache" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.4.58" @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libcrypt1 libexpat1 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblzma5 libnettle8 libnghttp2-14 libp11-kit0 libpcre3 libsasl2-2 libssl1.1 libstdc++6 libtasn1-6 libunistring2 libxml2 openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.58-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.58-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 6a19ff16f5a13..853be1742fef4 100644 --- a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.58-0" + "version": "2.4.58-2" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" } } \ No newline at end of file diff --git a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/apache/2.4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/apache/2.4/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/apache/2.4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/apache/2.4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/apache/2.4/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/apache/2.4/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh index 765d1d8ce1ed5..6a480ad4ddde9 100755 --- a/bitnami/apache/2.4/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh +++ b/bitnami/apache/2.4/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh @@ -46,6 +46,7 @@ apache_setup_bitnami_config() { local -a modules_to_disable=( "http2_module" "proxy_hcheck_module" + "proxy_html_module" "proxy_http2_module" ) for module in "${modules_to_disable[@]}"; do diff --git a/bitnami/apache/README.md b/bitnami/apache/README.md index 88f70b243983d..aaa7e19aa3aa7 100644 --- a/bitnami/apache/README.md +++ b/bitnami/apache/README.md @@ -1,4 +1,4 @@ -# Apache packaged by Bitnami +# Bitnami package for Apache ## What is Apache? @@ -27,7 +27,7 @@ You can find the available configuration options in the [Environment Variables]( * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/apisix-dashboard/3/debian-11/Dockerfile b/bitnami/apisix-dashboard/3/debian-11/Dockerfile index b346f7115f8b5..a91181a4f8616 100644 --- a/bitnami/apisix-dashboard/3/debian-11/Dockerfile +++ b/bitnami/apisix-dashboard/3/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-20T13:38:20Z" \ + org.opencontainers.image.created="2023-12-12T13:51:50Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.0.1-debian-11-r136" \ + org.opencontainers.image.ref.name="3.0.1-debian-11-r140" \ org.opencontainers.image.title="apisix-dashboard" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.0.1" @@ -21,22 +21,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "apisix-dashboard-3.0.1-9-linux-${OS_ARCH}-debian-11" \ - ) && \ + "yq-4.40.5-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "apisix-dashboard-3.0.1-14-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN mkdir -p /opt/bitnami/apisix-dashboard/logs && chmod g+rwX /opt/bitnami/apisix-dashboard/logs diff --git a/bitnami/apisix-dashboard/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/apisix-dashboard/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index ed0a6c79b3bf3..baa379943ad98 100644 --- a/bitnami/apisix-dashboard/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/apisix-dashboard/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.0.1-9" + "version": "3.0.1-14" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.5-0" } } \ No newline at end of file diff --git a/bitnami/apisix-dashboard/3/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/apisix-dashboard/3/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/apisix-dashboard/3/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/apisix-dashboard/3/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/apisix-dashboard/README.md b/bitnami/apisix-dashboard/README.md index 00667fb63dead..d90436561a32b 100644 --- a/bitnami/apisix-dashboard/README.md +++ b/bitnami/apisix-dashboard/README.md @@ -1,4 +1,4 @@ -# Apache APISIX Dashboard packaged by Bitnami +# Bitnami package for Apache APISIX Dashboard ## What is Apache APISIX Dashboard? @@ -25,10 +25,12 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. +Looking to use Apache APISIX Dashboard in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. + ## Supported tags and respective `Dockerfile` links Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). diff --git a/bitnami/apisix-ingress-controller/1/debian-11/Dockerfile b/bitnami/apisix-ingress-controller/1/debian-11/Dockerfile index 106af1afb7b56..eb25f23a1b140 100644 --- a/bitnami/apisix-ingress-controller/1/debian-11/Dockerfile +++ b/bitnami/apisix-ingress-controller/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-10T23:22:50Z" \ + org.opencontainers.image.created="2023-12-06T13:49:52Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.7.0-debian-11-r15" \ + org.opencontainers.image.ref.name="1.7.1-debian-11-r1" \ org.opencontainers.image.title="apisix-ingress-controller" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.7.0" + org.opencontainers.image.version="1.7.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,22 +21,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "yq-4.35.2-2-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-1-linux-${OS_ARCH}-debian-11" \ - "apisix-ingress-controller-1.7.0-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "yq-4.40.4-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-3-linux-${OS_ARCH}-debian-11" \ + "apisix-ingress-controller-1.7.1-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -44,7 +44,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN useradd -r -u 1001 -g root apisix-ingress-controller -ENV APP_VERSION="1.7.0" \ +ENV APP_VERSION="1.7.1" \ BITNAMI_APP_NAME="apisix-ingress-controller" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/apisix-ingress-controller/bin:$PATH" diff --git a/bitnami/apisix-ingress-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/apisix-ingress-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index a02e3cc12ea23..54f7c5c3f9829 100644 --- a/bitnami/apisix-ingress-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/apisix-ingress-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.7.0-3" + "version": "1.7.1-1" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-1" + "version": "1.0.6-3" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-2" + "version": "4.40.4-0" } } \ No newline at end of file diff --git a/bitnami/apisix-ingress-controller/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/apisix-ingress-controller/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/apisix-ingress-controller/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/apisix-ingress-controller/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/apisix-ingress-controller/1/debian-11/tags-info.yaml b/bitnami/apisix-ingress-controller/1/debian-11/tags-info.yaml index c12a7a21c494f..019dfa293b1a0 100644 --- a/bitnami/apisix-ingress-controller/1/debian-11/tags-info.yaml +++ b/bitnami/apisix-ingress-controller/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.7.0 +- 1.7.1 - latest diff --git a/bitnami/apisix-ingress-controller/README.md b/bitnami/apisix-ingress-controller/README.md index 5d617fad526aa..f706ab76a9dc0 100644 --- a/bitnami/apisix-ingress-controller/README.md +++ b/bitnami/apisix-ingress-controller/README.md @@ -1,4 +1,4 @@ -# Apache APISIX Ingress Controller packaged by Bitnami +# Bitnami package for Apache APISIX Ingress Controller ## What is Apache APISIX Ingress Controller? @@ -25,10 +25,12 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. +Looking to use Apache APISIX Ingress Controller in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. + ## Supported tags and respective `Dockerfile` links Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). diff --git a/bitnami/apisix/3/debian-11/Dockerfile b/bitnami/apisix/3/debian-11/Dockerfile index 975cf86803e48..60a5e2e897f83 100644 --- a/bitnami/apisix/3/debian-11/Dockerfile +++ b/bitnami/apisix/3/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T22:35:44Z" \ + org.opencontainers.image.created="2023-11-27T15:52:58Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.6.0-debian-11-r3" \ + org.opencontainers.image.ref.name="3.7.0-debian-11-r1" \ org.opencontainers.image.title="apisix" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="3.6.0" + org.opencontainers.image.version="3.7.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,22 +21,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbrotli1 libbsd0 libcrypt1 libdeflate0 libexpat1 libffi7 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libgd3 libgeoip1 libgmp10 libgnutls30 libgpg-error0 libhogweed6 libicu67 libidn2-0 libjbig0 libjpeg62-turbo libldap-2.4-2 liblzma5 libmd0 libnettle8 libp11-kit0 libpcre3 libpng16-16 libsasl2-2 libssl1.1 libstdc++6 libtasn1-6 libtiff5 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxml2 libxpm4 libxslt1.1 libzstd1 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "yq-4.35.2-2-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-1-linux-${OS_ARCH}-debian-11" \ - "apisix-3.6.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "yq-4.40.3-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-3-linux-${OS_ARCH}-debian-11" \ + "apisix-3.7.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -45,7 +45,7 @@ RUN apt-get autoremove --purge -y curl && \ RUN useradd -r -u 1001 -g root apisix RUN chmod g+rwX /opt/bitnami/apisix/conf && mkdir -p /usr/local/apisix/logs && chmod -R g+rwX /usr/local/apisix && ln -s /opt/bitnami/apisix/conf /usr/local/apisix && ln -s /opt/bitnami/apisix/deps /usr/local/apisix && ln -s /opt/bitnami/apisix/openresty/luajit/share/lua/*/apisix /usr/local/apisix -ENV APP_VERSION="3.6.0" \ +ENV APP_VERSION="3.7.0" \ BITNAMI_APP_NAME="apisix" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/apisix/bin:/opt/bitnami/apisix/openresty/bin:/opt/bitnami/apisix/openresty/luajit/bin:/opt/bitnami/apisix/openresty/luarocks/bin:/opt/bitnami/apisix/openresty/nginx/sbin:$PATH" diff --git a/bitnami/apisix/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/apisix/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 61152c1ff8f35..d382186aedf8c 100644 --- a/bitnami/apisix/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/apisix/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.6.0-0" + "version": "3.7.0-0" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-1" + "version": "1.0.6-3" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-2" + "version": "4.40.3-0" } } \ No newline at end of file diff --git a/bitnami/apisix/3/debian-11/tags-info.yaml b/bitnami/apisix/3/debian-11/tags-info.yaml index c44b5079455f8..c5c9a5c9795af 100644 --- a/bitnami/apisix/3/debian-11/tags-info.yaml +++ b/bitnami/apisix/3/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "3" - 3-debian-11 -- 3.6.0 +- 3.7.0 - latest diff --git a/bitnami/apisix/README.md b/bitnami/apisix/README.md index 3cc7019f3e6a1..e2f68dec6b11e 100644 --- a/bitnami/apisix/README.md +++ b/bitnami/apisix/README.md @@ -1,4 +1,4 @@ -# Apache APISIX packaged by Bitnami +# Bitnami package for Apache APISIX ## What is Apache APISIX? @@ -25,10 +25,12 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. +Looking to use Apache APISIX in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. + ## Supported tags and respective `Dockerfile` links Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). diff --git a/bitnami/appsmith/1/debian-11/Dockerfile b/bitnami/appsmith/1/debian-11/Dockerfile index 8049652cad8a2..bb75704dccfae 100644 --- a/bitnami/appsmith/1/debian-11/Dockerfile +++ b/bitnami/appsmith/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T14:04:14Z" \ + org.opencontainers.image.created="2023-12-18T10:37:05Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.9.42-debian-11-r0" \ + org.opencontainers.image.ref.name="1.9.56-debian-11-r0" \ org.opencontainers.image.title="appsmith" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.9.42" + org.opencontainers.image.version="1.9.56" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,27 +21,27 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gettext libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgeoip1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libpcre3 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "node-18.18.2-0-linux-${OS_ARCH}-debian-11" \ - "nginx-1.25.3-0-linux-${OS_ARCH}-debian-11" \ - "mongodb-shell-2.0.2-0-linux-${OS_ARCH}-debian-11" \ - "java-17.0.9-11-1-linux-${OS_ARCH}-debian-11" \ - "appsmith-1.9.42-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.7-0-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "node-18.19.0-0-linux-${OS_ARCH}-debian-11" \ + "nginx-1.25.3-1-linux-${OS_ARCH}-debian-11" \ + "mongodb-shell-2.1.1-0-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "appsmith-1.9.56-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -51,7 +51,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/nginx/postunpack.sh RUN /opt/bitnami/scripts/appsmith/postunpack.sh -ENV APP_VERSION="1.9.42" \ +ENV APP_VERSION="1.9.56" \ BITNAMI_APP_NAME="appsmith" \ NGINX_HTTPS_PORT_NUMBER="" \ NGINX_HTTP_PORT_NUMBER="" \ diff --git a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c68f386fc60ed..7f63d29da2b0f 100644 --- a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,48 +3,48 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.9.42-0" + "version": "1.9.56-0" }, "java": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.9-11-1" + "version": "17.0.9-11-6" }, "mongodb-shell": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.0.2-0" + "version": "2.1.1-0" }, "nginx": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.25.3-0" + "version": "1.25.3-1" }, "node": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "18.18.2-0" + "version": "18.19.0-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.7-0" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" } } \ No newline at end of file diff --git a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/appsmith/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/appsmith/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/appsmith/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/appsmith/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/appsmith/1/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf b/bitnami/appsmith/1/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf index 6c2b5b1ba288f..aaf0428032c41 100644 --- a/bitnami/appsmith/1/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf +++ b/bitnami/appsmith/1/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf @@ -33,7 +33,7 @@ http { gzip_proxied any; gzip_types text/plain text/css application/javascript text/xml application/xml+rss; keepalive_timeout 65; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; + ssl_protocols TLSv1.2 TLSv1.3; ssl_ciphers HIGH:!aNULL:!MD5; client_max_body_size 80M; server_tokens off; diff --git a/bitnami/appsmith/1/debian-11/rootfs/opt/bitnami/scripts/libappsmith.sh b/bitnami/appsmith/1/debian-11/rootfs/opt/bitnami/scripts/libappsmith.sh index 1c8a990088808..c66cb4675651b 100644 --- a/bitnami/appsmith/1/debian-11/rootfs/opt/bitnami/scripts/libappsmith.sh +++ b/bitnami/appsmith/1/debian-11/rootfs/opt/bitnami/scripts/libappsmith.sh @@ -194,7 +194,7 @@ appsmith_backend_stop() { is_appsmith_rts_running() { # appsmith-rts does not create any PID file # We regenerate the PID file for each time we query it to avoid getting outdated - pgrep -f "${APPSMITH_BASE_DIR}/rts/server.js" | head -n 1 > "$APPSMITH_RTS_PID_FILE" + pgrep -f "${APPSMITH_BASE_DIR}/rts/bundle/server.js" | head -n 1 > "$APPSMITH_RTS_PID_FILE" pid="$(get_pid_from_file "$APPSMITH_RTS_PID_FILE")" if [[ -n "$pid" ]]; then @@ -346,23 +346,19 @@ appsmith_initialize() { local -r -a create_user_cmd=("curl") # Taken from inspecting Appsmith wizard # https://github.com/appsmithorg/appsmith/blob/release/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserSignupRequestDTO.java#L26 - local -r -a create_user_args=("-X" "POST" + # Necessary for the installer to succeed + local -r -a create_user_args=("-L" "http://localhost:${APPSMITH_API_PORT}/api/v1/users/super" + "-H" "Origin: http://localhost:${APPSMITH_API_PORT}" + "-H" "Content-Type: application/x-www-form-urlencoded" "--data-urlencode" "name=${APPSMITH_USERNAME}" "--data-urlencode" "email=${APPSMITH_EMAIL}" "--data-urlencode" "password=${APPSMITH_PASSWORD}" - # Necessary for the installer to succeed "--data-urlencode" "allowCollectingAnnonymousData=false" - "--data-urlencode" "signupForNewsletter=false" - "--data-urlencode" "role=engineer" - "--data-urlencode" "useCase=just exploring" - "http://localhost:${APPSMITH_API_PORT}/api/v1/users/super" - ) - + "--data-urlencode" "signupForNewsletter=false") if ! debug_execute "${create_user_cmd[@]}" "${create_user_args[@]}"; then error "Installation failed. User ${APPSMITH_USERNAME} could not be created" exit 1 fi - info "User created successfully" fi else diff --git a/bitnami/appsmith/1/debian-11/tags-info.yaml b/bitnami/appsmith/1/debian-11/tags-info.yaml index f40acc1615ffc..f988ba29ebd83 100644 --- a/bitnami/appsmith/1/debian-11/tags-info.yaml +++ b/bitnami/appsmith/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.9.42 +- 1.9.56 - latest diff --git a/bitnami/appsmith/README.md b/bitnami/appsmith/README.md index aa8cb7998243d..7ade2b4415f16 100644 --- a/bitnami/appsmith/README.md +++ b/bitnami/appsmith/README.md @@ -1,4 +1,4 @@ -# Appsmith packaged by Bitnami +# Bitnami package for Appsmith ## What is Appsmith? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/argo-cd/2/debian-11/Dockerfile b/bitnami/argo-cd/2/debian-11/Dockerfile index 60f5ca35c68b8..7c092f4b4738f 100644 --- a/bitnami/argo-cd/2/debian-11/Dockerfile +++ b/bitnami/argo-cd/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-30T10:59:53Z" \ + org.opencontainers.image.created="2023-12-15T01:24:14Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.8.5-debian-11-r0" \ + org.opencontainers.image.ref.name="2.9.3-debian-11-r2" \ org.opencontainers.image.title="argo-cd" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.8.5" + org.opencontainers.image.version="2.9.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl git git-lfs gnupg openssh-client procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "argo-cd-2.8.5-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "argo-cd-2.9.3-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -44,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/argo-cd/postunpack.sh -ENV APP_VERSION="2.8.5" \ +ENV APP_VERSION="2.9.3" \ BITNAMI_APP_NAME="argo-cd" \ PATH="/opt/bitnami/argo-cd/bin:/opt/bitnami/argo-cd/hack:/opt/bitnami/helm/bin:/opt/bitnami/ksonnet/bin:/opt/bitnami/kustomize/bin:$PATH" diff --git a/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 9c8eacd8312b0..3894172357447 100644 --- a/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.8.5-0" + "version": "2.9.3-2" } } \ No newline at end of file diff --git a/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/argo-cd/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/argo-cd/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/argo-cd/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/argo-cd/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/argo-cd/2/debian-11/tags-info.yaml b/bitnami/argo-cd/2/debian-11/tags-info.yaml index 8564d2ac3ee10..07fad6e5b8326 100644 --- a/bitnami/argo-cd/2/debian-11/tags-info.yaml +++ b/bitnami/argo-cd/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.8.5 +- 2.9.3 - latest diff --git a/bitnami/argo-cd/README.md b/bitnami/argo-cd/README.md index 64145eeeec54a..5bae0c1611c24 100644 --- a/bitnami/argo-cd/README.md +++ b/bitnami/argo-cd/README.md @@ -1,4 +1,4 @@ -# Argo CD packaged by Bitnami +# Bitnami package for Argo CD ## What is Argo CD? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/argo-workflow-cli/3/debian-11/Dockerfile b/bitnami/argo-workflow-cli/3/debian-11/Dockerfile index 5ab067fb797a6..be38e5bd02771 100644 --- a/bitnami/argo-workflow-cli/3/debian-11/Dockerfile +++ b/bitnami/argo-workflow-cli/3/debian-11/Dockerfile @@ -8,21 +8,21 @@ ARG TARGETARCH ENV OS_ARCH="${TARGETARCH:-amd64}" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "argo-workflows-3.5.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "argo-workflows-3.5.2-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done @@ -36,13 +36,13 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="scratch" \ - org.opencontainers.image.created="2023-10-16T16:54:28Z" \ + org.opencontainers.image.created="2023-12-12T13:11:35Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.5.0-debian-11-r0" \ + org.opencontainers.image.ref.name="3.5.2-debian-11-r2" \ org.opencontainers.image.title="argo-workflow-cli" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="3.5.0" + org.opencontainers.image.version="3.5.2" COPY prebuildfs / COPY rootfs / @@ -50,7 +50,7 @@ COPY --from=builder /opt/bitnami/argo-workflows/hack/nsswitch.conf /etc/nsswitc COPY --from=builder /opt/bitnami/argo-workflows/bin/argo /argo COPY --from=builder /opt/bitnami/argo-workflows/hack/ssh_known_hosts /etc/ssh/ssh_known_hosts -ENV APP_VERSION="3.5.0" \ +ENV APP_VERSION="3.5.2" \ BITNAMI_APP_NAME="argo-workflow-cli" USER 1001 diff --git a/bitnami/argo-workflow-cli/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/argo-workflow-cli/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8fc737fb162ec..0d8a9b185f07c 100644 --- a/bitnami/argo-workflow-cli/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/argo-workflow-cli/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.5.0-0" + "version": "3.5.2-2" } } \ No newline at end of file diff --git a/bitnami/argo-workflow-cli/3/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/argo-workflow-cli/3/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/argo-workflow-cli/3/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/argo-workflow-cli/3/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/argo-workflow-cli/3/debian-11/tags-info.yaml b/bitnami/argo-workflow-cli/3/debian-11/tags-info.yaml index 5f882132e06cf..01bcd7e3217e5 100644 --- a/bitnami/argo-workflow-cli/3/debian-11/tags-info.yaml +++ b/bitnami/argo-workflow-cli/3/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "3" - 3-debian-11 -- 3.5.0 +- 3.5.2 - latest diff --git a/bitnami/argo-workflow-cli/README.md b/bitnami/argo-workflow-cli/README.md index 85c8aaf88f46d..3e02c41a76dac 100644 --- a/bitnami/argo-workflow-cli/README.md +++ b/bitnami/argo-workflow-cli/README.md @@ -1,4 +1,4 @@ -# Argo Workflows packaged by Bitnami +# Bitnami package for Argo Workflows ## What is Argo Workflows? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/argo-workflow-controller/3/debian-11/Dockerfile b/bitnami/argo-workflow-controller/3/debian-11/Dockerfile index 304536656db7f..fbe9762e28df1 100644 --- a/bitnami/argo-workflow-controller/3/debian-11/Dockerfile +++ b/bitnami/argo-workflow-controller/3/debian-11/Dockerfile @@ -8,21 +8,21 @@ ARG TARGETARCH ENV OS_ARCH="${TARGETARCH:-amd64}" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl tzdata -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "argo-workflow-controller-3.5.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "argo-workflow-controller-3.5.2-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done @@ -36,20 +36,20 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="scratch" \ - org.opencontainers.image.created="2023-10-16T16:54:58Z" \ + org.opencontainers.image.created="2023-12-06T16:33:54Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.5.0-debian-11-r0" \ + org.opencontainers.image.ref.name="3.5.2-debian-11-r1" \ org.opencontainers.image.title="argo-workflow-controller" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="3.5.0" + org.opencontainers.image.version="3.5.2" COPY prebuildfs / COPY rootfs / COPY --from=builder /opt/bitnami/../../usr/share/zoneinfo /usr/share/zoneinfo COPY --from=builder /opt/bitnami/argo-workflow-controller/bin/workflow-controller /workflow-controller -ENV APP_VERSION="3.5.0" \ +ENV APP_VERSION="3.5.2" \ BITNAMI_APP_NAME="argo-workflow-controller" USER 1001 diff --git a/bitnami/argo-workflow-controller/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/argo-workflow-controller/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index e935fc32203a1..4f3fc5c8438a4 100644 --- a/bitnami/argo-workflow-controller/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/argo-workflow-controller/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.5.0-0" + "version": "3.5.2-1" } } \ No newline at end of file diff --git a/bitnami/argo-workflow-controller/3/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/argo-workflow-controller/3/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/argo-workflow-controller/3/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/argo-workflow-controller/3/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/argo-workflow-controller/3/debian-11/tags-info.yaml b/bitnami/argo-workflow-controller/3/debian-11/tags-info.yaml index 5f882132e06cf..01bcd7e3217e5 100644 --- a/bitnami/argo-workflow-controller/3/debian-11/tags-info.yaml +++ b/bitnami/argo-workflow-controller/3/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "3" - 3-debian-11 -- 3.5.0 +- 3.5.2 - latest diff --git a/bitnami/argo-workflow-controller/README.md b/bitnami/argo-workflow-controller/README.md index bf05af6b10b61..56f9717a52a81 100644 --- a/bitnami/argo-workflow-controller/README.md +++ b/bitnami/argo-workflow-controller/README.md @@ -1,4 +1,4 @@ -# Argo Workflow Controller packaged by Bitnami +# Bitnami package for Argo Workflow Controller ## What is Argo Workflow Controller? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/argo-workflow-exec/3/debian-11/Dockerfile b/bitnami/argo-workflow-exec/3/debian-11/Dockerfile index 272d3609f3b92..63ac47a29f168 100644 --- a/bitnami/argo-workflow-exec/3/debian-11/Dockerfile +++ b/bitnami/argo-workflow-exec/3/debian-11/Dockerfile @@ -7,34 +7,34 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-16T16:48:20Z" \ + org.opencontainers.image.created="2023-12-12T14:12:03Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.5.0-debian-11-r0" \ + org.opencontainers.image.ref.name="3.5.2-debian-11-r2" \ org.opencontainers.image.title="argo-workflow-exec" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="3.5.0" + org.opencontainers.image.version="3.5.2" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl jq procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "kubectl-1.26.9-3-linux-${OS_ARCH}-debian-11" \ - "argo-workflow-exec-3.5.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "kubectl-1.26.11-1-linux-${OS_ARCH}-debian-11" \ + "argo-workflow-exec-3.5.2-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -43,7 +43,7 @@ RUN apt-get autoremove --purge -y curl && \ COPY rootfs / RUN /opt/bitnami/scripts/argo-workflow-exec/postunpack.sh -ENV APP_VERSION="3.5.0" \ +ENV APP_VERSION="3.5.2" \ BITNAMI_APP_NAME="argo-workflow-exec" \ PATH="/opt/bitnami/kubectl/bin:/opt/bitnami/argo-workflow-exec/bin:/opt/bitnami/argo-workflow-exec/hack:$PATH" diff --git a/bitnami/argo-workflow-exec/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/argo-workflow-exec/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index a0b83d089ea7a..61ba6d09f4451 100644 --- a/bitnami/argo-workflow-exec/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/argo-workflow-exec/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.5.0-0" + "version": "3.5.2-2" }, "kubectl": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.26.9-3" + "version": "1.26.11-1" } } \ No newline at end of file diff --git a/bitnami/argo-workflow-exec/3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/argo-workflow-exec/3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/argo-workflow-exec/3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/argo-workflow-exec/3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/argo-workflow-exec/3/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/argo-workflow-exec/3/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/argo-workflow-exec/3/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/argo-workflow-exec/3/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/argo-workflow-exec/3/debian-11/tags-info.yaml b/bitnami/argo-workflow-exec/3/debian-11/tags-info.yaml index 5f882132e06cf..01bcd7e3217e5 100644 --- a/bitnami/argo-workflow-exec/3/debian-11/tags-info.yaml +++ b/bitnami/argo-workflow-exec/3/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "3" - 3-debian-11 -- 3.5.0 +- 3.5.2 - latest diff --git a/bitnami/argo-workflow-exec/README.md b/bitnami/argo-workflow-exec/README.md index 1079498c8e1c1..08d2af46f13a1 100644 --- a/bitnami/argo-workflow-exec/README.md +++ b/bitnami/argo-workflow-exec/README.md @@ -1,4 +1,4 @@ -# Argo Workflow Executor packaged by Bitnami +# Bitnami package for Argo Workflow Executor ## What is Argo Workflow Executor? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/aspnet-core/6/debian-11/Dockerfile b/bitnami/aspnet-core/6/debian-11/Dockerfile index b346509ef4f85..022746ff0b78a 100644 --- a/bitnami/aspnet-core/6/debian-11/Dockerfile +++ b/bitnami/aspnet-core/6/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T19:34:26Z" \ + org.opencontainers.image.created="2023-12-02T08:23:21Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.0.24-debian-11-r0" \ + org.opencontainers.image.ref.name="6.0.25-debian-11-r1" \ org.opencontainers.image.title="aspnet-core" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="6.0.24" + org.opencontainers.image.version="6.0.25" ENV HOME="/app" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/app" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages build-essential ca-certificates curl git libcap2-bin libgcc-s1 libicu-dev liblttng-ust-dev libsqlite3-dev libssl-dev libstdc++6 pkg-config procps unzip wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "aspnet-core-6.0.24-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "aspnet-core-6.0.25-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ COPY rootfs / RUN /opt/bitnami/scripts/aspnet-core/postunpack.sh -ENV APP_VERSION="6.0.24" \ +ENV APP_VERSION="6.0.25" \ BITNAMI_APP_NAME="aspnet-core" \ DOTNET_CLI_HOME="/app" \ DOTNET_ROOT="/opt/bitnami/aspnet-core/bin" \ diff --git a/bitnami/aspnet-core/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/aspnet-core/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index cbca19c5973a4..2c3d6e8536def 100644 --- a/bitnami/aspnet-core/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/aspnet-core/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "6.0.24-0" + "version": "6.0.25-0" } } \ No newline at end of file diff --git a/bitnami/aspnet-core/6/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/aspnet-core/6/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/aspnet-core/6/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/aspnet-core/6/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/aspnet-core/6/debian-11/tags-info.yaml b/bitnami/aspnet-core/6/debian-11/tags-info.yaml index 0ea882f6b228a..acf19ee72736c 100644 --- a/bitnami/aspnet-core/6/debian-11/tags-info.yaml +++ b/bitnami/aspnet-core/6/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "6" - 6-debian-11 -- 6.0.24 +- 6.0.25 diff --git a/bitnami/aspnet-core/7/debian-11/Dockerfile b/bitnami/aspnet-core/7/debian-11/Dockerfile index acbb38b8bc530..bf87312f84a15 100644 --- a/bitnami/aspnet-core/7/debian-11/Dockerfile +++ b/bitnami/aspnet-core/7/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T19:40:24Z" \ + org.opencontainers.image.created="2023-12-02T08:52:03Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.0.13-debian-11-r0" \ + org.opencontainers.image.ref.name="7.0.14-debian-11-r1" \ org.opencontainers.image.title="aspnet-core" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.0.13" + org.opencontainers.image.version="7.0.14" ENV HOME="/app" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/app" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages build-essential ca-certificates curl git libcap2-bin libgcc-s1 libicu-dev liblttng-ust-dev libsqlite3-dev libssl-dev libstdc++6 pkg-config procps unzip wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "aspnet-core-7.0.13-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "aspnet-core-7.0.14-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ COPY rootfs / RUN /opt/bitnami/scripts/aspnet-core/postunpack.sh -ENV APP_VERSION="7.0.13" \ +ENV APP_VERSION="7.0.14" \ BITNAMI_APP_NAME="aspnet-core" \ DOTNET_CLI_HOME="/app" \ DOTNET_ROOT="/opt/bitnami/aspnet-core/bin" \ diff --git a/bitnami/aspnet-core/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/aspnet-core/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 593a1ef5ed466..c65006c10159e 100644 --- a/bitnami/aspnet-core/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/aspnet-core/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.0.13-0" + "version": "7.0.14-0" } } \ No newline at end of file diff --git a/bitnami/aspnet-core/7/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/aspnet-core/7/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/aspnet-core/7/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/aspnet-core/7/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/aspnet-core/7/debian-11/tags-info.yaml b/bitnami/aspnet-core/7/debian-11/tags-info.yaml index 6cdbd063d5fea..c8d89b5b3e803 100644 --- a/bitnami/aspnet-core/7/debian-11/tags-info.yaml +++ b/bitnami/aspnet-core/7/debian-11/tags-info.yaml @@ -1,5 +1,4 @@ rolling-tags: - "7" - 7-debian-11 -- 7.0.13 -- latest +- 7.0.14 diff --git a/bitnami/aspnet-core/8/debian-11/Dockerfile b/bitnami/aspnet-core/8/debian-11/Dockerfile new file mode 100644 index 0000000000000..e8beabab13bc4 --- /dev/null +++ b/bitnami/aspnet-core/8/debian-11/Dockerfile @@ -0,0 +1,57 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +FROM docker.io/bitnami/minideb:bullseye + +ARG TARGETARCH + +LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-12-02T08:48:04Z" \ + org.opencontainers.image.description="Application packaged by VMware, Inc" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.ref.name="8.0.0-debian-11-r2" \ + org.opencontainers.image.title="aspnet-core" \ + org.opencontainers.image.vendor="VMware, Inc." \ + org.opencontainers.image.version="8.0.0" + +ENV HOME="/app" \ + OS_ARCH="${TARGETARCH:-amd64}" \ + OS_FLAVOUR="debian-11" \ + OS_NAME="linux" + +COPY prebuildfs / +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] +# Install required system packages and dependencies +RUN install_packages build-essential ca-certificates curl git libcap2-bin libgcc-s1 libicu-dev liblttng-ust-dev libsqlite3-dev libssl-dev libstdc++6 pkg-config procps unzip wget zlib1g +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ + COMPONENTS=( \ + "aspnet-core-8.0.0-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ + for COMPONENT in "${COMPONENTS[@]}"; do \ + if [ ! -f "${COMPONENT}.tar.gz" ]; then \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ + rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ + done +RUN apt-get autoremove --purge -y curl && \ + apt-get update && apt-get upgrade -y && \ + apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives +RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ + sed -i 's/^PASS_MIN_DAYS.*/PASS_MIN_DAYS 0/' /etc/login.defs && \ + sed -i 's/sha512/sha512 minlen=8/' /etc/pam.d/common-password + +COPY rootfs / +RUN /opt/bitnami/scripts/aspnet-core/postunpack.sh +ENV APP_VERSION="8.0.0" \ + BITNAMI_APP_NAME="aspnet-core" \ + DOTNET_CLI_HOME="/app" \ + DOTNET_ROOT="/opt/bitnami/aspnet-core/bin" \ + PATH="/opt/bitnami/aspnet-core/bin:$PATH" + +WORKDIR /app +ENTRYPOINT [ "/opt/bitnami/scripts/aspnet-core/entrypoint.sh" ] +CMD [ "/bin/bash" ] diff --git a/bitnami/aspnet-core/8/debian-11/docker-compose.yml b/bitnami/aspnet-core/8/debian-11/docker-compose.yml new file mode 100644 index 0000000000000..2e1d93a7e2167 --- /dev/null +++ b/bitnami/aspnet-core/8/debian-11/docker-compose.yml @@ -0,0 +1,13 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +version: '2' +services: + aspnet-core: + image: docker.io/bitnami/aspnet-core:8 + command: ["tail", "-f", "/dev/null"] # To keep the container running + volumes: + - aspnet-core_data:/app +volumes: + aspnet-core_data: + driver: local diff --git a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/aspnet-core/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json similarity index 63% rename from bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json rename to bitnami/aspnet-core/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 67f997622461f..f69e06b93572c 100644 --- a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/aspnet-core/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,8 +1,8 @@ { - "postgresql": { + "aspnet-core": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.21.0-9" + "version": "8.0.0-1" } } \ No newline at end of file diff --git a/bitnami/aspnet-core/8/debian-11/prebuildfs/opt/bitnami/base/functions b/bitnami/aspnet-core/8/debian-11/prebuildfs/opt/bitnami/base/functions new file mode 100644 index 0000000000000..76899b6c85aeb --- /dev/null +++ b/bitnami/aspnet-core/8/debian-11/prebuildfs/opt/bitnami/base/functions @@ -0,0 +1,122 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +[[ ${BASH_DEBUG:-false} = true ]] && set -x + +# Constants +MODULE="$(basename "$0")" +BITNAMI_PREFIX=/opt/bitnami + +# Color Palette +RESET='\033[0m' +BOLD='\033[1m' + +## Foreground +BLACK='\033[38;5;0m' +RED='\033[38;5;1m' +GREEN='\033[38;5;2m' +YELLOW='\033[38;5;3m' +BLUE='\033[38;5;4m' +MAGENTA='\033[38;5;5m' +CYAN='\033[38;5;6m' +WHITE='\033[38;5;7m' + +## Background +ON_BLACK='\033[48;5;0m' +ON_RED='\033[48;5;1m' +ON_GREEN='\033[48;5;2m' +ON_YELLOW='\033[48;5;3m' +ON_BLUE='\033[48;5;4m' +ON_MAGENTA='\033[48;5;5m' +ON_CYAN='\033[48;5;6m' +ON_WHITE='\033[48;5;7m' + +# Functions + +######################## +# Print to STDERR +# Arguments: +# Message to print +# Returns: +# None +######################### +stderr_print() { + printf "%b\\n" "${*}" >&2 +} + +######################## +# Log message +# Arguments: +# Message to log +# Returns: +# None +######################### +log() { + stderr_print "${NAMI_DEBUG:+${CYAN}${MODULE:-} ${MAGENTA}$(date "+%T.%2N ")}${RESET}${*}" +} +######################## +# Log an 'info' message +# Arguments: +# Message to log +# Returns: +# None +######################### +info() { + log "${GREEN}INFO ${RESET} ==> ${*}" +} +######################## +# Log message +# Arguments: +# Message to log +# Returns: +# None +######################### +warn() { + log "${YELLOW}WARN ${RESET} ==> ${*}" +} +######################## +# Log an 'error' message +# Arguments: +# Message to log +# Returns: +# None +######################### +error() { + log "${RED}ERROR${RESET} ==> ${*}" +} +######################## +# Print the welcome page +# Globals: +# DISABLE_WELCOME_MESSAGE +# BITNAMI_APP_NAME +# Arguments: +# None +# Returns: +# None +######################### +print_welcome_page() { + if [[ -z "${DISABLE_WELCOME_MESSAGE:-}" ]]; then + if [[ -n "$BITNAMI_APP_NAME" ]]; then + print_image_welcome_page + fi + fi +} +######################## +# Print the welcome page for a Bitnami Docker image +# Globals: +# BITNAMI_APP_NAME +# Arguments: +# None +# Returns: +# None +######################### +print_image_welcome_page() { + local github_url="https://github.com/bitnami/containers" + + log "" + log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + log "" +} diff --git a/bitnami/aspnet-core/8/debian-11/prebuildfs/opt/bitnami/base/helpers b/bitnami/aspnet-core/8/debian-11/prebuildfs/opt/bitnami/base/helpers new file mode 100644 index 0000000000000..387769aabbf3a --- /dev/null +++ b/bitnami/aspnet-core/8/debian-11/prebuildfs/opt/bitnami/base/helpers @@ -0,0 +1,42 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +. /opt/bitnami/base/functions + +######################## +# Helper function to initialize a single nami module +# Arguments: +# Module to initialize +# Returns: +# None +# Description: +# Initialize an unpacked nami module with the `nami initialize` command. +# Command arguments can be specified as function argumnts after the module name. +# `--log-level trace` flag is added to the command if `NAMI_DEBUG` env variable exists. +# The log level can be overridden using the `NAMI_LOG_LEVEL` env variable. +######################### +nami_initialize_one() { + local module="${1:?module not specified}" + if nami inspect $module | grep -q '"lifecycle": "unpacked"'; then + local inputs= + if [[ -f "/${module}-inputs.json" ]]; then + inputs="--inputs-file=/${module}-inputs.json" + fi + nami ${NAMI_DEBUG:+--log-level ${NAMI_LOG_LEVEL:-trace}} initialize $module $inputs "${@:2}" + fi +} + +######################## +# Helper function to initialize one or more nami modules +# Arguments: +# Module to initialize +# Returns: +# None +######################### +nami_initialize() { + local module="${1:?module not specified}" + for module in "${@}"; do + nami_initialize_one $module + done +} diff --git a/bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/aspnet-core/8/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt similarity index 100% rename from bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt rename to bitnami/aspnet-core/8/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt diff --git a/bitnami/clickhouse/22.8/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/aspnet-core/8/debian-11/prebuildfs/usr/sbin/install_packages similarity index 100% rename from bitnami/clickhouse/22.8/debian-11/prebuildfs/usr/sbin/install_packages rename to bitnami/aspnet-core/8/debian-11/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/contour/1.24/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/aspnet-core/8/debian-11/prebuildfs/usr/sbin/run-script similarity index 92% rename from bitnami/contour/1.24/debian-11/prebuildfs/usr/sbin/run-script rename to bitnami/aspnet-core/8/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/contour/1.24/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/aspnet-core/8/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/aspnet-core/8/debian-11/rootfs/opt/bitnami/scripts/aspnet-core/entrypoint.sh b/bitnami/aspnet-core/8/debian-11/rootfs/opt/bitnami/scripts/aspnet-core/entrypoint.sh new file mode 100755 index 0000000000000..eef346858223f --- /dev/null +++ b/bitnami/aspnet-core/8/debian-11/rootfs/opt/bitnami/scripts/aspnet-core/entrypoint.sh @@ -0,0 +1,12 @@ +#!/bin/bash -e +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +# shellcheck disable=SC1091 + +. /opt/bitnami/base/functions +. /opt/bitnami/base/helpers + +print_welcome_page + +exec "$@" diff --git a/bitnami/aspnet-core/8/debian-11/rootfs/opt/bitnami/scripts/aspnet-core/postunpack.sh b/bitnami/aspnet-core/8/debian-11/rootfs/opt/bitnami/scripts/aspnet-core/postunpack.sh new file mode 100755 index 0000000000000..dd8e0a30de139 --- /dev/null +++ b/bitnami/aspnet-core/8/debian-11/rootfs/opt/bitnami/scripts/aspnet-core/postunpack.sh @@ -0,0 +1,13 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purpose +mkdir /app +chmod g+rwx /app +setcap CAP_NET_BIND_SERVICE=+eip /opt/bitnami/aspnet-core/bin/dotnet diff --git a/bitnami/percona-xtrabackup/8/debian-11/tags-info.yaml b/bitnami/aspnet-core/8/debian-11/tags-info.yaml similarity index 78% rename from bitnami/percona-xtrabackup/8/debian-11/tags-info.yaml rename to bitnami/aspnet-core/8/debian-11/tags-info.yaml index 5d40bc32770e3..965524a7a1b10 100644 --- a/bitnami/percona-xtrabackup/8/debian-11/tags-info.yaml +++ b/bitnami/aspnet-core/8/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "8" - 8-debian-11 -- 8.0.34-29 +- 8.0.0 - latest diff --git a/bitnami/aspnet-core/README.md b/bitnami/aspnet-core/README.md index 46eb50a3d625b..ded0065fb418c 100644 --- a/bitnami/aspnet-core/README.md +++ b/bitnami/aspnet-core/README.md @@ -1,4 +1,4 @@ -# ASP.NET Core packaged by Bitnami +# Bitnami package for ASP.NET Core ## What is ASP.NET Core? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/aspnet-core/docker-compose.yml b/bitnami/aspnet-core/docker-compose.yml index 3a7388bf0bfd1..2e1d93a7e2167 100644 --- a/bitnami/aspnet-core/docker-compose.yml +++ b/bitnami/aspnet-core/docker-compose.yml @@ -4,7 +4,7 @@ version: '2' services: aspnet-core: - image: docker.io/bitnami/aspnet-core:7 + image: docker.io/bitnami/aspnet-core:8 command: ["tail", "-f", "/dev/null"] # To keep the container running volumes: - aspnet-core_data:/app diff --git a/bitnami/attu/2/debian-11/Dockerfile b/bitnami/attu/2/debian-11/Dockerfile index 37b30cfe3ea1d..751a109adee6a 100644 --- a/bitnami/attu/2/debian-11/Dockerfile +++ b/bitnami/attu/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T07:52:32Z" \ + org.opencontainers.image.created="2023-12-07T18:52:59Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.3.2-debian-11-r1" \ + org.opencontainers.image.ref.name="2.3.4-debian-11-r0" \ org.opencontainers.image.title="attu" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.3.2" + org.opencontainers.image.version="2.3.4" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,22 +21,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "node-16.20.2-1-linux-${OS_ARCH}-debian-11" \ - "attu-2.3.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.7-0-linux-${OS_ARCH}-debian-11" \ + "node-18.19.0-0-linux-${OS_ARCH}-debian-11" \ + "attu-2.3.4-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -45,7 +45,7 @@ RUN apt-get autoremove --purge -y curl && \ RUN useradd -r -u 1001 -g root attu RUN ln -s /opt/bitnami/attu /app && mkdir -p /.cache/yarn && chmod g+rwX /.cache/yarn && mkdir -p /.yarn && chmod g+rwX /.yarn && mkdir /.npm && chmod g+rwX /.npm -ENV APP_VERSION="2.3.2" \ +ENV APP_VERSION="2.3.4" \ BITNAMI_APP_NAME="attu" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/node/bin:$PATH" diff --git a/bitnami/attu/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/attu/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 7443420ffcee6..7ca1d7975318c 100644 --- a/bitnami/attu/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/attu/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.3.2-0" + "version": "2.3.4-0" }, "node": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.20.2-1" + "version": "18.19.0-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.7-0" } } \ No newline at end of file diff --git a/bitnami/attu/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/attu/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/attu/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/attu/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/attu/2/debian-11/tags-info.yaml b/bitnami/attu/2/debian-11/tags-info.yaml index 308cb7ddd547d..be3c6ce460a94 100644 --- a/bitnami/attu/2/debian-11/tags-info.yaml +++ b/bitnami/attu/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.3.2 +- 2.3.4 - latest diff --git a/bitnami/attu/README.md b/bitnami/attu/README.md index 3dbc9a93b0601..0dc91380c41f9 100644 --- a/bitnami/attu/README.md +++ b/bitnami/attu/README.md @@ -1,4 +1,4 @@ -# Attu packaged by Bitnami +# Bitnami package for Attu ## What is Attu? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/aws-cli/1/debian-11/Dockerfile b/bitnami/aws-cli/1/debian-11/Dockerfile index 2eb6b4e006924..bee9d0027d1e7 100644 --- a/bitnami/aws-cli/1/debian-11/Dockerfile +++ b/bitnami/aws-cli/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T15:32:49Z" \ + org.opencontainers.image.created="2023-12-19T00:50:30Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.29.70-debian-11-r1" \ + org.opencontainers.image.ref.name="1.32.3-debian-11-r0" \ org.opencontainers.image.title="aws-cli" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.29.70" + org.opencontainers.image.version="1.32.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl groff-base libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "aws-cli-1.29.70-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.7-2-linux-${OS_ARCH}-debian-11" \ + "aws-cli-1.32.3-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -43,7 +43,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="1.29.70" \ +ENV APP_VERSION="1.32.3" \ AWS_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt" \ BITNAMI_APP_NAME="aws-cli" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/aws-cli/bin:/opt/bitnami/aws-cli/venv/bin:$PATH" diff --git a/bitnami/aws-cli/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/aws-cli/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index a6b95181ba180..4c6ffe6894270 100644 --- a/bitnami/aws-cli/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/aws-cli/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.29.70-1" + "version": "1.32.3-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.7-2" } } \ No newline at end of file diff --git a/bitnami/aws-cli/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/aws-cli/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/aws-cli/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/aws-cli/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/aws-cli/1/debian-11/tags-info.yaml b/bitnami/aws-cli/1/debian-11/tags-info.yaml index 1362e3e757f8e..69cd9ce0b6a35 100644 --- a/bitnami/aws-cli/1/debian-11/tags-info.yaml +++ b/bitnami/aws-cli/1/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "1" - 1-debian-11 -- 1.29.70 +- 1.32.3 diff --git a/bitnami/aws-cli/2/debian-11/Dockerfile b/bitnami/aws-cli/2/debian-11/Dockerfile index 141eb710b283c..81a2fd9f3b158 100644 --- a/bitnami/aws-cli/2/debian-11/Dockerfile +++ b/bitnami/aws-cli/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-27T22:18:33Z" \ + org.opencontainers.image.created="2023-12-15T21:56:40Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.13.30-debian-11-r0" \ + org.opencontainers.image.ref.name="2.15.2-debian-11-r0" \ org.opencontainers.image.title="aws-cli" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.13.30" + org.opencontainers.image.version="2.15.2" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl groff-base libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-8-linux-${OS_ARCH}-debian-11" \ - "aws-cli-2.13.30-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.7-0-linux-${OS_ARCH}-debian-11" \ + "aws-cli-2.15.2-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -43,7 +43,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="2.13.30" \ +ENV APP_VERSION="2.15.2" \ AWS_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt" \ BITNAMI_APP_NAME="aws-cli" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/aws-cli/bin:/opt/bitnami/aws-cli/venv/bin:$PATH" diff --git a/bitnami/aws-cli/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/aws-cli/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 7266a8183ddf1..02af885b4acd6 100644 --- a/bitnami/aws-cli/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/aws-cli/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.13.30-0" + "version": "2.15.2-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-8" + "version": "3.11.7-0" } } \ No newline at end of file diff --git a/bitnami/aws-cli/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/aws-cli/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/aws-cli/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/aws-cli/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/aws-cli/2/debian-11/tags-info.yaml b/bitnami/aws-cli/2/debian-11/tags-info.yaml index 2553dbb431326..ca1e5f8524e0d 100644 --- a/bitnami/aws-cli/2/debian-11/tags-info.yaml +++ b/bitnami/aws-cli/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.13.30 +- 2.15.2 - latest diff --git a/bitnami/aws-cli/README.md b/bitnami/aws-cli/README.md index c1433612f0ca1..cf5cb74bbccb0 100644 --- a/bitnami/aws-cli/README.md +++ b/bitnami/aws-cli/README.md @@ -1,4 +1,4 @@ -# AWS CLI packaged by Bitnami +# Bitnami package for AWS CLI ## What is AWS CLI? @@ -18,7 +18,7 @@ docker run --name aws-cli bitnami/aws-cli:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/azure-cli/2/debian-11/Dockerfile b/bitnami/azure-cli/2/debian-11/Dockerfile index c4df6a737938c..f63a0c931d1fc 100644 --- a/bitnami/azure-cli/2/debian-11/Dockerfile +++ b/bitnami/azure-cli/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T18:38:00Z" \ + org.opencontainers.image.created="2023-12-05T05:05:14Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.53.1-debian-11-r0" \ + org.opencontainers.image.ref.name="2.55.0-debian-11-r0" \ org.opencontainers.image.title="azure-cli" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.53.1" + org.opencontainers.image.version="2.55.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.10.13-7-linux-${OS_ARCH}-debian-11" \ - "azure-cli-2.53.1-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.7-0-linux-${OS_ARCH}-debian-11" \ + "azure-cli-2.55.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -44,7 +44,7 @@ RUN apt-get autoremove --purge -y curl && \ RUN chmod g+rwX /opt/bitnami RUN mkdir /.azure /.azcopy && chmod g+rwX /.azure /.azcopy /bin -ENV APP_VERSION="2.53.1" \ +ENV APP_VERSION="2.55.0" \ BITNAMI_APP_NAME="azure-cli" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/azure-cli/bin:/opt/bitnami/azure-cli/venv/bin:$PATH" diff --git a/bitnami/azure-cli/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/azure-cli/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 0bffaf9cf7c16..84e73fd59b162 100644 --- a/bitnami/azure-cli/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/azure-cli/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.53.1-0" + "version": "2.55.0-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.10.13-7" + "version": "3.11.7-0" } } \ No newline at end of file diff --git a/bitnami/azure-cli/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/azure-cli/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/azure-cli/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/azure-cli/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/azure-cli/2/debian-11/tags-info.yaml b/bitnami/azure-cli/2/debian-11/tags-info.yaml index d5ef0dfac820d..8d1dbbf0017c1 100644 --- a/bitnami/azure-cli/2/debian-11/tags-info.yaml +++ b/bitnami/azure-cli/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.53.1 +- 2.55.0 - latest diff --git a/bitnami/azure-cli/README.md b/bitnami/azure-cli/README.md index e3564cf6516c8..bc00d5f6858f9 100644 --- a/bitnami/azure-cli/README.md +++ b/bitnami/azure-cli/README.md @@ -1,4 +1,4 @@ -# Azure CLI packaged by Bitnami +# Bitnami package for Azure CLI ## What is Azure CLI? @@ -18,7 +18,7 @@ docker run --name azure-cli bitnami/azure-cli:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/blackbox-exporter/0/debian-11/Dockerfile b/bitnami/blackbox-exporter/0/debian-11/Dockerfile index a06ea4d446378..ff844a9b9cdb5 100644 --- a/bitnami/blackbox-exporter/0/debian-11/Dockerfile +++ b/bitnami/blackbox-exporter/0/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T00:01:28Z" \ + org.opencontainers.image.created="2023-12-06T14:05:01Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.24.0-debian-11-r139" \ + org.opencontainers.image.ref.name="0.24.0-debian-11-r141" \ org.opencontainers.image.title="blackbox-exporter" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="0.24.0" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "blackbox-exporter-0.24.0-7-linux-${OS_ARCH}-debian-11" \ - ) && \ + "blackbox-exporter-0.24.0-9-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/blackbox-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/blackbox-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index ecd52f12846ad..1bb248a883423 100644 --- a/bitnami/blackbox-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/blackbox-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.24.0-7" + "version": "0.24.0-9" } } \ No newline at end of file diff --git a/bitnami/blackbox-exporter/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/blackbox-exporter/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/blackbox-exporter/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/blackbox-exporter/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/blackbox-exporter/README.md b/bitnami/blackbox-exporter/README.md index f2920570bab78..6d09a40f9fe24 100644 --- a/bitnami/blackbox-exporter/README.md +++ b/bitnami/blackbox-exporter/README.md @@ -1,4 +1,4 @@ -# Blackbox Exporter packaged by Bitnami +# Bitnami package for Blackbox Exporter ## What is Blackbox Exporter? @@ -18,7 +18,7 @@ docker run --name blackbox-exporter bitnami/blackbox-exporter:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/cainjector/1/debian-11/Dockerfile b/bitnami/cainjector/1/debian-11/Dockerfile index 90a58af8f37b8..ae6f017443040 100644 --- a/bitnami/cainjector/1/debian-11/Dockerfile +++ b/bitnami/cainjector/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-30T21:46:25Z" \ + org.opencontainers.image.created="2023-12-08T13:00:28Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.13.2-debian-11-r0" \ + org.opencontainers.image.ref.name="1.13.3-debian-11-r0" \ org.opencontainers.image.title="cainjector" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.13.2" + org.opencontainers.image.version="1.13.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "cainjector-1.13.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "cainjector-1.13.3-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="1.13.2" \ +ENV APP_VERSION="1.13.3" \ BITNAMI_APP_NAME="cainjector" \ PATH="/opt/bitnami/cainjector/bin:$PATH" diff --git a/bitnami/cainjector/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/cainjector/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 505fd114ed060..f647663ad5d6c 100644 --- a/bitnami/cainjector/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/cainjector/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.13.2-0" + "version": "1.13.3-0" } } \ No newline at end of file diff --git a/bitnami/cainjector/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/cainjector/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/cainjector/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/cainjector/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/cainjector/1/debian-11/tags-info.yaml b/bitnami/cainjector/1/debian-11/tags-info.yaml index 7de74d5f6663d..8b7cb6b6e6d01 100644 --- a/bitnami/cainjector/1/debian-11/tags-info.yaml +++ b/bitnami/cainjector/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.13.2 +- 1.13.3 - latest diff --git a/bitnami/cainjector/README.md b/bitnami/cainjector/README.md index d7d66593c7491..780f8a32ebcf9 100644 --- a/bitnami/cainjector/README.md +++ b/bitnami/cainjector/README.md @@ -1,4 +1,4 @@ -# CA Injector packaged by Bitnami +# Bitnami package for CA Injector ## What is CA Injector? @@ -32,7 +32,7 @@ Kubernetes cluster with `CustomResourceDefinition` or `ThirdPartyResource suppor * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/cassandra-exporter/2/debian-11/Dockerfile b/bitnami/cassandra-exporter/2/debian-11/Dockerfile index 9fdad8199d81d..167d685ded9fd 100644 --- a/bitnami/cassandra-exporter/2/debian-11/Dockerfile +++ b/bitnami/cassandra-exporter/2/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T22:52:16Z" \ + org.opencontainers.image.created="2023-12-17T11:38:53Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.3.8-debian-11-r429" \ + org.opencontainers.image.ref.name="2.3.8-debian-11-r432" \ org.opencontainers.image.title="cassandra-exporter" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.3.8" @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ "cassandra-exporter-2.3.8-164-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/cassandra-exporter/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/cassandra-exporter/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 76bca39c2132e..538c246c1dcd6 100644 --- a/bitnami/cassandra-exporter/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/cassandra-exporter/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,6 +9,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" } } \ No newline at end of file diff --git a/bitnami/cassandra-exporter/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/cassandra-exporter/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/cassandra-exporter/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/cassandra-exporter/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/cassandra-exporter/README.md b/bitnami/cassandra-exporter/README.md index 46ec6d3bc13f7..45b77793e0d16 100644 --- a/bitnami/cassandra-exporter/README.md +++ b/bitnami/cassandra-exporter/README.md @@ -1,4 +1,4 @@ -# Cassandra Exporter packaged by Bitnami +# Bitnami package for Cassandra Exporter ## What is Cassandra Exporter? @@ -18,7 +18,7 @@ docker run --name cassandra-exporter bitnami/cassandra-exporter:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/cassandra/4.0/debian-11/Dockerfile b/bitnami/cassandra/4.0/debian-11/Dockerfile index 67383202641fe..571300d4fc6e5 100644 --- a/bitnami/cassandra/4.0/debian-11/Dockerfile +++ b/bitnami/cassandra/4.0/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T06:50:30Z" \ + org.opencontainers.image.created="2023-12-13T10:50:51Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.0.11-debian-11-r79" \ + org.opencontainers.image.ref.name="4.0.11-debian-11-r86" \ org.opencontainers.image.title="cassandra" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.0.11" @@ -22,23 +22,23 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgssapi-krb5-2 libjemalloc2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "java-11.0.21-10-1-linux-${OS_ARCH}-debian-11" \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "cassandra-4.0.11-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.7-0-linux-${OS_ARCH}-debian-11" \ + "java-11.0.21-10-6-linux-${OS_ARCH}-debian-11" \ + "yq-4.40.5-0-linux-${OS_ARCH}-debian-11" \ + "cassandra-4.0.11-8-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/cassandra/4.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/cassandra/4.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 233413205fa6b..a6c6fe4cf2ebd 100644 --- a/bitnami/cassandra/4.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/cassandra/4.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,24 +3,24 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.0.11-2" + "version": "4.0.11-8" }, "java": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.0.21-10-1" + "version": "11.0.21-10-6" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.7-0" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.5-0" } } \ No newline at end of file diff --git a/bitnami/cassandra/4.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/cassandra/4.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/cassandra/4.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/cassandra/4.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/cassandra/4.0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/cassandra/4.0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/cassandra/4.0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/cassandra/4.0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/cassandra/4.1/debian-11/Dockerfile b/bitnami/cassandra/4.1/debian-11/Dockerfile index 9f680b0044cd0..5175fa4a325ba 100644 --- a/bitnami/cassandra/4.1/debian-11/Dockerfile +++ b/bitnami/cassandra/4.1/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T06:11:09Z" \ + org.opencontainers.image.created="2023-12-13T11:02:45Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.1.3-debian-11-r72" \ + org.opencontainers.image.ref.name="4.1.3-debian-11-r78" \ org.opencontainers.image.title="cassandra" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.1.3" @@ -22,23 +22,23 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgssapi-krb5-2 libjemalloc2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "java-11.0.21-10-1-linux-${OS_ARCH}-debian-11" \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "cassandra-4.1.3-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.7-0-linux-${OS_ARCH}-debian-11" \ + "java-11.0.21-10-6-linux-${OS_ARCH}-debian-11" \ + "yq-4.40.5-0-linux-${OS_ARCH}-debian-11" \ + "cassandra-4.1.3-6-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index a986e4e41bc11..e56a79fd50694 100644 --- a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,24 +3,24 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.1.3-1" + "version": "4.1.3-6" }, "java": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.0.21-10-1" + "version": "11.0.21-10-6" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.7-0" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.5-0" } } \ No newline at end of file diff --git a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/cassandra/4.1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/cassandra/4.1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/cassandra/4.1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/cassandra/4.1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/cassandra/README.md b/bitnami/cassandra/README.md index ad6d2afd8d6f0..75d2b231d6d0a 100644 --- a/bitnami/cassandra/README.md +++ b/bitnami/cassandra/README.md @@ -1,4 +1,4 @@ -# Apache Cassandra packaged by Bitnami +# Bitnami package for Apache Cassandra ## What is Apache Cassandra? @@ -27,7 +27,7 @@ You can find the default credentials and available configuration options in the * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/cert-manager-webhook/1/debian-11/Dockerfile b/bitnami/cert-manager-webhook/1/debian-11/Dockerfile index 74f61cef088b1..82d76fb924a3e 100644 --- a/bitnami/cert-manager-webhook/1/debian-11/Dockerfile +++ b/bitnami/cert-manager-webhook/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-30T13:43:50Z" \ + org.opencontainers.image.created="2023-12-09T12:46:28Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.13.2-debian-11-r0" \ + org.opencontainers.image.ref.name="1.13.3-debian-11-r0" \ org.opencontainers.image.title="cert-manager-webhook" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.13.2" + org.opencontainers.image.version="1.13.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "cert-manager-webhook-1.13.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "cert-manager-webhook-1.13.3-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="1.13.2" \ +ENV APP_VERSION="1.13.3" \ BITNAMI_APP_NAME="cert-manager-webhook" \ PATH="/opt/bitnami/cert-manager-webhook/bin:$PATH" diff --git a/bitnami/cert-manager-webhook/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/cert-manager-webhook/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index bd1c5b81b5a7a..bb87d9139811c 100644 --- a/bitnami/cert-manager-webhook/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/cert-manager-webhook/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.13.2-0" + "version": "1.13.3-0" } } \ No newline at end of file diff --git a/bitnami/cert-manager-webhook/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/cert-manager-webhook/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/cert-manager-webhook/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/cert-manager-webhook/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/cert-manager-webhook/1/debian-11/tags-info.yaml b/bitnami/cert-manager-webhook/1/debian-11/tags-info.yaml index 7de74d5f6663d..8b7cb6b6e6d01 100644 --- a/bitnami/cert-manager-webhook/1/debian-11/tags-info.yaml +++ b/bitnami/cert-manager-webhook/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.13.2 +- 1.13.3 - latest diff --git a/bitnami/cert-manager-webhook/README.md b/bitnami/cert-manager-webhook/README.md index 6ad20c3f741f3..2c321ff99872c 100644 --- a/bitnami/cert-manager-webhook/README.md +++ b/bitnami/cert-manager-webhook/README.md @@ -1,4 +1,4 @@ -# cert-manager Webhook packaged by Bitnami +# Bitnami package for cert-manager Webhook ## What is cert-manager Webhook? @@ -32,7 +32,7 @@ Kubernetes cluster with `CustomResourceDefinition` or `ThirdPartyResource suppor * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/cert-manager/1/debian-11/Dockerfile b/bitnami/cert-manager/1/debian-11/Dockerfile index 9545cc8617dda..ace59e495c06c 100644 --- a/bitnami/cert-manager/1/debian-11/Dockerfile +++ b/bitnami/cert-manager/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-30T21:48:49Z" \ + org.opencontainers.image.created="2023-12-09T07:50:02Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.13.2-debian-11-r0" \ + org.opencontainers.image.ref.name="1.13.3-debian-11-r0" \ org.opencontainers.image.title="cert-manager" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.13.2" + org.opencontainers.image.version="1.13.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "cert-manager-1.13.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "cert-manager-1.13.3-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="1.13.2" \ +ENV APP_VERSION="1.13.3" \ BITNAMI_APP_NAME="cert-manager" \ PATH="/opt/bitnami/cert-manager/bin:$PATH" diff --git a/bitnami/cert-manager/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/cert-manager/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 5b1e2e84fa78a..12e1e2f5dd251 100644 --- a/bitnami/cert-manager/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/cert-manager/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.13.2-0" + "version": "1.13.3-0" } } \ No newline at end of file diff --git a/bitnami/cert-manager/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/cert-manager/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/cert-manager/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/cert-manager/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/cert-manager/1/debian-11/tags-info.yaml b/bitnami/cert-manager/1/debian-11/tags-info.yaml index 7de74d5f6663d..8b7cb6b6e6d01 100644 --- a/bitnami/cert-manager/1/debian-11/tags-info.yaml +++ b/bitnami/cert-manager/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.13.2 +- 1.13.3 - latest diff --git a/bitnami/cert-manager/README.md b/bitnami/cert-manager/README.md index 8f089398f8bef..e14c475a361c7 100644 --- a/bitnami/cert-manager/README.md +++ b/bitnami/cert-manager/README.md @@ -32,7 +32,7 @@ Kubernetes cluster with `CustomResourceDefinition` or `ThirdPartyResource suppor * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/clickhouse/22.8/debian-11/tags-info.yaml b/bitnami/clickhouse/22.8/debian-11/tags-info.yaml deleted file mode 100644 index 66bb90c631903..0000000000000 --- a/bitnami/clickhouse/22.8/debian-11/tags-info.yaml +++ /dev/null @@ -1,4 +0,0 @@ -rolling-tags: -- "22.8" -- 22.8-debian-11 -- 22.8.21 diff --git a/bitnami/clickhouse/23.3/debian-11/Dockerfile b/bitnami/clickhouse/23.3/debian-11/Dockerfile index 015ff8a797834..5ad56400da32e 100644 --- a/bitnami/clickhouse/23.3/debian-11/Dockerfile +++ b/bitnami/clickhouse/23.3/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-31T07:25:41Z" \ + org.opencontainers.image.created="2023-12-13T12:06:51Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="23.3.15-debian-11-r0" \ + org.opencontainers.image.ref.name="23.3.18-debian-11-r1" \ org.opencontainers.image.title="clickhouse" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="23.3.15" + org.opencontainers.image.version="23.3.18" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps xmlstarlet -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "clickhouse-23.3.15-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "clickhouse-23.3.18-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -44,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/clickhouse/postunpack.sh -ENV APP_VERSION="23.3.15" \ +ENV APP_VERSION="23.3.18" \ BITNAMI_APP_NAME="clickhouse" \ PATH="/opt/bitnami/clickhouse/bin:/opt/bitnami/common/bin:$PATH" \ clickhouseCTL_API="3" diff --git a/bitnami/clickhouse/23.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/clickhouse/23.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 96aeb5d019a47..44824f0347dc5 100644 --- a/bitnami/clickhouse/23.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/clickhouse/23.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "23.3.15-0" + "version": "23.3.18-1" } } \ No newline at end of file diff --git a/bitnami/clickhouse/23.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/clickhouse/23.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/clickhouse/23.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/clickhouse/23.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/clickhouse/23.3/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/clickhouse/23.3/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/clickhouse/23.3/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/clickhouse/23.3/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/clickhouse/23.3/debian-11/tags-info.yaml b/bitnami/clickhouse/23.3/debian-11/tags-info.yaml index accc2effd0973..ff447a81583ea 100644 --- a/bitnami/clickhouse/23.3/debian-11/tags-info.yaml +++ b/bitnami/clickhouse/23.3/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "23.3" - 23.3-debian-11 -- 23.3.15 +- 23.3.18 diff --git a/bitnami/clickhouse/22.8/debian-11/Dockerfile b/bitnami/clickhouse/23.8/debian-11/Dockerfile similarity index 77% rename from bitnami/clickhouse/22.8/debian-11/Dockerfile rename to bitnami/clickhouse/23.8/debian-11/Dockerfile index e88204ed7c638..e11965d459549 100644 --- a/bitnami/clickhouse/22.8/debian-11/Dockerfile +++ b/bitnami/clickhouse/23.8/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T22:52:52Z" \ + org.opencontainers.image.created="2023-12-14T00:33:13Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="22.8.21-debian-11-r32" \ + org.opencontainers.image.ref.name="23.8.8-debian-11-r0" \ org.opencontainers.image.title="clickhouse" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="22.8.21" + org.opencontainers.image.version="23.8.8" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps xmlstarlet -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "clickhouse-22.8.21-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "clickhouse-23.8.8-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -44,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/clickhouse/postunpack.sh -ENV APP_VERSION="22.8.21" \ +ENV APP_VERSION="23.8.8" \ BITNAMI_APP_NAME="clickhouse" \ PATH="/opt/bitnami/clickhouse/bin:/opt/bitnami/common/bin:$PATH" \ clickhouseCTL_API="3" diff --git a/bitnami/clickhouse/22.8/debian-11/docker-compose.yml b/bitnami/clickhouse/23.8/debian-11/docker-compose.yml similarity index 86% rename from bitnami/clickhouse/22.8/debian-11/docker-compose.yml rename to bitnami/clickhouse/23.8/debian-11/docker-compose.yml index 675b1bcb5009f..5b0f2b3be77c9 100644 --- a/bitnami/clickhouse/22.8/debian-11/docker-compose.yml +++ b/bitnami/clickhouse/23.8/debian-11/docker-compose.yml @@ -4,7 +4,7 @@ version: '2' services: clickhouse: - image: docker.io/bitnami/clickhouse:22.8 + image: docker.io/bitnami/clickhouse:23.8 environment: - ALLOW_EMPTY_PASSWORD=yes ports: diff --git a/bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json similarity index 77% rename from bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json rename to bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 828a38dca4904..1ada83a5a94e5 100644 --- a/bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "22.8.21-0" + "version": "23.8.8-0" } } \ No newline at end of file diff --git a/bitnami/contour/1.24/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt similarity index 100% rename from bitnami/contour/1.24/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt rename to bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt diff --git a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh similarity index 76% rename from bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh rename to bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh similarity index 100% rename from bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh rename to bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh diff --git a/bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh similarity index 100% rename from bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh rename to bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh diff --git a/bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh b/bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh similarity index 100% rename from bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh rename to bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh diff --git a/bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh similarity index 100% rename from bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh rename to bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh diff --git a/bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh similarity index 100% rename from bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh rename to bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh diff --git a/bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh similarity index 100% rename from bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh rename to bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh diff --git a/bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh similarity index 100% rename from bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh rename to bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh diff --git a/bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh similarity index 100% rename from bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh rename to bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh diff --git a/bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh similarity index 100% rename from bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh rename to bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh diff --git a/bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh similarity index 100% rename from bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh rename to bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh diff --git a/bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh similarity index 100% rename from bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh rename to bitnami/clickhouse/23.8/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh diff --git a/bitnami/contour/1.24/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/clickhouse/23.8/debian-11/prebuildfs/usr/sbin/install_packages similarity index 100% rename from bitnami/contour/1.24/debian-11/prebuildfs/usr/sbin/install_packages rename to bitnami/clickhouse/23.8/debian-11/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/drupal-nginx/9/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/clickhouse/23.8/debian-11/prebuildfs/usr/sbin/run-script similarity index 92% rename from bitnami/drupal-nginx/9/debian-11/prebuildfs/usr/sbin/run-script rename to bitnami/clickhouse/23.8/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/drupal-nginx/9/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/clickhouse/23.8/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/clickhouse/22.8/debian-11/rootfs/opt/bitnami/scripts/clickhouse-env.sh b/bitnami/clickhouse/23.8/debian-11/rootfs/opt/bitnami/scripts/clickhouse-env.sh similarity index 100% rename from bitnami/clickhouse/22.8/debian-11/rootfs/opt/bitnami/scripts/clickhouse-env.sh rename to bitnami/clickhouse/23.8/debian-11/rootfs/opt/bitnami/scripts/clickhouse-env.sh diff --git a/bitnami/clickhouse/22.8/debian-11/rootfs/opt/bitnami/scripts/clickhouse/entrypoint.sh b/bitnami/clickhouse/23.8/debian-11/rootfs/opt/bitnami/scripts/clickhouse/entrypoint.sh similarity index 100% rename from bitnami/clickhouse/22.8/debian-11/rootfs/opt/bitnami/scripts/clickhouse/entrypoint.sh rename to bitnami/clickhouse/23.8/debian-11/rootfs/opt/bitnami/scripts/clickhouse/entrypoint.sh diff --git a/bitnami/clickhouse/22.8/debian-11/rootfs/opt/bitnami/scripts/clickhouse/postunpack.sh b/bitnami/clickhouse/23.8/debian-11/rootfs/opt/bitnami/scripts/clickhouse/postunpack.sh similarity index 100% rename from bitnami/clickhouse/22.8/debian-11/rootfs/opt/bitnami/scripts/clickhouse/postunpack.sh rename to bitnami/clickhouse/23.8/debian-11/rootfs/opt/bitnami/scripts/clickhouse/postunpack.sh diff --git a/bitnami/clickhouse/22.8/debian-11/rootfs/opt/bitnami/scripts/clickhouse/run.sh b/bitnami/clickhouse/23.8/debian-11/rootfs/opt/bitnami/scripts/clickhouse/run.sh similarity index 100% rename from bitnami/clickhouse/22.8/debian-11/rootfs/opt/bitnami/scripts/clickhouse/run.sh rename to bitnami/clickhouse/23.8/debian-11/rootfs/opt/bitnami/scripts/clickhouse/run.sh diff --git a/bitnami/clickhouse/22.8/debian-11/rootfs/opt/bitnami/scripts/clickhouse/setup.sh b/bitnami/clickhouse/23.8/debian-11/rootfs/opt/bitnami/scripts/clickhouse/setup.sh similarity index 100% rename from bitnami/clickhouse/22.8/debian-11/rootfs/opt/bitnami/scripts/clickhouse/setup.sh rename to bitnami/clickhouse/23.8/debian-11/rootfs/opt/bitnami/scripts/clickhouse/setup.sh diff --git a/bitnami/clickhouse/22.8/debian-11/rootfs/opt/bitnami/scripts/libclickhouse.sh b/bitnami/clickhouse/23.8/debian-11/rootfs/opt/bitnami/scripts/libclickhouse.sh similarity index 100% rename from bitnami/clickhouse/22.8/debian-11/rootfs/opt/bitnami/scripts/libclickhouse.sh rename to bitnami/clickhouse/23.8/debian-11/rootfs/opt/bitnami/scripts/libclickhouse.sh diff --git a/bitnami/clickhouse/23.8/debian-11/tags-info.yaml b/bitnami/clickhouse/23.8/debian-11/tags-info.yaml new file mode 100644 index 0000000000000..e7beea70c4b0c --- /dev/null +++ b/bitnami/clickhouse/23.8/debian-11/tags-info.yaml @@ -0,0 +1,4 @@ +rolling-tags: +- "23.8" +- 23.8-debian-11 +- 23.8.8 diff --git a/bitnami/clickhouse/23/debian-11/Dockerfile b/bitnami/clickhouse/23/debian-11/Dockerfile index f37b245a74294..6ed3b3bb8151d 100644 --- a/bitnami/clickhouse/23/debian-11/Dockerfile +++ b/bitnami/clickhouse/23/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-31T07:38:46Z" \ + org.opencontainers.image.created="2023-12-15T06:09:30Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="23.9.3-debian-11-r0" \ + org.opencontainers.image.ref.name="23.11.2-debian-11-r1" \ org.opencontainers.image.title="clickhouse" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="23.9.3" + org.opencontainers.image.version="23.11.2" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps xmlstarlet -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "clickhouse-23.9.3-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "clickhouse-23.11.2-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -44,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/clickhouse/postunpack.sh -ENV APP_VERSION="23.9.3" \ +ENV APP_VERSION="23.11.2" \ BITNAMI_APP_NAME="clickhouse" \ PATH="/opt/bitnami/clickhouse/bin:/opt/bitnami/common/bin:$PATH" \ clickhouseCTL_API="3" diff --git a/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8118d927dd6e5..2bec2df0d9ea0 100644 --- a/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "23.9.3-0" + "version": "23.11.2-1" } } \ No newline at end of file diff --git a/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/clickhouse/23/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/clickhouse/23/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/clickhouse/23/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/clickhouse/23/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/clickhouse/23/debian-11/tags-info.yaml b/bitnami/clickhouse/23/debian-11/tags-info.yaml index f4605640226cf..51cdb68a0f2d2 100644 --- a/bitnami/clickhouse/23/debian-11/tags-info.yaml +++ b/bitnami/clickhouse/23/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "23" - 23-debian-11 -- 23.9.3 +- 23.11.2 - latest diff --git a/bitnami/clickhouse/README.md b/bitnami/clickhouse/README.md index 6dbefd8724072..f859d7edbffa5 100644 --- a/bitnami/clickhouse/README.md +++ b/bitnami/clickhouse/README.md @@ -1,4 +1,4 @@ -# ClickHouse packaged by Bitnami +# Bitnami package for ClickHouse ## What is ClickHouse? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. @@ -185,7 +185,7 @@ services: clickhouse: image: bitnami/clickhouse:latest volumes: - - /path/to/override.xml:/bitnami/clickhouse/conf/override.xml:ro + - /path/to/override.xml:/bitnami/clickhouse/etc/conf.d/override.xml:ro ``` Check the [official ClickHouse configuration documentation](https://clickhouse.com/docs/en/operations/configuration-files/) for all the possible overrides and settings. diff --git a/bitnami/cluster-autoscaler/1/debian-11/Dockerfile b/bitnami/cluster-autoscaler/1/debian-11/Dockerfile index 0ebe736f640b9..11453d4c6505e 100644 --- a/bitnami/cluster-autoscaler/1/debian-11/Dockerfile +++ b/bitnami/cluster-autoscaler/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T00:23:13Z" \ + org.opencontainers.image.created="2023-12-07T09:25:42Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.28.0-debian-11-r32" \ + org.opencontainers.image.ref.name="1.28.2-debian-11-r0" \ org.opencontainers.image.title="cluster-autoscaler" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.28.0" + org.opencontainers.image.version="1.28.2" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "cluster-autoscaler-1.28.0-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "cluster-autoscaler-1.28.2-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -45,7 +45,7 @@ RUN ln -sf /opt/bitnami/cluster-autoscaler/bin/cluster-autoscaler /opt/bitnami/c COPY rootfs / RUN chmod -R g+rwX /opt/bitnami/cluster-autoscaler/ -ENV APP_VERSION="1.28.0" \ +ENV APP_VERSION="1.28.2" \ BITNAMI_APP_NAME="cluster-autoscaler" \ PATH="/opt/bitnami/cluster-autoscaler/bin:$PATH" diff --git a/bitnami/cluster-autoscaler/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/cluster-autoscaler/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index d1f37fbc148a3..916112f55d1bf 100644 --- a/bitnami/cluster-autoscaler/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/cluster-autoscaler/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.28.0-3" + "version": "1.28.2-0" } } \ No newline at end of file diff --git a/bitnami/cluster-autoscaler/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/cluster-autoscaler/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/cluster-autoscaler/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/cluster-autoscaler/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/cluster-autoscaler/1/debian-11/tags-info.yaml b/bitnami/cluster-autoscaler/1/debian-11/tags-info.yaml index e59f27fe5b4d5..f37a04124e654 100644 --- a/bitnami/cluster-autoscaler/1/debian-11/tags-info.yaml +++ b/bitnami/cluster-autoscaler/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.28.0 +- 1.28.2 - latest diff --git a/bitnami/cluster-autoscaler/README.md b/bitnami/cluster-autoscaler/README.md index a6014ecea575b..c72d1a8b3e947 100644 --- a/bitnami/cluster-autoscaler/README.md +++ b/bitnami/cluster-autoscaler/README.md @@ -1,4 +1,4 @@ -# Cluster Autoscaler packaged by Bitnami +# Bitnami package for Cluster Autoscaler ## What is Cluster Autoscaler? @@ -48,7 +48,7 @@ Please note that Cluster Autoscaler a series of permissions/privileges to adjust * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/codeigniter/4/debian-11/Dockerfile b/bitnami/codeigniter/4/debian-11/Dockerfile index 998f371966627..56f3d960a9923 100644 --- a/bitnami/codeigniter/4/debian-11/Dockerfile +++ b/bitnami/codeigniter/4/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-27T01:16:14Z" \ + org.opencontainers.image.created="2023-12-02T08:58:37Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.4.3-debian-11-r0" \ + org.opencontainers.image.ref.name="4.4.3-debian-11-r3" \ org.opencontainers.image.title="codeigniter" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.4.3" @@ -20,22 +20,22 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps sudo zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.1.25-0-linux-${OS_ARCH}-debian-11" \ - "mysql-client-11.1.2-2-linux-${OS_ARCH}-debian-11" \ + "php-8.1.26-4-linux-${OS_ARCH}-debian-11" \ + "mysql-client-11.1.3-0-linux-${OS_ARCH}-debian-11" \ "codeigniter-4.4.3-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/codeigniter/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/codeigniter/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index ae7cd991063e1..0236e90ea4ddc 100644 --- a/bitnami/codeigniter/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/codeigniter/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,12 +9,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.1.2-2" + "version": "11.1.3-0" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.25-0" + "version": "8.1.26-4" } } \ No newline at end of file diff --git a/bitnami/codeigniter/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/codeigniter/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/codeigniter/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/codeigniter/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/codeigniter/4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/codeigniter/4/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/codeigniter/4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/codeigniter/4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/codeigniter/README.md b/bitnami/codeigniter/README.md index e663f998e8712..856d4f4e2382e 100644 --- a/bitnami/codeigniter/README.md +++ b/bitnami/codeigniter/README.md @@ -1,4 +1,4 @@ -# CodeIgniter packaged by Bitnami +# Bitnami package for CodeIgniter ## What is CodeIgniter? @@ -24,7 +24,7 @@ docker-compose up * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/concourse/7/debian-11/Dockerfile b/bitnami/concourse/7/debian-11/Dockerfile index 3637e69117d4e..1fd81f7b76d9e 100644 --- a/bitnami/concourse/7/debian-11/Dockerfile +++ b/bitnami/concourse/7/debian-11/Dockerfile @@ -7,33 +7,33 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:54:19Z" \ + org.opencontainers.image.created="2023-12-15T18:31:04Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.10.0-debian-11-r62" \ + org.opencontainers.image.ref.name="7.11.0-debian-11-r7" \ org.opencontainers.image.title="concourse" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.10.0" + org.opencontainers.image.version="7.11.0" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl iproute2 iptables libseccomp2 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "concourse-7.10.0-16-linux-${OS_ARCH}-debian-11" \ - ) && \ + "concourse-7.11.0-6-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -42,7 +42,7 @@ RUN touch /.flyrc && chmod g+rwX /.flyrc RUN update-alternatives --set iptables /usr/sbin/iptables-legacy && \ update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy -ENV APP_VERSION="7.10.0" \ +ENV APP_VERSION="7.11.0" \ BITNAMI_APP_NAME="concourse" \ PATH="/opt/bitnami/concourse/bin:$PATH" diff --git a/bitnami/concourse/7/debian-11/docker-compose.yml b/bitnami/concourse/7/debian-11/docker-compose.yml index c1f657c4d8a30..6d3d35d5cf436 100644 --- a/bitnami/concourse/7/debian-11/docker-compose.yml +++ b/bitnami/concourse/7/debian-11/docker-compose.yml @@ -4,7 +4,7 @@ version: '2' services: postgresql: - image: docker.io/bitnami/postgresql:11 + image: docker.io/bitnami/postgresql:15 environment: - POSTGRESQL_DATABASE=bitnami_concourse - POSTGRESQL_USERNAME=bn_concourse diff --git a/bitnami/concourse/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/concourse/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 15f302664116d..562001cec3df6 100644 --- a/bitnami/concourse/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/concourse/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.10.0-16" + "version": "7.11.0-6" } } \ No newline at end of file diff --git a/bitnami/concourse/7/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/concourse/7/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/concourse/7/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/concourse/7/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/concourse/7/debian-11/tags-info.yaml b/bitnami/concourse/7/debian-11/tags-info.yaml index 07ffc3253da8e..9201b6c7f78e6 100644 --- a/bitnami/concourse/7/debian-11/tags-info.yaml +++ b/bitnami/concourse/7/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "7" - 7-debian-11 -- 7.10.0 +- 7.11.0 - latest diff --git a/bitnami/concourse/README.md b/bitnami/concourse/README.md index 9ce3ef3005330..dc18f67dd042b 100644 --- a/bitnami/concourse/README.md +++ b/bitnami/concourse/README.md @@ -1,4 +1,4 @@ -# Concourse packaged by Bitnami +# Bitnami package for Concourse ## What is Concourse? @@ -26,7 +26,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/concourse/docker-compose.yml b/bitnami/concourse/docker-compose.yml index c1f657c4d8a30..6d3d35d5cf436 100644 --- a/bitnami/concourse/docker-compose.yml +++ b/bitnami/concourse/docker-compose.yml @@ -4,7 +4,7 @@ version: '2' services: postgresql: - image: docker.io/bitnami/postgresql:11 + image: docker.io/bitnami/postgresql:15 environment: - POSTGRESQL_DATABASE=bitnami_concourse - POSTGRESQL_USERNAME=bn_concourse diff --git a/bitnami/configmap-reload/0/debian-11/Dockerfile b/bitnami/configmap-reload/0/debian-11/Dockerfile index 947fdbb7a9a2c..62b987b4de425 100644 --- a/bitnami/configmap-reload/0/debian-11/Dockerfile +++ b/bitnami/configmap-reload/0/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T00:27:59Z" \ + org.opencontainers.image.created="2023-12-06T14:24:48Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.12.0-debian-11-r7" \ + org.opencontainers.image.ref.name="0.12.0-debian-11-r9" \ org.opencontainers.image.title="configmap-reload" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="0.12.0" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "configmap-reload-0.12.0-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "configmap-reload-0.12.0-5-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/configmap-reload/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/configmap-reload/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index b2e59a139f115..b6b0a6db25919 100644 --- a/bitnami/configmap-reload/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/configmap-reload/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.12.0-3" + "version": "0.12.0-5" } } \ No newline at end of file diff --git a/bitnami/configmap-reload/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/configmap-reload/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/configmap-reload/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/configmap-reload/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/configmap-reload/README.md b/bitnami/configmap-reload/README.md index 8d202163dfe39..e9e6ff83fa6bb 100644 --- a/bitnami/configmap-reload/README.md +++ b/bitnami/configmap-reload/README.md @@ -1,4 +1,4 @@ -# ConfigMap Reload packaged by Bitnami +# Bitnami package for ConfigMap Reload ## What is ConfigMap Reload? @@ -16,7 +16,7 @@ Deploy [ConfigMap Reload](https://github.com/jimmidyson/configmap-reload/blob/ma * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/configurable-http-proxy/4/debian-11/Dockerfile b/bitnami/configurable-http-proxy/4/debian-11/Dockerfile index 4ec3fcc6789c3..9aeb4fe25b888 100644 --- a/bitnami/configurable-http-proxy/4/debian-11/Dockerfile +++ b/bitnami/configurable-http-proxy/4/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T07:56:10Z" \ + org.opencontainers.image.created="2023-11-27T15:29:17Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.6.0-debian-11-r17" \ + org.opencontainers.image.ref.name="4.6.1-debian-11-r0" \ org.opencontainers.image.title="configurable-http-proxy" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="4.6.0" + org.opencontainers.image.version="4.6.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,22 +21,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "node-16.20.2-1-linux-${OS_ARCH}-debian-11" \ - "configurable-http-proxy-4.6.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.6-11-linux-${OS_ARCH}-debian-11" \ + "node-18.18.2-0-linux-${OS_ARCH}-debian-11" \ + "configurable-http-proxy-4.6.1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -44,7 +44,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="4.6.0" \ +ENV APP_VERSION="4.6.1" \ BITNAMI_APP_NAME="configurable-http-proxy" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/node/bin:/opt/bitnami/configurable-http-proxy/bin:$PATH" diff --git a/bitnami/configurable-http-proxy/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/configurable-http-proxy/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 2212a9c250fb7..4595437fc18db 100644 --- a/bitnami/configurable-http-proxy/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/configurable-http-proxy/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.6.0-0" + "version": "4.6.1-0" }, "node": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.20.2-1" + "version": "18.18.2-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.6-11" } } \ No newline at end of file diff --git a/bitnami/configurable-http-proxy/4/debian-11/tags-info.yaml b/bitnami/configurable-http-proxy/4/debian-11/tags-info.yaml index a226282e5d128..1dfeebd960e3b 100644 --- a/bitnami/configurable-http-proxy/4/debian-11/tags-info.yaml +++ b/bitnami/configurable-http-proxy/4/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "4" - 4-debian-11 -- 4.6.0 +- 4.6.1 - latest diff --git a/bitnami/configurable-http-proxy/README.md b/bitnami/configurable-http-proxy/README.md index f49326f9b59a4..d128c231d6864 100644 --- a/bitnami/configurable-http-proxy/README.md +++ b/bitnami/configurable-http-proxy/README.md @@ -1,4 +1,4 @@ -# Configurable HTTP Proxy packaged by Bitnami +# Bitnami package for Configurable HTTP Proxy ## What is Configurable HTTP Proxy? @@ -18,7 +18,7 @@ docker run --name configurable-http-proxy bitnami/configurable-http-proxy:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/consul-exporter/0/debian-11/Dockerfile b/bitnami/consul-exporter/0/debian-11/Dockerfile index 3417a64d1a0db..8ef29b258df04 100644 --- a/bitnami/consul-exporter/0/debian-11/Dockerfile +++ b/bitnami/consul-exporter/0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T00:34:26Z" \ + org.opencontainers.image.created="2023-12-12T16:22:24Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.9.0-debian-11-r299" \ + org.opencontainers.image.ref.name="0.10.0-debian-11-r0" \ org.opencontainers.image.title="consul-exporter" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.9.0" + org.opencontainers.image.version="0.10.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "consul-exporter-0.9.0-11-linux-${OS_ARCH}-debian-11" \ - ) && \ + "consul-exporter-0.10.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -43,7 +43,7 @@ RUN apt-get autoremove --purge -y curl && \ RUN chmod g+rwX /opt/bitnami RUN ln -sf /opt/bitnami/consul-exporter/bin/consul_exporter /bin/consul_exporter -ENV APP_VERSION="0.9.0" \ +ENV APP_VERSION="0.10.0" \ BITNAMI_APP_NAME="consul-exporter" \ PATH="/opt/bitnami/consul-exporter/bin:$PATH" diff --git a/bitnami/consul-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/consul-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 798c57bf06262..bdaa4440d8304 100644 --- a/bitnami/consul-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/consul-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.9.0-11" + "version": "0.10.0-0" } } \ No newline at end of file diff --git a/bitnami/consul-exporter/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/consul-exporter/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/consul-exporter/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/consul-exporter/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/consul-exporter/0/debian-11/tags-info.yaml b/bitnami/consul-exporter/0/debian-11/tags-info.yaml index 3f6c790a17cb7..550313a183b70 100644 --- a/bitnami/consul-exporter/0/debian-11/tags-info.yaml +++ b/bitnami/consul-exporter/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.9.0 +- 0.10.0 - latest diff --git a/bitnami/consul-exporter/README.md b/bitnami/consul-exporter/README.md index 26dcc3f0c5226..7100e50aa436f 100644 --- a/bitnami/consul-exporter/README.md +++ b/bitnami/consul-exporter/README.md @@ -1,4 +1,4 @@ -# Consul Exporter packaged by Bitnami +# Bitnami package for Consul Exporter ## What is Consul Exporter? @@ -18,7 +18,7 @@ docker run --name consul-exporter bitnami/consul-exporter:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/consul/1/debian-11/Dockerfile b/bitnami/consul/1/debian-11/Dockerfile index 86533c0c2e903..00927ee0179ea 100644 --- a/bitnami/consul/1/debian-11/Dockerfile +++ b/bitnami/consul/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T13:47:40Z" \ + org.opencontainers.image.created="2023-12-17T10:48:51Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.16.2-debian-11-r18" \ + org.opencontainers.image.ref.name="1.17.1-debian-11-r1" \ org.opencontainers.image.title="consul" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.16.2" + org.opencontainers.image.version="1.17.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl iproute2 procps zlib1g-dev -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "consul-1.16.2-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "consul-1.17.1-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -45,7 +45,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/consul/postunpack.sh -ENV APP_VERSION="1.16.2" \ +ENV APP_VERSION="1.17.1" \ BITNAMI_APP_NAME="consul" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/consul/bin:$PATH" diff --git a/bitnami/consul/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/consul/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 3c1edb9d6b28c..080591a169c46 100644 --- a/bitnami/consul/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/consul/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.16.2-3" + "version": "1.17.1-1" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" } } \ No newline at end of file diff --git a/bitnami/consul/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/consul/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/consul/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/consul/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/consul/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/consul/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/consul/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/consul/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/consul/1/debian-11/tags-info.yaml b/bitnami/consul/1/debian-11/tags-info.yaml index c486c6f8f6533..1b30e9620af03 100644 --- a/bitnami/consul/1/debian-11/tags-info.yaml +++ b/bitnami/consul/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.16.2 +- 1.17.1 - latest diff --git a/bitnami/consul/README.md b/bitnami/consul/README.md index 3c915787bd64d..6895c21062b59 100644 --- a/bitnami/consul/README.md +++ b/bitnami/consul/README.md @@ -1,4 +1,4 @@ -# HashiCorp Consul packaged by Bitnami +# Bitnami package for HashiCorp Consul ## What is HashiCorp Consul? @@ -27,7 +27,7 @@ You can find the available configuration options in the [Environment Variables]( * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/contour/1.24/debian-11/tags-info.yaml b/bitnami/contour/1.24/debian-11/tags-info.yaml deleted file mode 100644 index 838b1874b9b63..0000000000000 --- a/bitnami/contour/1.24/debian-11/tags-info.yaml +++ /dev/null @@ -1,4 +0,0 @@ -rolling-tags: -- "1.24" -- 1.24-debian-11 -- 1.24.6 diff --git a/bitnami/contour/1.25/debian-11/Dockerfile b/bitnami/contour/1.25/debian-11/Dockerfile index f22b3e2f04a87..fc634f79bad92 100644 --- a/bitnami/contour/1.25/debian-11/Dockerfile +++ b/bitnami/contour/1.25/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-17T20:04:38Z" \ + org.opencontainers.image.created="2023-12-06T14:37:36Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.25.3-debian-11-r0" \ + org.opencontainers.image.ref.name="1.25.3-debian-11-r3" \ org.opencontainers.image.title="contour" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.25.3" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "contour-1.25.3-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "contour-1.25.3-3-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/contour/1.25/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/contour/1.25/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index eb479d86e1658..d5fbab37f1bd4 100644 --- a/bitnami/contour/1.25/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/contour/1.25/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.25.3-0" + "version": "1.25.3-3" } } \ No newline at end of file diff --git a/bitnami/contour/1.25/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/contour/1.25/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/contour/1.25/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/contour/1.25/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/contour/1.26/debian-11/Dockerfile b/bitnami/contour/1.26/debian-11/Dockerfile index 402830703d0e2..c99bd6617c7fa 100644 --- a/bitnami/contour/1.26/debian-11/Dockerfile +++ b/bitnami/contour/1.26/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-17T19:42:37Z" \ + org.opencontainers.image.created="2023-12-06T14:40:07Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.26.1-debian-11-r0" \ + org.opencontainers.image.ref.name="1.26.1-debian-11-r4" \ org.opencontainers.image.title="contour" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.26.1" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "contour-1.26.1-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "contour-1.26.1-4-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/contour/1.26/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/contour/1.26/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 153fcaa4dffa7..54556c4877ceb 100644 --- a/bitnami/contour/1.26/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/contour/1.26/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.26.1-0" + "version": "1.26.1-4" } } \ No newline at end of file diff --git a/bitnami/contour/1.26/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/contour/1.26/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/contour/1.26/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/contour/1.26/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/contour/1.26/debian-11/tags-info.yaml b/bitnami/contour/1.26/debian-11/tags-info.yaml index ee9c02c2fe095..1061dc88fb75d 100644 --- a/bitnami/contour/1.26/debian-11/tags-info.yaml +++ b/bitnami/contour/1.26/debian-11/tags-info.yaml @@ -2,4 +2,3 @@ rolling-tags: - "1.26" - 1.26-debian-11 - 1.26.1 -- latest diff --git a/bitnami/contour/1.24/debian-11/Dockerfile b/bitnami/contour/1.27/debian-11/Dockerfile similarity index 74% rename from bitnami/contour/1.24/debian-11/Dockerfile rename to bitnami/contour/1.27/debian-11/Dockerfile index aaa4f7580e38e..ebce509415dc0 100644 --- a/bitnami/contour/1.24/debian-11/Dockerfile +++ b/bitnami/contour/1.27/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-17T19:38:09Z" \ + org.opencontainers.image.created="2023-12-06T14:49:47Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.24.6-debian-11-r0" \ + org.opencontainers.image.ref.name="1.27.0-debian-11-r1" \ org.opencontainers.image.title="contour" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.24.6" + org.opencontainers.image.version="1.27.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "contour-1.24.6-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "contour-1.27.0-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -43,7 +43,7 @@ RUN apt-get autoremove --purge -y curl && \ RUN chmod g+rwX /opt/bitnami RUN ln -s /opt/bitnami/contour/bin/contour /bin/contour -ENV APP_VERSION="1.24.6" \ +ENV APP_VERSION="1.27.0" \ BITNAMI_APP_NAME="contour" \ PATH="/opt/bitnami/contour/bin:$PATH" diff --git a/bitnami/contour/1.24/debian-11/docker-compose.yml b/bitnami/contour/1.27/debian-11/docker-compose.yml similarity index 82% rename from bitnami/contour/1.24/debian-11/docker-compose.yml rename to bitnami/contour/1.27/debian-11/docker-compose.yml index 35e45984256c3..93b8c2cc10768 100644 --- a/bitnami/contour/1.24/debian-11/docker-compose.yml +++ b/bitnami/contour/1.27/debian-11/docker-compose.yml @@ -5,7 +5,7 @@ version: '2' services: contour: - image: docker.io/bitnami/contour:1.24 + image: docker.io/bitnami/contour:1.27 volumes: - contour_data:/bitnami/contour volumes: diff --git a/bitnami/contour/1.24/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/contour/1.27/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json similarity index 77% rename from bitnami/contour/1.24/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json rename to bitnami/contour/1.27/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c7ec571f553f9..67bbfdc3dc871 100644 --- a/bitnami/contour/1.24/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/contour/1.27/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.24.6-0" + "version": "1.27.0-2" } } \ No newline at end of file diff --git a/bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/contour/1.27/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt rename to bitnami/contour/1.27/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt diff --git a/bitnami/drupal-nginx/9/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/contour/1.27/debian-11/prebuildfs/usr/sbin/install_packages similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/prebuildfs/usr/sbin/install_packages rename to bitnami/contour/1.27/debian-11/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/clickhouse/22.8/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/contour/1.27/debian-11/prebuildfs/usr/sbin/run-script similarity index 92% rename from bitnami/clickhouse/22.8/debian-11/prebuildfs/usr/sbin/run-script rename to bitnami/contour/1.27/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/clickhouse/22.8/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/contour/1.27/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/contour/1.27/debian-11/tags-info.yaml b/bitnami/contour/1.27/debian-11/tags-info.yaml new file mode 100644 index 0000000000000..d7dec9bcf42da --- /dev/null +++ b/bitnami/contour/1.27/debian-11/tags-info.yaml @@ -0,0 +1,5 @@ +rolling-tags: +- "1.27" +- 1.27-debian-11 +- 1.27.0 +- latest diff --git a/bitnami/contour/README.md b/bitnami/contour/README.md index 2e113d8b8c47f..dabdacaaed6d9 100644 --- a/bitnami/contour/README.md +++ b/bitnami/contour/README.md @@ -1,4 +1,4 @@ -# Contour packaged by Bitnami +# Bitnami package for Contour ## What is Contour? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/contour/docker-compose.yml b/bitnami/contour/docker-compose.yml index 061d8173f6979..93b8c2cc10768 100644 --- a/bitnami/contour/docker-compose.yml +++ b/bitnami/contour/docker-compose.yml @@ -5,7 +5,7 @@ version: '2' services: contour: - image: docker.io/bitnami/contour:1.26 + image: docker.io/bitnami/contour:1.27 volumes: - contour_data:/bitnami/contour volumes: diff --git a/bitnami/cosign/2/debian-11/Dockerfile b/bitnami/cosign/2/debian-11/Dockerfile index ae4ca903ac17b..30eae1dd69447 100644 --- a/bitnami/cosign/2/debian-11/Dockerfile +++ b/bitnami/cosign/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T01:49:19Z" \ + org.opencontainers.image.created="2023-12-06T14:48:16Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.2.0-debian-11-r31" \ + org.opencontainers.image.ref.name="2.2.2-debian-11-r1" \ org.opencontainers.image.title="cosign" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.2.0" + org.opencontainers.image.version="2.2.2" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "cosign-2.2.0-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "cosign-2.2.2-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -45,7 +45,7 @@ RUN mkdir -p "/cosign-keys" && chmod -R 777 "/cosign-keys" RUN mkdir "/.docker" && chmod g+rwX "/.docker" RUN mkdir "/.sigstore" && chmod g+rwX "/.sigstore" -ENV APP_VERSION="2.2.0" \ +ENV APP_VERSION="2.2.2" \ BITNAMI_APP_NAME="cosign" \ PATH="/opt/bitnami/cosign/bin:$PATH" diff --git a/bitnami/cosign/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/cosign/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 63789a6ecb702..02e9e81918841 100644 --- a/bitnami/cosign/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/cosign/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.2.0-3" + "version": "2.2.2-1" } } \ No newline at end of file diff --git a/bitnami/cosign/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/cosign/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/cosign/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/cosign/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/cosign/2/debian-11/tags-info.yaml b/bitnami/cosign/2/debian-11/tags-info.yaml index 9f995c3791950..a64c0bcaa86cc 100644 --- a/bitnami/cosign/2/debian-11/tags-info.yaml +++ b/bitnami/cosign/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.2.0 +- 2.2.2 - latest diff --git a/bitnami/cosign/README.md b/bitnami/cosign/README.md index a54cbaf26a661..5cd2fdbae7d2b 100644 --- a/bitnami/cosign/README.md +++ b/bitnami/cosign/README.md @@ -1,4 +1,4 @@ -# Cosign packaged by Bitnami +# Bitnami package for Cosign ## What is Cosign? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/couchdb/3/debian-11/Dockerfile b/bitnami/couchdb/3/debian-11/Dockerfile index b293f8fe35908..0c287b0c16b8d 100644 --- a/bitnami/couchdb/3/debian-11/Dockerfile +++ b/bitnami/couchdb/3/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T20:58:40Z" \ + org.opencontainers.image.created="2023-12-05T05:12:53Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.3.2-debian-11-r101" \ + org.opencontainers.image.ref.name="3.3.3-debian-11-r0" \ org.opencontainers.image.title="couchdb" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="3.3.2" + org.opencontainers.image.version="3.3.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,23 +21,23 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgcc-s1 libicu67 libssl1.1 libstdc++6 libtinfo6 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "ini-file-1.4.6-2-linux-${OS_ARCH}-debian-11" \ - "erlang-25.3.2-6-0-linux-${OS_ARCH}-debian-11" \ - "couchdb-3.3.2-7-linux-${OS_ARCH}-debian-11" \ - ) && \ + "wait-for-port-1.0.7-3-linux-${OS_ARCH}-debian-11" \ + "ini-file-1.4.6-3-linux-${OS_ARCH}-debian-11" \ + "erlang-25.3.2-7-0-linux-${OS_ARCH}-debian-11" \ + "couchdb-3.3.3-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -46,7 +46,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/couchdb/postunpack.sh -ENV APP_VERSION="3.3.2" \ +ENV APP_VERSION="3.3.3" \ BITNAMI_APP_NAME="couchdb" \ LD_LIBRARY_PATH="/opt/bitnami/common/lib:$LD_LIBRARY_PATH" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/erlang/bin:/opt/bitnami/couchdb/bin:$PATH" diff --git a/bitnami/couchdb/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/couchdb/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 38017c46bd107..2de1e6d8f3bd5 100644 --- a/bitnami/couchdb/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/couchdb/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,24 +3,24 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.3.2-7" + "version": "3.3.3-0" }, "erlang": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "25.3.2-6-0" + "version": "25.3.2-7-0" }, "ini-file": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-2" + "version": "1.4.6-3" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-3" } } \ No newline at end of file diff --git a/bitnami/couchdb/3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/couchdb/3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/couchdb/3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/couchdb/3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/couchdb/3/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/couchdb/3/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/couchdb/3/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/couchdb/3/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/couchdb/3/debian-11/tags-info.yaml b/bitnami/couchdb/3/debian-11/tags-info.yaml index ee7b1ba73127e..12f725a4aaef1 100644 --- a/bitnami/couchdb/3/debian-11/tags-info.yaml +++ b/bitnami/couchdb/3/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "3" - 3-debian-11 -- 3.3.2 +- 3.3.3 - latest diff --git a/bitnami/couchdb/README.md b/bitnami/couchdb/README.md index 02e48350a0df4..bdc8d09b37f89 100644 --- a/bitnami/couchdb/README.md +++ b/bitnami/couchdb/README.md @@ -1,4 +1,4 @@ -# CouchDB packaged by Bitnami +# Bitnami package for CouchDB ## What is CouchDB? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/deepspeed/0/debian-11/Dockerfile b/bitnami/deepspeed/0/debian-11/Dockerfile index 65b7baccc2f5d..5932d14906b0c 100644 --- a/bitnami/deepspeed/0/debian-11/Dockerfile +++ b/bitnami/deepspeed/0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-26T19:14:21Z" \ + org.opencontainers.image.created="2023-12-02T09:33:51Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.11.1-debian-11-r1" \ + org.opencontainers.image.ref.name="0.12.3-debian-11-r3" \ org.opencontainers.image.title="deepspeed" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.11.1" + org.opencontainers.image.version="0.12.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,22 +21,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages build-essential ca-certificates curl git jq libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgomp1 libgssapi-krb5-2 libjemalloc2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 libuuid1 numactl openssh-server pkg-config procps unzip zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "python-3.10.13-8-linux-${OS_ARCH}-debian-11" \ - "deepspeed-0.11.1-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "render-template-1.0.6-3-linux-${OS_ARCH}-debian-11" \ + "python-3.10.13-11-linux-${OS_ARCH}-debian-11" \ + "deepspeed-0.12.3-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -47,10 +47,14 @@ RUN mkdir /.local && chmod g+rwX /.local COPY rootfs / RUN mkdir /app /.cache && mkdir -p /home/deepspeed/.local && mkdir -p /home/deepspeed/.ssh && mkdir /home/deepspeed/.cache && ln -s /home/deepspeed/.local /opt/bitnami/deepspeed && ln -s /home/deepspeed/.ssh /opt/bitnami/deepspeed && ln -s /home/deepspeed/.cache /opt/bitnami/deepspeed && chmod g+rwX /app /.cache /home/deepspeed/.cache /home/deepspeed/.local -ENV APP_VERSION="0.11.1" \ +ENV APP_VERSION="0.12.3" \ BITNAMI_APP_NAME="deepspeed" \ + CFLAGS="-s -I/opt/bitnami/python/include -I/opt/bitnami/common/include" \ CPLUS_INCLUDE_PATH="/opt/bitnami/common/include" \ + CPPFLAGS="-I/opt/bitnami/python/include -I/opt/bitnami/common/include" \ C_INCLUDE_PATH="/opt/bitnami/common/include" \ + LDFLAGS="-Wl,-rpath: /opt/bitnami/python/lib -L/opt/bitnami/python/lib -Wl,-rpath: /opt/bitnami/common/lib -L/opt/bitnami/common/lib" \ + LD_LIBRARY_PATH="/opt/bitnami/python/lib:/opt/bitnami/common/lib:${LD_LIBRARY_PATH}" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/python/bin:$PATH" WORKDIR /app diff --git a/bitnami/deepspeed/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/deepspeed/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 7449da916013a..7ab8ab7952ef9 100644 --- a/bitnami/deepspeed/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/deepspeed/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.11.1-1" + "version": "0.12.3-2" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.10.13-8" + "version": "3.10.13-11" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-3" } } \ No newline at end of file diff --git a/bitnami/deepspeed/0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/deepspeed/0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/deepspeed/0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/deepspeed/0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/deepspeed/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/deepspeed/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/deepspeed/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/deepspeed/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/deepspeed/0/debian-11/tags-info.yaml b/bitnami/deepspeed/0/debian-11/tags-info.yaml index 2664874296af7..f65cc9f4e5f75 100644 --- a/bitnami/deepspeed/0/debian-11/tags-info.yaml +++ b/bitnami/deepspeed/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.11.1 +- 0.12.3 - latest diff --git a/bitnami/deepspeed/README.md b/bitnami/deepspeed/README.md index 3caf3109edc47..ace82d792fbeb 100644 --- a/bitnami/deepspeed/README.md +++ b/bitnami/deepspeed/README.md @@ -1,4 +1,4 @@ -# DeepSpeed packaged by Bitnami +# Bitnami package for DeepSpeed ## What is DeepSpeed? @@ -22,12 +22,12 @@ docker-compose up -d ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use DeepSpeed in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/dex/2/debian-11/Dockerfile b/bitnami/dex/2/debian-11/Dockerfile index 761845d347060..aaa7747a6f6d2 100644 --- a/bitnami/dex/2/debian-11/Dockerfile +++ b/bitnami/dex/2/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:54:01Z" \ + org.opencontainers.image.created="2023-12-06T14:52:37Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.37.0-debian-11-r97" \ + org.opencontainers.image.ref.name="2.37.0-debian-11-r100" \ org.opencontainers.image.title="dex" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.37.0" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "dex-2.37.0-5-linux-${OS_ARCH}-debian-11" \ - ) && \ + "dex-2.37.0-7-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/dex/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/dex/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 5389e113753f0..17873c39a87ee 100644 --- a/bitnami/dex/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/dex/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.37.0-5" + "version": "2.37.0-7" } } \ No newline at end of file diff --git a/bitnami/dex/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/dex/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/dex/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/dex/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/dex/README.md b/bitnami/dex/README.md index 4c7da4a637c7f..0820ba8349279 100644 --- a/bitnami/dex/README.md +++ b/bitnami/dex/README.md @@ -1,4 +1,4 @@ -# Dex packaged by Bitnami +# Bitnami package for Dex ## What is Dex? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/discourse/3/debian-11/Dockerfile b/bitnami/discourse/3/debian-11/Dockerfile index 9dc3a729b1c2c..413842a20422c 100644 --- a/bitnami/discourse/3/debian-11/Dockerfile +++ b/bitnami/discourse/3/debian-11/Dockerfile @@ -7,39 +7,39 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T09:56:13Z" \ + org.opencontainers.image.created="2023-12-02T08:07:15Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.1.2-debian-11-r1" \ + org.opencontainers.image.ref.name="3.1.3-debian-11-r3" \ org.opencontainers.image.title="discourse" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="3.1.2" + org.opencontainers.image.version="3.1.3" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages acl advancecomp ca-certificates curl file gifsicle git hostname imagemagick jhead jpegoptim libbrotli1 libbsd0 libbz2-1.0 libcom-err2 libcrypt1 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg-turbo-progs libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpq5 libreadline-dev libreadline8 libsasl2-2 libsqlite3-0 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libxml2 libxslt1.1 libyaml-0-2 optipng pngcrush pngquant procps rsync sqlite3 zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN install_packages acl advancecomp ca-certificates curl file gifsicle git hostname imagemagick jhead jpegoptim libbrotli1 libbsd0 libbz2-1.0 libcom-err2 libcrypt1 libcurl4 libedit2 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg-turbo-progs libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libncursesw6 libnettle8 libnghttp2-14 libnsl2 libp11-kit0 libpcre2-8-0 libpq5 libpsl5 libreadline-dev libreadline8 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libxml2 libxslt1.1 libyaml-0-2 libyaml-dev optipng pngcrush pngquant procps rsync sqlite3 zlib1g +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "ruby-3.2.2-7-linux-${OS_ARCH}-debian-11" \ - "postgresql-client-16.0.0-0-linux-${OS_ARCH}-debian-11" \ - "node-18.18.2-0-linux-${OS_ARCH}-debian-11" \ + "python-3.11.6-11-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-3-linux-${OS_ARCH}-debian-11" \ + "ruby-3.2.2-9-linux-${OS_ARCH}-debian-11" \ + "postgresql-client-16.1.0-0-linux-${OS_ARCH}-debian-11" \ + "node-18.19.0-0-linux-${OS_ARCH}-debian-11" \ "brotli-1.1.0-0-linux-${OS_ARCH}-debian-11" \ - "discourse-3.1.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "discourse-3.1.3-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -49,7 +49,7 @@ RUN /opt/bitnami/ruby/bin/gem install --force bundler -v '< 2' COPY rootfs / RUN /opt/bitnami/scripts/discourse/postunpack.sh -ENV APP_VERSION="3.1.2" \ +ENV APP_VERSION="3.1.3" \ BITNAMI_APP_NAME="discourse" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/common/bin:/opt/bitnami/ruby/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/node/bin:/opt/bitnami/brotli/bin:/opt/bitnami/discourse/app/assets/javascripts/node_modules/ember-cli/bin:$PATH" diff --git a/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 41f48061aaab4..6b1f2ce517cc7 100644 --- a/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,36 +9,36 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.1.2-0" + "version": "3.1.3-0" }, "node": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "18.18.2-0" + "version": "18.19.0-0" }, "postgresql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.0.0-0" + "version": "16.1.0-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.6-11" }, "ruby": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.2.2-7" + "version": "3.2.2-9" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-3" } } \ No newline at end of file diff --git a/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/discourse/3/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/discourse/3/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/discourse/3/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/discourse/3/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/discourse/3/debian-11/tags-info.yaml b/bitnami/discourse/3/debian-11/tags-info.yaml index bc9e97f849927..1af6f2afe808a 100644 --- a/bitnami/discourse/3/debian-11/tags-info.yaml +++ b/bitnami/discourse/3/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "3" - 3-debian-11 -- 3.1.2 +- 3.1.3 - latest diff --git a/bitnami/discourse/README.md b/bitnami/discourse/README.md index 8510ab0c0db4b..9c28227e5f404 100644 --- a/bitnami/discourse/README.md +++ b/bitnami/discourse/README.md @@ -18,12 +18,12 @@ docker-compose up -d ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use Discourse® in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/dokuwiki/20230404/debian-11/Dockerfile b/bitnami/dokuwiki/20230404/debian-11/Dockerfile index f67843ac93a90..90aaef8ba8ec0 100644 --- a/bitnami/dokuwiki/20230404/debian-11/Dockerfile +++ b/bitnami/dokuwiki/20230404/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:12:55Z" \ + org.opencontainers.image.created="2023-12-02T08:41:59Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="20230404.1.0-debian-11-r102" \ + org.opencontainers.image.ref.name="20230404.1.0-debian-11-r105" \ org.opencontainers.image.title="dokuwiki" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="20230404.1.0" @@ -21,24 +21,24 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl ldap-utils libbrotli1 libbsd0 libbz2-1.0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 libldap-common liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam-ldapd libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 nslcd openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.2.11-3-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.57-12-linux-${OS_ARCH}-debian-11" \ - "libphp-8.2.11-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ + "php-8.2.13-6-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.58-1-linux-${OS_ARCH}-debian-11" \ + "libphp-8.2.13-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-3-linux-${OS_ARCH}-debian-11" \ "dokuwiki-20230404.1.0-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/dokuwiki/20230404/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/dokuwiki/20230404/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 5b98cfb380aa7..e1917a0c6b926 100644 --- a/bitnami/dokuwiki/20230404/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/dokuwiki/20230404/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.57-12" + "version": "2.4.58-1" }, "dokuwiki": { "arch": "amd64", @@ -15,18 +15,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.11-0" + "version": "8.2.13-0" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.11-3" + "version": "8.2.13-6" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-3" } } \ No newline at end of file diff --git a/bitnami/dokuwiki/20230404/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/dokuwiki/20230404/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/dokuwiki/20230404/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/dokuwiki/20230404/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/dokuwiki/20230404/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/dokuwiki/20230404/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/dokuwiki/20230404/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/dokuwiki/20230404/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/dokuwiki/20230404/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/dokuwiki/20230404/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh index 765d1d8ce1ed5..6a480ad4ddde9 100755 --- a/bitnami/dokuwiki/20230404/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh +++ b/bitnami/dokuwiki/20230404/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh @@ -46,6 +46,7 @@ apache_setup_bitnami_config() { local -a modules_to_disable=( "http2_module" "proxy_hcheck_module" + "proxy_html_module" "proxy_http2_module" ) for module in "${modules_to_disable[@]}"; do diff --git a/bitnami/dokuwiki/README.md b/bitnami/dokuwiki/README.md index 056ae9afc0a45..bc01ce75da61f 100644 --- a/bitnami/dokuwiki/README.md +++ b/bitnami/dokuwiki/README.md @@ -1,4 +1,4 @@ -# DokuWiki packaged by Bitnami +# Bitnami package for DokuWiki ## What is DokuWiki? @@ -21,7 +21,7 @@ You can find the default credentials and available configuration options in the * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/dotnet-sdk/6/debian-11/Dockerfile b/bitnami/dotnet-sdk/6/debian-11/Dockerfile index 29a1241c4529e..e150cc2d0c6c6 100644 --- a/bitnami/dotnet-sdk/6/debian-11/Dockerfile +++ b/bitnami/dotnet-sdk/6/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T22:33:36Z" \ + org.opencontainers.image.created="2023-12-02T08:35:43Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.0.416-debian-11-r0" \ + org.opencontainers.image.ref.name="6.0.417-debian-11-r1" \ org.opencontainers.image.title="dotnet-sdk" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="6.0.416" + org.opencontainers.image.version="6.0.417" ENV HOME="/app" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/app" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages build-essential ca-certificates curl git libcap2-bin libgcc-s1 libicu-dev liblttng-ust-dev libsqlite3-dev libssl-dev libstdc++6 pkg-config procps unzip wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "dotnet-sdk-6.0.416-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "dotnet-sdk-6.0.417-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -45,7 +45,7 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ COPY rootfs / RUN /opt/bitnami/scripts/dotnet-sdk/postunpack.sh -ENV APP_VERSION="6.0.416" \ +ENV APP_VERSION="6.0.417" \ BITNAMI_APP_NAME="dotnet-sdk" \ DOTNET_CLI_HOME="/app" \ DOTNET_ROOT="/opt/bitnami/dotnet-sdk/bin" \ diff --git a/bitnami/dotnet-sdk/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/dotnet-sdk/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 0d731ebc18140..509573718f6ed 100644 --- a/bitnami/dotnet-sdk/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/dotnet-sdk/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "6.0.416-0" + "version": "6.0.417-0" } } \ No newline at end of file diff --git a/bitnami/dotnet-sdk/6/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/dotnet-sdk/6/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/dotnet-sdk/6/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/dotnet-sdk/6/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/dotnet-sdk/6/debian-11/tags-info.yaml b/bitnami/dotnet-sdk/6/debian-11/tags-info.yaml index f61a436c2f794..427b56fa46759 100644 --- a/bitnami/dotnet-sdk/6/debian-11/tags-info.yaml +++ b/bitnami/dotnet-sdk/6/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "6" - 6-debian-11 -- 6.0.416 +- 6.0.417 diff --git a/bitnami/dotnet-sdk/7/debian-11/Dockerfile b/bitnami/dotnet-sdk/7/debian-11/Dockerfile index 4e36bdc392bbd..d9d0ec6fe8243 100644 --- a/bitnami/dotnet-sdk/7/debian-11/Dockerfile +++ b/bitnami/dotnet-sdk/7/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T22:39:14Z" \ + org.opencontainers.image.created="2023-12-02T08:10:34Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.0.403-debian-11-r0" \ + org.opencontainers.image.ref.name="7.0.404-debian-11-r1" \ org.opencontainers.image.title="dotnet-sdk" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.0.403" + org.opencontainers.image.version="7.0.404" ENV HOME="/app" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/app" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages build-essential ca-certificates curl git libcap2-bin libgcc-s1 libicu-dev liblttng-ust-dev libsqlite3-dev libssl-dev libstdc++6 pkg-config procps unzip wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "dotnet-sdk-7.0.403-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "dotnet-sdk-7.0.404-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -45,7 +45,7 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ COPY rootfs / RUN /opt/bitnami/scripts/dotnet-sdk/postunpack.sh -ENV APP_VERSION="7.0.403" \ +ENV APP_VERSION="7.0.404" \ BITNAMI_APP_NAME="dotnet-sdk" \ DOTNET_CLI_HOME="/app" \ DOTNET_ROOT="/opt/bitnami/dotnet-sdk/bin" \ diff --git a/bitnami/dotnet-sdk/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/dotnet-sdk/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index de105252b6fa3..b893a16956b0e 100644 --- a/bitnami/dotnet-sdk/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/dotnet-sdk/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.0.403-0" + "version": "7.0.404-0" } } \ No newline at end of file diff --git a/bitnami/dotnet-sdk/7/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/dotnet-sdk/7/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/dotnet-sdk/7/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/dotnet-sdk/7/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/dotnet-sdk/7/debian-11/tags-info.yaml b/bitnami/dotnet-sdk/7/debian-11/tags-info.yaml index 32d4d2f14c622..d112116891c78 100644 --- a/bitnami/dotnet-sdk/7/debian-11/tags-info.yaml +++ b/bitnami/dotnet-sdk/7/debian-11/tags-info.yaml @@ -1,5 +1,4 @@ rolling-tags: - "7" - 7-debian-11 -- 7.0.403 -- latest +- 7.0.404 diff --git a/bitnami/dotnet-sdk/8/debian-11/Dockerfile b/bitnami/dotnet-sdk/8/debian-11/Dockerfile new file mode 100644 index 0000000000000..370f9bcef0e8b --- /dev/null +++ b/bitnami/dotnet-sdk/8/debian-11/Dockerfile @@ -0,0 +1,56 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +FROM docker.io/bitnami/minideb:bullseye + +ARG TARGETARCH + +LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-12-02T08:42:23Z" \ + org.opencontainers.image.description="Application packaged by VMware, Inc" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.ref.name="8.0.100-debian-11-r1" \ + org.opencontainers.image.title="dotnet-sdk" \ + org.opencontainers.image.vendor="VMware, Inc." \ + org.opencontainers.image.version="8.0.100" + +ENV HOME="/app" \ + OS_ARCH="${TARGETARCH:-amd64}" \ + OS_FLAVOUR="debian-11" \ + OS_NAME="linux" + +COPY prebuildfs / +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] +# Install required system packages and dependencies +RUN install_packages build-essential ca-certificates curl git libcap2-bin libgcc-s1 libicu-dev liblttng-ust-dev libsqlite3-dev libssl-dev libstdc++6 pkg-config procps unzip wget zlib1g +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ + COMPONENTS=( \ + "dotnet-sdk-8.0.100-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ + for COMPONENT in "${COMPONENTS[@]}"; do \ + if [ ! -f "${COMPONENT}.tar.gz" ]; then \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ + rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ + done +RUN apt-get update && apt-get upgrade -y && \ + apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives +RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ + sed -i 's/^PASS_MIN_DAYS.*/PASS_MIN_DAYS 0/' /etc/login.defs && \ + sed -i 's/sha512/sha512 minlen=8/' /etc/pam.d/common-password + +COPY rootfs / +RUN /opt/bitnami/scripts/dotnet-sdk/postunpack.sh +ENV APP_VERSION="8.0.100" \ + BITNAMI_APP_NAME="dotnet-sdk" \ + DOTNET_CLI_HOME="/app" \ + DOTNET_ROOT="/opt/bitnami/dotnet-sdk/bin" \ + PATH="/opt/bitnami/dotnet-sdk/bin:$PATH" + +WORKDIR /app +ENTRYPOINT [ "/opt/bitnami/scripts/dotnet-sdk/entrypoint.sh" ] +CMD [ "/bin/bash" ] diff --git a/bitnami/dotnet-sdk/8/debian-11/docker-compose.yml b/bitnami/dotnet-sdk/8/debian-11/docker-compose.yml new file mode 100644 index 0000000000000..f7a2bb405eda2 --- /dev/null +++ b/bitnami/dotnet-sdk/8/debian-11/docker-compose.yml @@ -0,0 +1,13 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +version: '2' +services: + dotnet-sdk: + image: docker.io/bitnami/dotnet-sdk:8 + command: ["tail", "-f", "/dev/null"] # To keep the container running + volumes: + - dotnet_data:/app +volumes: + dotnet_data: + driver: local diff --git a/bitnami/dotnet-sdk/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/dotnet-sdk/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json new file mode 100644 index 0000000000000..48c9cb33afcdd --- /dev/null +++ b/bitnami/dotnet-sdk/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -0,0 +1,8 @@ +{ + "dotnet-sdk": { + "arch": "amd64", + "distro": "debian-11", + "type": "NAMI", + "version": "8.0.100-0" + } +} \ No newline at end of file diff --git a/bitnami/dotnet-sdk/8/debian-11/prebuildfs/opt/bitnami/base/functions b/bitnami/dotnet-sdk/8/debian-11/prebuildfs/opt/bitnami/base/functions new file mode 100644 index 0000000000000..76899b6c85aeb --- /dev/null +++ b/bitnami/dotnet-sdk/8/debian-11/prebuildfs/opt/bitnami/base/functions @@ -0,0 +1,122 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +[[ ${BASH_DEBUG:-false} = true ]] && set -x + +# Constants +MODULE="$(basename "$0")" +BITNAMI_PREFIX=/opt/bitnami + +# Color Palette +RESET='\033[0m' +BOLD='\033[1m' + +## Foreground +BLACK='\033[38;5;0m' +RED='\033[38;5;1m' +GREEN='\033[38;5;2m' +YELLOW='\033[38;5;3m' +BLUE='\033[38;5;4m' +MAGENTA='\033[38;5;5m' +CYAN='\033[38;5;6m' +WHITE='\033[38;5;7m' + +## Background +ON_BLACK='\033[48;5;0m' +ON_RED='\033[48;5;1m' +ON_GREEN='\033[48;5;2m' +ON_YELLOW='\033[48;5;3m' +ON_BLUE='\033[48;5;4m' +ON_MAGENTA='\033[48;5;5m' +ON_CYAN='\033[48;5;6m' +ON_WHITE='\033[48;5;7m' + +# Functions + +######################## +# Print to STDERR +# Arguments: +# Message to print +# Returns: +# None +######################### +stderr_print() { + printf "%b\\n" "${*}" >&2 +} + +######################## +# Log message +# Arguments: +# Message to log +# Returns: +# None +######################### +log() { + stderr_print "${NAMI_DEBUG:+${CYAN}${MODULE:-} ${MAGENTA}$(date "+%T.%2N ")}${RESET}${*}" +} +######################## +# Log an 'info' message +# Arguments: +# Message to log +# Returns: +# None +######################### +info() { + log "${GREEN}INFO ${RESET} ==> ${*}" +} +######################## +# Log message +# Arguments: +# Message to log +# Returns: +# None +######################### +warn() { + log "${YELLOW}WARN ${RESET} ==> ${*}" +} +######################## +# Log an 'error' message +# Arguments: +# Message to log +# Returns: +# None +######################### +error() { + log "${RED}ERROR${RESET} ==> ${*}" +} +######################## +# Print the welcome page +# Globals: +# DISABLE_WELCOME_MESSAGE +# BITNAMI_APP_NAME +# Arguments: +# None +# Returns: +# None +######################### +print_welcome_page() { + if [[ -z "${DISABLE_WELCOME_MESSAGE:-}" ]]; then + if [[ -n "$BITNAMI_APP_NAME" ]]; then + print_image_welcome_page + fi + fi +} +######################## +# Print the welcome page for a Bitnami Docker image +# Globals: +# BITNAMI_APP_NAME +# Arguments: +# None +# Returns: +# None +######################### +print_image_welcome_page() { + local github_url="https://github.com/bitnami/containers" + + log "" + log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + log "" +} diff --git a/bitnami/dotnet-sdk/8/debian-11/prebuildfs/opt/bitnami/base/helpers b/bitnami/dotnet-sdk/8/debian-11/prebuildfs/opt/bitnami/base/helpers new file mode 100644 index 0000000000000..387769aabbf3a --- /dev/null +++ b/bitnami/dotnet-sdk/8/debian-11/prebuildfs/opt/bitnami/base/helpers @@ -0,0 +1,42 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +. /opt/bitnami/base/functions + +######################## +# Helper function to initialize a single nami module +# Arguments: +# Module to initialize +# Returns: +# None +# Description: +# Initialize an unpacked nami module with the `nami initialize` command. +# Command arguments can be specified as function argumnts after the module name. +# `--log-level trace` flag is added to the command if `NAMI_DEBUG` env variable exists. +# The log level can be overridden using the `NAMI_LOG_LEVEL` env variable. +######################### +nami_initialize_one() { + local module="${1:?module not specified}" + if nami inspect $module | grep -q '"lifecycle": "unpacked"'; then + local inputs= + if [[ -f "/${module}-inputs.json" ]]; then + inputs="--inputs-file=/${module}-inputs.json" + fi + nami ${NAMI_DEBUG:+--log-level ${NAMI_LOG_LEVEL:-trace}} initialize $module $inputs "${@:2}" + fi +} + +######################## +# Helper function to initialize one or more nami modules +# Arguments: +# Module to initialize +# Returns: +# None +######################### +nami_initialize() { + local module="${1:?module not specified}" + for module in "${@}"; do + nami_initialize_one $module + done +} diff --git a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/dotnet-sdk/8/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt similarity index 100% rename from bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt rename to bitnami/dotnet-sdk/8/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt diff --git a/bitnami/drupal/9/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/dotnet-sdk/8/debian-11/prebuildfs/usr/sbin/install_packages similarity index 100% rename from bitnami/drupal/9/debian-11/prebuildfs/usr/sbin/install_packages rename to bitnami/dotnet-sdk/8/debian-11/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/drupal/9/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/dotnet-sdk/8/debian-11/prebuildfs/usr/sbin/run-script similarity index 92% rename from bitnami/drupal/9/debian-11/prebuildfs/usr/sbin/run-script rename to bitnami/dotnet-sdk/8/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/drupal/9/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/dotnet-sdk/8/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/dotnet-sdk/8/debian-11/rootfs/opt/bitnami/scripts/dotnet-sdk/entrypoint.sh b/bitnami/dotnet-sdk/8/debian-11/rootfs/opt/bitnami/scripts/dotnet-sdk/entrypoint.sh new file mode 100755 index 0000000000000..eef346858223f --- /dev/null +++ b/bitnami/dotnet-sdk/8/debian-11/rootfs/opt/bitnami/scripts/dotnet-sdk/entrypoint.sh @@ -0,0 +1,12 @@ +#!/bin/bash -e +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +# shellcheck disable=SC1091 + +. /opt/bitnami/base/functions +. /opt/bitnami/base/helpers + +print_welcome_page + +exec "$@" diff --git a/bitnami/dotnet-sdk/8/debian-11/rootfs/opt/bitnami/scripts/dotnet-sdk/postunpack.sh b/bitnami/dotnet-sdk/8/debian-11/rootfs/opt/bitnami/scripts/dotnet-sdk/postunpack.sh new file mode 100755 index 0000000000000..91dc11ec089ed --- /dev/null +++ b/bitnami/dotnet-sdk/8/debian-11/rootfs/opt/bitnami/scripts/dotnet-sdk/postunpack.sh @@ -0,0 +1,13 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purpose +mkdir /app +chmod g+rwx /app +setcap CAP_NET_BIND_SERVICE=+eip /opt/bitnami/dotnet-sdk/bin/dotnet diff --git a/bitnami/dotnet-sdk/8/debian-11/tags-info.yaml b/bitnami/dotnet-sdk/8/debian-11/tags-info.yaml new file mode 100644 index 0000000000000..a3d4a2d1e29f4 --- /dev/null +++ b/bitnami/dotnet-sdk/8/debian-11/tags-info.yaml @@ -0,0 +1,5 @@ +rolling-tags: +- "8" +- 8-debian-11 +- 8.0.100 +- latest diff --git a/bitnami/dotnet-sdk/README.md b/bitnami/dotnet-sdk/README.md index d0d43afbbea97..60a55c4d98520 100644 --- a/bitnami/dotnet-sdk/README.md +++ b/bitnami/dotnet-sdk/README.md @@ -1,4 +1,4 @@ -# .NET SDK packaged by Bitnami +# Bitnami package for .NET SDK ## What is .NET SDK? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/dotnet-sdk/docker-compose.yml b/bitnami/dotnet-sdk/docker-compose.yml index 8e52db815b8eb..f7a2bb405eda2 100644 --- a/bitnami/dotnet-sdk/docker-compose.yml +++ b/bitnami/dotnet-sdk/docker-compose.yml @@ -4,7 +4,7 @@ version: '2' services: dotnet-sdk: - image: docker.io/bitnami/dotnet-sdk:7 + image: docker.io/bitnami/dotnet-sdk:8 command: ["tail", "-f", "/dev/null"] # To keep the container running volumes: - dotnet_data:/app diff --git a/bitnami/dotnet/6/debian-11/Dockerfile b/bitnami/dotnet/6/debian-11/Dockerfile index a43fc2a0b1beb..72672a04761bc 100644 --- a/bitnami/dotnet/6/debian-11/Dockerfile +++ b/bitnami/dotnet/6/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T19:49:54Z" \ + org.opencontainers.image.created="2023-12-02T08:16:34Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.0.24-debian-11-r0" \ + org.opencontainers.image.ref.name="6.0.25-debian-11-r1" \ org.opencontainers.image.title="dotnet" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="6.0.24" + org.opencontainers.image.version="6.0.25" ENV HOME="/app" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/app" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages build-essential ca-certificates curl git libcap2-bin libgcc-s1 libicu-dev liblttng-ust-dev libsqlite3-dev libssl-dev libstdc++6 pkg-config procps unzip wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "dotnet-6.0.24-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "dotnet-6.0.25-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -45,7 +45,7 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ COPY rootfs / RUN /opt/bitnami/scripts/dotnet/postunpack.sh -ENV APP_VERSION="6.0.24" \ +ENV APP_VERSION="6.0.25" \ BITNAMI_APP_NAME="dotnet" \ DOTNET_CLI_HOME="/app" \ DOTNET_ROOT="/opt/bitnami/dotnet/bin" \ diff --git a/bitnami/dotnet/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/dotnet/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 2a8460a44cbf3..7a8dcc17d453d 100644 --- a/bitnami/dotnet/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/dotnet/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "6.0.24-0" + "version": "6.0.25-0" } } \ No newline at end of file diff --git a/bitnami/dotnet/6/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/dotnet/6/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/dotnet/6/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/dotnet/6/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/dotnet/6/debian-11/tags-info.yaml b/bitnami/dotnet/6/debian-11/tags-info.yaml index 0ea882f6b228a..acf19ee72736c 100644 --- a/bitnami/dotnet/6/debian-11/tags-info.yaml +++ b/bitnami/dotnet/6/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "6" - 6-debian-11 -- 6.0.24 +- 6.0.25 diff --git a/bitnami/dotnet/7/debian-11/Dockerfile b/bitnami/dotnet/7/debian-11/Dockerfile index 5105116d847a8..70c9ed26b560b 100644 --- a/bitnami/dotnet/7/debian-11/Dockerfile +++ b/bitnami/dotnet/7/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T19:59:24Z" \ + org.opencontainers.image.created="2023-12-02T08:34:02Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.0.13-debian-11-r0" \ + org.opencontainers.image.ref.name="7.0.14-debian-11-r1" \ org.opencontainers.image.title="dotnet" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.0.13" + org.opencontainers.image.version="7.0.14" ENV HOME="/app" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/app" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages build-essential ca-certificates curl git libcap2-bin libgcc-s1 libicu-dev liblttng-ust-dev libsqlite3-dev libssl-dev libstdc++6 pkg-config procps unzip wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "dotnet-7.0.13-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "dotnet-7.0.14-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -45,7 +45,7 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ COPY rootfs / RUN /opt/bitnami/scripts/dotnet/postunpack.sh -ENV APP_VERSION="7.0.13" \ +ENV APP_VERSION="7.0.14" \ BITNAMI_APP_NAME="dotnet" \ DOTNET_CLI_HOME="/app" \ DOTNET_ROOT="/opt/bitnami/dotnet/bin" \ diff --git a/bitnami/dotnet/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/dotnet/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 82fd3137d6256..8bb701b425d68 100644 --- a/bitnami/dotnet/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/dotnet/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.0.13-0" + "version": "7.0.14-0" } } \ No newline at end of file diff --git a/bitnami/dotnet/7/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/dotnet/7/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/dotnet/7/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/dotnet/7/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/dotnet/7/debian-11/tags-info.yaml b/bitnami/dotnet/7/debian-11/tags-info.yaml index 6cdbd063d5fea..c8d89b5b3e803 100644 --- a/bitnami/dotnet/7/debian-11/tags-info.yaml +++ b/bitnami/dotnet/7/debian-11/tags-info.yaml @@ -1,5 +1,4 @@ rolling-tags: - "7" - 7-debian-11 -- 7.0.13 -- latest +- 7.0.14 diff --git a/bitnami/dotnet/8/debian-11/Dockerfile b/bitnami/dotnet/8/debian-11/Dockerfile new file mode 100644 index 0000000000000..4f6ae67132f9c --- /dev/null +++ b/bitnami/dotnet/8/debian-11/Dockerfile @@ -0,0 +1,56 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +FROM docker.io/bitnami/minideb:bullseye + +ARG TARGETARCH + +LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-12-02T08:49:49Z" \ + org.opencontainers.image.description="Application packaged by VMware, Inc" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.ref.name="8.0.0-debian-11-r1" \ + org.opencontainers.image.title="dotnet" \ + org.opencontainers.image.vendor="VMware, Inc." \ + org.opencontainers.image.version="8.0.0" + +ENV HOME="/app" \ + OS_ARCH="${TARGETARCH:-amd64}" \ + OS_FLAVOUR="debian-11" \ + OS_NAME="linux" + +COPY prebuildfs / +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] +# Install required system packages and dependencies +RUN install_packages build-essential ca-certificates curl git libcap2-bin libgcc-s1 libicu-dev liblttng-ust-dev libsqlite3-dev libssl-dev libstdc++6 pkg-config procps unzip wget zlib1g +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ + COMPONENTS=( \ + "dotnet-8.0.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ + for COMPONENT in "${COMPONENTS[@]}"; do \ + if [ ! -f "${COMPONENT}.tar.gz" ]; then \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ + rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ + done +RUN apt-get update && apt-get upgrade -y && \ + apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives +RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ + sed -i 's/^PASS_MIN_DAYS.*/PASS_MIN_DAYS 0/' /etc/login.defs && \ + sed -i 's/sha512/sha512 minlen=8/' /etc/pam.d/common-password + +COPY rootfs / +RUN /opt/bitnami/scripts/dotnet/postunpack.sh +ENV APP_VERSION="8.0.0" \ + BITNAMI_APP_NAME="dotnet" \ + DOTNET_CLI_HOME="/app" \ + DOTNET_ROOT="/opt/bitnami/dotnet/bin" \ + PATH="/opt/bitnami/dotnet/bin:$PATH" + +WORKDIR /app +ENTRYPOINT [ "/opt/bitnami/scripts/dotnet/entrypoint.sh" ] +CMD [ "/bin/bash" ] diff --git a/bitnami/dotnet/8/debian-11/docker-compose.yml b/bitnami/dotnet/8/debian-11/docker-compose.yml new file mode 100644 index 0000000000000..2b622cb7be16c --- /dev/null +++ b/bitnami/dotnet/8/debian-11/docker-compose.yml @@ -0,0 +1,13 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +version: '2' +services: + dotnet: + image: docker.io/bitnami/dotnet:8 + command: ["tail", "-f", "/dev/null"] # To keep the container running + volumes: + - dotnet_data:/app +volumes: + dotnet_data: + driver: local diff --git a/bitnami/dotnet/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/dotnet/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json new file mode 100644 index 0000000000000..0473f7d9bdcde --- /dev/null +++ b/bitnami/dotnet/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -0,0 +1,8 @@ +{ + "dotnet": { + "arch": "amd64", + "distro": "debian-11", + "type": "NAMI", + "version": "8.0.0-0" + } +} \ No newline at end of file diff --git a/bitnami/dotnet/8/debian-11/prebuildfs/opt/bitnami/base/functions b/bitnami/dotnet/8/debian-11/prebuildfs/opt/bitnami/base/functions new file mode 100644 index 0000000000000..76899b6c85aeb --- /dev/null +++ b/bitnami/dotnet/8/debian-11/prebuildfs/opt/bitnami/base/functions @@ -0,0 +1,122 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +[[ ${BASH_DEBUG:-false} = true ]] && set -x + +# Constants +MODULE="$(basename "$0")" +BITNAMI_PREFIX=/opt/bitnami + +# Color Palette +RESET='\033[0m' +BOLD='\033[1m' + +## Foreground +BLACK='\033[38;5;0m' +RED='\033[38;5;1m' +GREEN='\033[38;5;2m' +YELLOW='\033[38;5;3m' +BLUE='\033[38;5;4m' +MAGENTA='\033[38;5;5m' +CYAN='\033[38;5;6m' +WHITE='\033[38;5;7m' + +## Background +ON_BLACK='\033[48;5;0m' +ON_RED='\033[48;5;1m' +ON_GREEN='\033[48;5;2m' +ON_YELLOW='\033[48;5;3m' +ON_BLUE='\033[48;5;4m' +ON_MAGENTA='\033[48;5;5m' +ON_CYAN='\033[48;5;6m' +ON_WHITE='\033[48;5;7m' + +# Functions + +######################## +# Print to STDERR +# Arguments: +# Message to print +# Returns: +# None +######################### +stderr_print() { + printf "%b\\n" "${*}" >&2 +} + +######################## +# Log message +# Arguments: +# Message to log +# Returns: +# None +######################### +log() { + stderr_print "${NAMI_DEBUG:+${CYAN}${MODULE:-} ${MAGENTA}$(date "+%T.%2N ")}${RESET}${*}" +} +######################## +# Log an 'info' message +# Arguments: +# Message to log +# Returns: +# None +######################### +info() { + log "${GREEN}INFO ${RESET} ==> ${*}" +} +######################## +# Log message +# Arguments: +# Message to log +# Returns: +# None +######################### +warn() { + log "${YELLOW}WARN ${RESET} ==> ${*}" +} +######################## +# Log an 'error' message +# Arguments: +# Message to log +# Returns: +# None +######################### +error() { + log "${RED}ERROR${RESET} ==> ${*}" +} +######################## +# Print the welcome page +# Globals: +# DISABLE_WELCOME_MESSAGE +# BITNAMI_APP_NAME +# Arguments: +# None +# Returns: +# None +######################### +print_welcome_page() { + if [[ -z "${DISABLE_WELCOME_MESSAGE:-}" ]]; then + if [[ -n "$BITNAMI_APP_NAME" ]]; then + print_image_welcome_page + fi + fi +} +######################## +# Print the welcome page for a Bitnami Docker image +# Globals: +# BITNAMI_APP_NAME +# Arguments: +# None +# Returns: +# None +######################### +print_image_welcome_page() { + local github_url="https://github.com/bitnami/containers" + + log "" + log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + log "" +} diff --git a/bitnami/dotnet/8/debian-11/prebuildfs/opt/bitnami/base/helpers b/bitnami/dotnet/8/debian-11/prebuildfs/opt/bitnami/base/helpers new file mode 100644 index 0000000000000..387769aabbf3a --- /dev/null +++ b/bitnami/dotnet/8/debian-11/prebuildfs/opt/bitnami/base/helpers @@ -0,0 +1,42 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +. /opt/bitnami/base/functions + +######################## +# Helper function to initialize a single nami module +# Arguments: +# Module to initialize +# Returns: +# None +# Description: +# Initialize an unpacked nami module with the `nami initialize` command. +# Command arguments can be specified as function argumnts after the module name. +# `--log-level trace` flag is added to the command if `NAMI_DEBUG` env variable exists. +# The log level can be overridden using the `NAMI_LOG_LEVEL` env variable. +######################### +nami_initialize_one() { + local module="${1:?module not specified}" + if nami inspect $module | grep -q '"lifecycle": "unpacked"'; then + local inputs= + if [[ -f "/${module}-inputs.json" ]]; then + inputs="--inputs-file=/${module}-inputs.json" + fi + nami ${NAMI_DEBUG:+--log-level ${NAMI_LOG_LEVEL:-trace}} initialize $module $inputs "${@:2}" + fi +} + +######################## +# Helper function to initialize one or more nami modules +# Arguments: +# Module to initialize +# Returns: +# None +######################### +nami_initialize() { + local module="${1:?module not specified}" + for module in "${@}"; do + nami_initialize_one $module + done +} diff --git a/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/dotnet/8/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt similarity index 100% rename from bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt rename to bitnami/dotnet/8/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt diff --git a/bitnami/mxnet/1/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/dotnet/8/debian-11/prebuildfs/usr/sbin/install_packages similarity index 100% rename from bitnami/mxnet/1/debian-11/prebuildfs/usr/sbin/install_packages rename to bitnami/dotnet/8/debian-11/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/dotnet/8/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/dotnet/8/debian-11/prebuildfs/usr/sbin/run-script new file mode 100755 index 0000000000000..b7a5bf1e50bff --- /dev/null +++ b/bitnami/dotnet/8/debian-11/prebuildfs/usr/sbin/run-script @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -u + +if [ $# -eq 0 ]; then + >&2 echo "No arguments provided" + exit 1 +fi + +script=$1 +exit_code="${2:-96}" +fail_if_not_present="${3:-y}" + +if test -f "$script"; then + sh $script + + if [ $? -ne 0 ]; then + exit $((exit_code)) + fi +elif [ "$fail_if_not_present" = "y" ]; then + >&2 echo "script not found: $script" + exit 127 +fi diff --git a/bitnami/dotnet/8/debian-11/rootfs/opt/bitnami/scripts/dotnet/entrypoint.sh b/bitnami/dotnet/8/debian-11/rootfs/opt/bitnami/scripts/dotnet/entrypoint.sh new file mode 100755 index 0000000000000..eef346858223f --- /dev/null +++ b/bitnami/dotnet/8/debian-11/rootfs/opt/bitnami/scripts/dotnet/entrypoint.sh @@ -0,0 +1,12 @@ +#!/bin/bash -e +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +# shellcheck disable=SC1091 + +. /opt/bitnami/base/functions +. /opt/bitnami/base/helpers + +print_welcome_page + +exec "$@" diff --git a/bitnami/dotnet/8/debian-11/rootfs/opt/bitnami/scripts/dotnet/postunpack.sh b/bitnami/dotnet/8/debian-11/rootfs/opt/bitnami/scripts/dotnet/postunpack.sh new file mode 100755 index 0000000000000..24cac1c50af76 --- /dev/null +++ b/bitnami/dotnet/8/debian-11/rootfs/opt/bitnami/scripts/dotnet/postunpack.sh @@ -0,0 +1,13 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purpose +mkdir /app +chmod g+rwx /app +setcap CAP_NET_BIND_SERVICE=+eip /opt/bitnami/dotnet/bin/dotnet diff --git a/bitnami/dotnet/8/debian-11/tags-info.yaml b/bitnami/dotnet/8/debian-11/tags-info.yaml new file mode 100644 index 0000000000000..965524a7a1b10 --- /dev/null +++ b/bitnami/dotnet/8/debian-11/tags-info.yaml @@ -0,0 +1,5 @@ +rolling-tags: +- "8" +- 8-debian-11 +- 8.0.0 +- latest diff --git a/bitnami/dotnet/README.md b/bitnami/dotnet/README.md index c9e22ad5019e2..e973808427d85 100644 --- a/bitnami/dotnet/README.md +++ b/bitnami/dotnet/README.md @@ -1,4 +1,4 @@ -# .NET packaged by Bitnami +# Bitnami package for .NET ## What is .NET? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/dotnet/docker-compose.yml b/bitnami/dotnet/docker-compose.yml index 79cccee478c20..2b622cb7be16c 100644 --- a/bitnami/dotnet/docker-compose.yml +++ b/bitnami/dotnet/docker-compose.yml @@ -4,7 +4,7 @@ version: '2' services: dotnet: - image: docker.io/bitnami/dotnet:7 + image: docker.io/bitnami/dotnet:8 command: ["tail", "-f", "/dev/null"] # To keep the container running volumes: - dotnet_data:/app diff --git a/bitnami/drupal-nginx/10/debian-11/Dockerfile b/bitnami/drupal-nginx/10/debian-11/Dockerfile index bbcb5d230b0ee..48a01310e4c0c 100644 --- a/bitnami/drupal-nginx/10/debian-11/Dockerfile +++ b/bitnami/drupal-nginx/10/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T18:55:42Z" \ + org.opencontainers.image.created="2023-12-08T01:11:09Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.1.5-debian-11-r3" \ + org.opencontainers.image.ref.name="10.1.7-debian-11-r0" \ org.opencontainers.image.title="drupal-nginx" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="10.1.5" + org.opencontainers.image.version="10.1.7" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,24 +21,24 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gnupg libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libgeoip1 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps unzip zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.2.11-3-linux-${OS_ARCH}-debian-11" \ - "nginx-1.25.2-7-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.11.5-1-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "drupal-10.1.5-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "php-8.2.13-8-linux-${OS_ARCH}-debian-11" \ + "nginx-1.25.3-1-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.11.6-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "drupal-10.1.7-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -51,7 +51,7 @@ RUN /opt/bitnami/scripts/php/postunpack.sh RUN /opt/bitnami/scripts/nginx-php-fpm/postunpack.sh RUN /opt/bitnami/scripts/drupal/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh -ENV APP_VERSION="10.1.5" \ +ENV APP_VERSION="10.1.7" \ BITNAMI_APP_NAME="drupal-nginx" \ NGINX_HTTPS_PORT_NUMBER="" \ NGINX_HTTP_PORT_NUMBER="" \ diff --git a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8a7e0ec11b216..d683e8414001f 100644 --- a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,30 +3,30 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.1.5-0" + "version": "10.1.7-0" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.11.5-1" + "version": "10.11.6-0" }, "nginx": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.25.2-7" + "version": "1.25.3-1" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.11-3" + "version": "8.2.13-8" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" } } \ No newline at end of file diff --git a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/drupal-nginx/10/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/drupal-nginx/10/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/drupal-nginx/10/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/drupal-nginx/10/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/drupal-nginx/10/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf b/bitnami/drupal-nginx/10/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf index 6c2b5b1ba288f..aaf0428032c41 100644 --- a/bitnami/drupal-nginx/10/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf +++ b/bitnami/drupal-nginx/10/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf @@ -33,7 +33,7 @@ http { gzip_proxied any; gzip_types text/plain text/css application/javascript text/xml application/xml+rss; keepalive_timeout 65; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; + ssl_protocols TLSv1.2 TLSv1.3; ssl_ciphers HIGH:!aNULL:!MD5; client_max_body_size 80M; server_tokens off; diff --git a/bitnami/drupal-nginx/10/debian-11/tags-info.yaml b/bitnami/drupal-nginx/10/debian-11/tags-info.yaml index 0e576b3479e26..df1b2afa5a69d 100644 --- a/bitnami/drupal-nginx/10/debian-11/tags-info.yaml +++ b/bitnami/drupal-nginx/10/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "10" - 10-debian-11 -- 10.1.5 +- 10.1.7 - latest diff --git a/bitnami/drupal-nginx/9/debian-11/Dockerfile b/bitnami/drupal-nginx/9/debian-11/Dockerfile deleted file mode 100644 index b79ba4f14d9ee..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/Dockerfile +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -FROM docker.io/bitnami/minideb:bullseye - -ARG TARGETARCH - -LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ - org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:34:45Z" \ - org.opencontainers.image.description="Application packaged by VMware, Inc" \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="9.5.11-debian-11-r12" \ - org.opencontainers.image.title="drupal-nginx" \ - org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="9.5.11" - -ENV HOME="/" \ - OS_ARCH="${TARGETARCH:-amd64}" \ - OS_FLAVOUR="debian-11" \ - OS_NAME="linux" - -COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] -# Install required system packages and dependencies -RUN install_packages acl ca-certificates curl gnupg libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libgeoip1 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps unzip zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - COMPONENTS=( \ - "php-8.1.24-3-linux-${OS_ARCH}-debian-11" \ - "nginx-1.25.2-7-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.11.5-1-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "drupal-9.5.11-1-linux-${OS_ARCH}-debian-11" \ - ) && \ - for COMPONENT in "${COMPONENTS[@]}"; do \ - if [ ! -f "${COMPONENT}.tar.gz" ]; then \ - curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ - curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ - done -RUN apt-get update && apt-get upgrade -y && \ - apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives -RUN chmod g+rwX /opt/bitnami - -COPY rootfs / -RUN /opt/bitnami/scripts/nginx/postunpack.sh -RUN /opt/bitnami/scripts/php/postunpack.sh -RUN /opt/bitnami/scripts/nginx-php-fpm/postunpack.sh -RUN /opt/bitnami/scripts/drupal/postunpack.sh -RUN /opt/bitnami/scripts/mysql-client/postunpack.sh -ENV APP_VERSION="9.5.11" \ - BITNAMI_APP_NAME="drupal-nginx" \ - NGINX_HTTPS_PORT_NUMBER="" \ - NGINX_HTTP_PORT_NUMBER="" \ - PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/nginx/sbin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/drupal/vendor/bin:$PATH" - -EXPOSE 8080 8443 - -USER 1001 -ENTRYPOINT [ "/opt/bitnami/scripts/drupal/entrypoint.sh" ] -CMD [ "/opt/bitnami/scripts/nginx-php-fpm/run.sh" ] diff --git a/bitnami/drupal-nginx/9/debian-11/docker-compose.yml b/bitnami/drupal-nginx/9/debian-11/docker-compose.yml deleted file mode 100644 index febd525a62e6f..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/docker-compose.yml +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -version: '2' -services: - mariadb: - image: docker.io/bitnami/mariadb:11.1 - environment: - # ALLOW_EMPTY_PASSWORD is recommended only for development. - - ALLOW_EMPTY_PASSWORD=yes - - MARIADB_USER=bn_drupal - - MARIADB_DATABASE=bitnami_drupal - volumes: - - 'mariadb_data:/bitnami/mariadb' - drupal: - image: docker.io/bitnami/drupal-nginx:9 - ports: - - '80:8080' - - '443:8443' - environment: - - DRUPAL_DATABASE_HOST=mariadb - - DRUPAL_DATABASE_PORT_NUMBER=3306 - - DRUPAL_DATABASE_USER=bn_drupal - - DRUPAL_DATABASE_NAME=bitnami_drupal - # ALLOW_EMPTY_PASSWORD is recommended only for development. - - ALLOW_EMPTY_PASSWORD=yes - volumes: - - 'drupal_data:/bitnami/drupal' - depends_on: - - mariadb -volumes: - mariadb_data: - driver: local - drupal_data: - driver: local diff --git a/bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json deleted file mode 100644 index a01bae72734a0..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "drupal": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "9.5.11-1" - }, - "mysql-client": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "10.11.5-1" - }, - "nginx": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "1.25.2-7" - }, - "php": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "8.1.24-3" - }, - "render-template": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "1.0.6-2" - } -} \ No newline at end of file diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/nginx/conf/bitnami/protect-hidden-files.conf b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/nginx/conf/bitnami/protect-hidden-files.conf deleted file mode 100644 index 2ddab8c9a1e04..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/nginx/conf/bitnami/protect-hidden-files.conf +++ /dev/null @@ -1,4 +0,0 @@ -# Deny all attempts to access hidden files such as .htaccess or .htpasswd -location ~ /\. { - deny all; -} diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf deleted file mode 100644 index 6c2b5b1ba288f..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf +++ /dev/null @@ -1,60 +0,0 @@ -# Based on https://www.nginx.com/resources/wiki/start/topics/examples/full/#nginx-conf -user www www; ## Default: nobody - -worker_processes auto; -error_log "/opt/bitnami/nginx/logs/error.log"; -pid "/opt/bitnami/nginx/tmp/nginx.pid"; - -events { - worker_connections 1024; -} - -http { - include mime.types; - default_type application/octet-stream; - log_format main '$remote_addr - $remote_user [$time_local] ' - '"$request" $status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - access_log "/opt/bitnami/nginx/logs/access.log" main; - add_header X-Frame-Options SAMEORIGIN; - - client_body_temp_path "/opt/bitnami/nginx/tmp/client_body" 1 2; - proxy_temp_path "/opt/bitnami/nginx/tmp/proxy" 1 2; - fastcgi_temp_path "/opt/bitnami/nginx/tmp/fastcgi" 1 2; - scgi_temp_path "/opt/bitnami/nginx/tmp/scgi" 1 2; - uwsgi_temp_path "/opt/bitnami/nginx/tmp/uwsgi" 1 2; - - sendfile on; - tcp_nopush on; - tcp_nodelay off; - gzip on; - gzip_http_version 1.0; - gzip_comp_level 2; - gzip_proxied any; - gzip_types text/plain text/css application/javascript text/xml application/xml+rss; - keepalive_timeout 65; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; - ssl_ciphers HIGH:!aNULL:!MD5; - client_max_body_size 80M; - server_tokens off; - - absolute_redirect off; - port_in_redirect off; - - include "/opt/bitnami/nginx/conf/server_blocks/*.conf"; - - # HTTP Server - server { - # Port to listen on, can also be set in IP:PORT format - listen 80; - - include "/opt/bitnami/nginx/conf/bitnami/*.conf"; - - location /status { - stub_status on; - access_log off; - allow 127.0.0.1; - deny all; - } - } -} diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/drupal-env.sh b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/drupal-env.sh deleted file mode 100644 index d5ba3ac86026d..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/drupal-env.sh +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Environment configuration for drupal - -# The values for all environment variables will be set in the below order of precedence -# 1. Custom environment variables defined below after Bitnami defaults -# 2. Constants defined in this file (environment variables with no default), i.e. BITNAMI_ROOT_DIR -# 3. Environment variables overridden via external files using *_FILE variables (see below) -# 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata) - -# Load logging library -# shellcheck disable=SC1090,SC1091 -. /opt/bitnami/scripts/liblog.sh - -export BITNAMI_ROOT_DIR="/opt/bitnami" -export BITNAMI_VOLUME_DIR="/bitnami" - -# Logging configuration -export MODULE="${MODULE:-drupal}" -export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}" - -# By setting an environment variable matching *_FILE to a file path, the prefixed environment -# variable will be overridden with the value specified in that file -drupal_env_vars=( - DRUPAL_DATA_TO_PERSIST - DRUPAL_PROFILE - DRUPAL_SITE_NAME - DRUPAL_SKIP_BOOTSTRAP - DRUPAL_ENABLE_MODULES - DRUPAL_CONFIG_SYNC_DIR - DRUPAL_HASH_SALT - DRUPAL_USERNAME - DRUPAL_PASSWORD - DRUPAL_EMAIL - DRUPAL_SMTP_HOST - DRUPAL_SMTP_PORT_NUMBER - DRUPAL_SMTP_USER - DRUPAL_SMTP_PASSWORD - DRUPAL_SMTP_PROTOCOL - DRUPAL_DATABASE_HOST - DRUPAL_DATABASE_PORT_NUMBER - DRUPAL_DATABASE_NAME - DRUPAL_DATABASE_USER - DRUPAL_DATABASE_PASSWORD - DRUPAL_DATABASE_TLS_CA_FILE - SMTP_HOST - SMTP_PORT - DRUPAL_SMTP_PORT - SMTP_USER - SMTP_PASSWORD - SMTP_PROTOCOL - MARIADB_HOST - MARIADB_PORT_NUMBER -) -for env_var in "${drupal_env_vars[@]}"; do - file_env_var="${env_var}_FILE" - if [[ -n "${!file_env_var:-}" ]]; then - if [[ -r "${!file_env_var:-}" ]]; then - export "${env_var}=$(< "${!file_env_var}")" - unset "${file_env_var}" - else - warn "Skipping export of '${env_var}'. '${!file_env_var:-}' is not readable." - fi - fi -done -unset drupal_env_vars - -# Paths -export DRUPAL_BASE_DIR="${BITNAMI_ROOT_DIR}/drupal" -export DRUPAL_CONF_FILE="${DRUPAL_BASE_DIR}/sites/default/settings.php" -export DRUPAL_MODULES_DIR="${DRUPAL_BASE_DIR}/modules" - -# Drupal persistence configuration -export DRUPAL_VOLUME_DIR="${BITNAMI_VOLUME_DIR}/drupal" -export DRUPAL_MOUNTED_CONF_FILE="${DRUPAL_VOLUME_DIR}/settings.php" -export DRUPAL_DATA_TO_PERSIST="${DRUPAL_DATA_TO_PERSIST:-sites/ themes/ modules/ profiles/}" - -# Drupal configuration -export DRUPAL_PROFILE="${DRUPAL_PROFILE:-standard}" # only used during the first initialization -export DRUPAL_SITE_NAME="${DRUPAL_SITE_NAME:-My blog}" # only used during the first initialization -export DRUPAL_SKIP_BOOTSTRAP="${DRUPAL_SKIP_BOOTSTRAP:-}" # only used during the first initialization -export DRUPAL_ENABLE_MODULES="${DRUPAL_ENABLE_MODULES:-}" # only used during the first initialization -export DRUPAL_CONFIG_SYNC_DIR="${DRUPAL_CONFIG_SYNC_DIR:-}" # only used during the first initialization -export DRUPAL_HASH_SALT="${DRUPAL_HASH_SALT:-}" # only used during the first initialization - -# Drupal credentials -export DRUPAL_USERNAME="${DRUPAL_USERNAME:-user}" # only used during the first initialization -export DRUPAL_PASSWORD="${DRUPAL_PASSWORD:-bitnami}" # only used during the first initialization -export DRUPAL_EMAIL="${DRUPAL_EMAIL:-user@example.com}" # only used during the first initialization - -# Drupal SMTP credentials -DRUPAL_SMTP_HOST="${DRUPAL_SMTP_HOST:-"${SMTP_HOST:-}"}" -export DRUPAL_SMTP_HOST="${DRUPAL_SMTP_HOST:-}" # only used during the first initialization -DRUPAL_SMTP_PORT_NUMBER="${DRUPAL_SMTP_PORT_NUMBER:-"${SMTP_PORT:-}"}" -DRUPAL_SMTP_PORT_NUMBER="${DRUPAL_SMTP_PORT_NUMBER:-"${DRUPAL_SMTP_PORT:-}"}" -export DRUPAL_SMTP_PORT_NUMBER="${DRUPAL_SMTP_PORT_NUMBER:-25}" # only used during the first initialization -DRUPAL_SMTP_USER="${DRUPAL_SMTP_USER:-"${SMTP_USER:-}"}" -export DRUPAL_SMTP_USER="${DRUPAL_SMTP_USER:-}" # only used during the first initialization -DRUPAL_SMTP_PASSWORD="${DRUPAL_SMTP_PASSWORD:-"${SMTP_PASSWORD:-}"}" -export DRUPAL_SMTP_PASSWORD="${DRUPAL_SMTP_PASSWORD:-}" # only used during the first initialization -DRUPAL_SMTP_PROTOCOL="${DRUPAL_SMTP_PROTOCOL:-"${SMTP_PROTOCOL:-}"}" -export DRUPAL_SMTP_PROTOCOL="${DRUPAL_SMTP_PROTOCOL:-standard}" # only used during the first initialization - -# Database configuration -export DRUPAL_DEFAULT_DATABASE_HOST="mariadb" # only used at build time -DRUPAL_DATABASE_HOST="${DRUPAL_DATABASE_HOST:-"${MARIADB_HOST:-}"}" -export DRUPAL_DATABASE_HOST="${DRUPAL_DATABASE_HOST:-$DRUPAL_DEFAULT_DATABASE_HOST}" # only used during the first initialization -DRUPAL_DATABASE_PORT_NUMBER="${DRUPAL_DATABASE_PORT_NUMBER:-"${MARIADB_PORT_NUMBER:-}"}" -export DRUPAL_DATABASE_PORT_NUMBER="${DRUPAL_DATABASE_PORT_NUMBER:-3306}" # only used during the first initialization -export DRUPAL_DATABASE_NAME="${DRUPAL_DATABASE_NAME:-bitnami_drupal}" # only used during the first initialization -export DRUPAL_DATABASE_USER="${DRUPAL_DATABASE_USER:-bn_drupal}" # only used during the first initialization -export DRUPAL_DATABASE_PASSWORD="${DRUPAL_DATABASE_PASSWORD:-}" # only used during the first initialization -export DRUPAL_DATABASE_TLS_CA_FILE="${DRUPAL_DATABASE_TLS_CA_FILE:-}" # only used during the first initialization - -# PHP configuration -export PHP_DEFAULT_MEMORY_LIMIT="256M" # only used at build time - -# Custom environment variables may be defined below diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/drupal/postunpack.sh b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/drupal/postunpack.sh deleted file mode 100755 index f20ef95c82f4d..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/drupal/postunpack.sh +++ /dev/null @@ -1,129 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1090,SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load Drupal environment -. /opt/bitnami/scripts/drupal-env.sh - -# Load PHP environment for 'php_conf_set' (after 'drupal-env.sh' so that MODULE is not set to a wrong value) -. /opt/bitnami/scripts/php-env.sh - -# Load libraries -. /opt/bitnami/scripts/libdrupal.sh -. /opt/bitnami/scripts/libfile.sh -. /opt/bitnami/scripts/libfs.sh -. /opt/bitnami/scripts/liblog.sh -. /opt/bitnami/scripts/libphp.sh -. /opt/bitnami/scripts/libwebserver.sh - -# Load web server environment and functions (after Drupal environment file so MODULE is not set to a wrong value) -. "/opt/bitnami/scripts/$(web_server_type)-env.sh" - -# Enable Drupal configuration file -[[ ! -f "$DRUPAL_CONF_FILE" ]] && cp "${DRUPAL_BASE_DIR}/sites/default/default.settings.php" "$DRUPAL_CONF_FILE" - -# Create .htaccess file to avoid warning in Drupal administration panel -drupal_fix_htaccess_warning_protection - -# Ensure the Drupal base directory exists and has proper permissions -info "Configuring file permissions for Drupal" -for dir in "$DRUPAL_BASE_DIR" "${DRUPAL_BASE_DIR}/sites/default/files" "$DRUPAL_VOLUME_DIR" "${HOME}/.drush"; do - ensure_dir_exists "$dir" - configure_permissions_ownership "$dir" -d "775" -f "664" -done -for dir in "${DRUPAL_BASE_DIR}/themes" "${DRUPAL_BASE_DIR}/modules" "${DRUPAL_BASE_DIR}/sites/default/files"; do - ensure_dir_exists "$dir" - configure_permissions_ownership "$dir" -u "$WEB_SERVER_DAEMON_USER" -g "root" -done -chown "$WEB_SERVER_DAEMON_USER" "${DRUPAL_BASE_DIR}/sites/default" -chown "$WEB_SERVER_DAEMON_USER" "$DRUPAL_CONF_FILE" -for script in "${DRUPAL_BASE_DIR}/vendor/bin/drush" "${DRUPAL_BASE_DIR}/vendor/drush/drush/drush" "${DRUPAL_BASE_DIR}/vendor/drush/drush/drush.launcher" "${DRUPAL_BASE_DIR}/vendor/bin/drush.launcher"; do - [[ -f "$script" ]] && chmod +x "$script" -done - -# Configure Drupal based on build-time defaults -drupal_conf_set "\$settings['trusted_host_patterns']" "array('^.*$')" yes - -# Configure required PHP options for application to work properly, based on build-time defaults -info "Configuring default PHP options for Drupal" -php_conf_set memory_limit "$PHP_DEFAULT_MEMORY_LIMIT" - -# Enable default web server configuration for Drupal -info "Creating default web server configuration for Drupal" -web_server_validate -ensure_web_server_app_configuration_exists "drupal" \ - --type php \ - --nginx-additional-configuration $' -location = /favicon.ico { - log_not_found off; - access_log off; -} - -location = /robots.txt { - allow all; - log_not_found off; - access_log off; -} - -location ~ ^/sites/.*/private/ { - return 403; -} - -# Block access to scripts in site files directory -location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; -} - -# Allow "Well-Known URIs" as per RFC 5785 -location ~* ^/.well-known/ { - allow all; -} - -location / { - try_files $uri /index.php?$query_string; -} - -location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; -} - -# Don\'t allow direct access to PHP files in the vendor directory. -location ~ /vendor/.*\.php$ { - deny all; - return 404; -} - -# Fighting with Styles? This little gem is amazing. -location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; -} - -# Handle private files through Drupal. Private file\'s path can come -# with a language prefix. -location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; -} - -location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; -}' - -# Fix common issues running Drupal on top of the NGINX web server, if enabled -# See: https://pantheon.io/blog/update-your-nginx-config-drupal-8 -nginx_php_fpm_conf_file="${BITNAMI_ROOT_DIR}/nginx/conf/bitnami/php-fpm.conf" -if [[ -f "$nginx_php_fpm_conf_file" ]]; then - replace_in_file "$nginx_php_fpm_conf_file" '^(\s*)(fastcgi_index\s+index\.php;)$' '\1\2\n\1fastcgi_split_path_info ^(.+?\.php)(|/.*)$;' - replace_in_file "$nginx_php_fpm_conf_file" '(\s\\.php\$)(\s)' '\1|^/update.php\2' -fi - -# Re-create .htaccess file after being moved into 'apache/conf/vhosts/htaccess' directory, to avoid Drupal warning -drupal_fix_htaccess_warning_protection diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/drupal/setup.sh b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/drupal/setup.sh deleted file mode 100755 index 270c64aaafc86..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/drupal/setup.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1090,SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load Drupal environment -. /opt/bitnami/scripts/drupal-env.sh - -# Load MySQL Client environment for 'mysql_remote_execute' (after 'drupal-env.sh' so that MODULE is not set to a wrong value) -if [[ -f /opt/bitnami/scripts/mysql-client-env.sh ]]; then - . /opt/bitnami/scripts/mysql-client-env.sh -elif [[ -f /opt/bitnami/scripts/mysql-env.sh ]]; then - . /opt/bitnami/scripts/mysql-env.sh -elif [[ -f /opt/bitnami/scripts/mariadb-env.sh ]]; then - . /opt/bitnami/scripts/mariadb-env.sh -fi - -# Load libraries -. /opt/bitnami/scripts/libdrupal.sh -. /opt/bitnami/scripts/libwebserver.sh - -# Load web server environment and functions (after Drupal environment file so MODULE is not set to a wrong value) -. "/opt/bitnami/scripts/$(web_server_type)-env.sh" - -# Ensure Drupal environment variables are valid -drupal_validate - -# Update web server configuration with runtime environment (needs to happen before the initialization) -web_server_update_app_configuration "drupal" - -# Ensure Drupal is initialized -drupal_initialize diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/libdrupal.sh b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/libdrupal.sh deleted file mode 100644 index 2ee0d89de4ed5..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/libdrupal.sh +++ /dev/null @@ -1,543 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Bitnami Drupal library - -# shellcheck disable=SC1091 - -# Load Generic Libraries -. /opt/bitnami/scripts/libphp.sh -. /opt/bitnami/scripts/libfs.sh -. /opt/bitnami/scripts/libos.sh -. /opt/bitnami/scripts/libnet.sh -. /opt/bitnami/scripts/libvalidations.sh -. /opt/bitnami/scripts/libversion.sh -. /opt/bitnami/scripts/libpersistence.sh -. /opt/bitnami/scripts/libwebserver.sh - -# Load database library -if [[ -f /opt/bitnami/scripts/libmysqlclient.sh ]]; then - . /opt/bitnami/scripts/libmysqlclient.sh -elif [[ -f /opt/bitnami/scripts/libmysql.sh ]]; then - . /opt/bitnami/scripts/libmysql.sh -elif [[ -f /opt/bitnami/scripts/libmariadb.sh ]]; then - . /opt/bitnami/scripts/libmariadb.sh -fi - -######################## -# Validate settings in DRUPAL_* env vars -# Globals: -# DRUPAL_* -# Arguments: -# None -# Returns: -# 0 if the validation succeeded, 1 otherwise -######################### -drupal_validate() { - debug "Validating settings in DRUPAL_* environment variables..." - local error_code=0 - - # Auxiliary functions - print_validation_error() { - error "$1" - error_code=1 - } - - check_multi_value() { - if [[ " ${2} " != *" ${!1} "* ]]; then - print_validation_error "The allowed values for ${1} are: ${2}" - fi - } - - check_yes_no_value() { - if ! is_yes_no_value "${!1}" && ! is_true_false_value "${!1}"; then - print_validation_error "The allowed values for ${1} are: yes no" - fi - } - - check_resolved_hostname() { - if ! is_hostname_resolved "$1"; then - warn "Hostname $1 could not be resolved. This could lead to connection issues" - fi - } - - check_mounted_file() { - if [[ -n "${!1:-}" ]] && ! [[ -f "${!1:-}" ]]; then - print_validation_error "The variable ${1} is defined but the file ${!1} is not accessible or does not exist" - fi - } - check_valid_port() { - local port_var="${1:?missing port variable}" - local err - if ! err="$(validate_port "${!port_var}")"; then - print_validation_error "An invalid port was specified in the environment variable ${port_var}: ${err}." - fi - } - - # Warn users in case the configuration file is not writable - is_file_writable "$DRUPAL_CONF_FILE" || warn "The Drupal configuration file '${DRUPAL_CONF_FILE}' is not writable. Configurations based on environment variables will not be applied for this file." - - # Validate user inputs - ! is_empty_value "$DRUPAL_SKIP_BOOTSTRAP" && check_yes_no_value "DRUPAL_SKIP_BOOTSTRAP" - ! is_empty_value "$DRUPAL_DATABASE_PORT_NUMBER" && check_valid_port "DRUPAL_DATABASE_PORT_NUMBER" - ! is_empty_value "$DRUPAL_DATABASE_HOST" && check_resolved_hostname "$DRUPAL_DATABASE_HOST" - check_mounted_file "DRUPAL_DATABASE_TLS_CA_FILE" - - # Validate database credentials - if is_boolean_yes "$ALLOW_EMPTY_PASSWORD"; then - warn "You set the environment variable ALLOW_EMPTY_PASSWORD=${ALLOW_EMPTY_PASSWORD}. For safety reasons, do not use this flag in a production environment." - else - for empty_env_var in "DRUPAL_DATABASE_PASSWORD" "DRUPAL_PASSWORD"; do - is_empty_value "${!empty_env_var}" && print_validation_error "The ${empty_env_var} environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow a blank password. This is only recommended for development environments." - done - fi - - # Validate SMTP credentials - if ! is_empty_value "$DRUPAL_SMTP_HOST"; then - for empty_env_var in "DRUPAL_SMTP_USER" "DRUPAL_SMTP_PASSWORD"; do - is_empty_value "${!empty_env_var}" && warn "The ${empty_env_var} environment variable is empty or not set." - done - is_empty_value "$DRUPAL_SMTP_PORT_NUMBER" && print_validation_error "The DRUPAL_SMTP_PORT_NUMBER environment variable is empty or not set." - ! is_empty_value "$DRUPAL_SMTP_PORT_NUMBER" && check_valid_port "DRUPAL_SMTP_PORT_NUMBER" - ! is_empty_value "$DRUPAL_SMTP_PROTOCOL" && check_multi_value "DRUPAL_SMTP_PROTOCOL" "standard tls ssl" - fi - - # Check that the web server is properly set up - web_server_validate || print_validation_error "Web server validation failed" - - return "$error_code" -} - -######################## -# Ensure Drupal is initialized -# Globals: -# DRUPAL_* -# Arguments: -# None -# Returns: -# None -######################### -drupal_initialize() { - # Update Drupal configuration via mounted configuration files and environment variables - if is_file_writable "$DRUPAL_CONF_FILE"; then - # Enable mounted configuration files - if [[ -f "$DRUPAL_MOUNTED_CONF_FILE" ]]; then - info "Found mounted Drupal configuration file '${DRUPAL_MOUNTED_CONF_FILE}', copying to '${DRUPAL_CONF_FILE}'" - cp "$DRUPAL_MOUNTED_CONF_FILE" "$DRUPAL_CONF_FILE" - return - fi - fi - - # Check if Drupal has already been initialized and persisted in a previous run - local -r app_name="drupal" - if ! is_app_initialized "$app_name"; then - info "Trying to connect to the database server" - drupal_wait_for_db_connection "$DRUPAL_DATABASE_HOST" "$DRUPAL_DATABASE_PORT_NUMBER" "$DRUPAL_DATABASE_NAME" "$DRUPAL_DATABASE_USER" "$DRUPAL_DATABASE_PASSWORD" - - # Ensure the Drupal base directory exists and has proper permissions - info "Configuring file permissions for Drupal" - ensure_dir_exists "$DRUPAL_VOLUME_DIR" - # Use daemon:root ownership for compatibility when running as a non-root user - am_i_root && configure_permissions_ownership "$DRUPAL_VOLUME_DIR" -d "775" -f "664" -u "$WEB_SERVER_DAEMON_USER" -g "root" - - if ! is_boolean_yes "$DRUPAL_SKIP_BOOTSTRAP"; then - # Perform initial bootstrapping for Drupal - info "Installing Drupal site" - drupal_site_install - if ! is_empty_value "$DRUPAL_ENABLE_MODULES"; then - info "Enabling Drupal modules" - drupal_enable_modules - fi - if ! is_empty_value "$DRUPAL_SMTP_HOST"; then - info "Configuring SMTP" - drupal_configure_smtp - fi - info "Flushing Drupal cache" - drupal_flush_cache - else - info "An already initialized Drupal database was provided, configuration will be skipped" - if is_empty_value "$DRUPAL_DATABASE_TLS_CA_FILE"; then - drupal_set_database_settings - else - drupal_set_database_ssl_settings - fi - - # Drupal expects a directory for storing site configuration - # For more info see https://www.drupal.org/docs/configuration-management - drupal_create_config_directory - - # Drupal needs a hash value to build one-time login links, cancel links, form tokens, etc. - drupal_set_hash_salt - drupal_update_database - fi - - info "Persisting Drupal installation" - persist_app "$app_name" "$DRUPAL_DATA_TO_PERSIST" - else - info "Restoring persisted Drupal installation" - restore_persisted_app "$app_name" "$DRUPAL_DATA_TO_PERSIST" - info "Trying to connect to the database server" - db_host="$(drupal_database_conf_get 'host')" - db_port="$(drupal_database_conf_get 'port')" - db_name="$(drupal_database_conf_get 'database')" - db_user="$(drupal_database_conf_get 'username')" - db_pass="$(drupal_database_conf_get 'password')" - drupal_wait_for_db_connection "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" - drupal_update_database - fi - - # Avoid exit code of previous commands to affect the result of this function - true -} - -######################## -# Get a database entry from the Drupal configuration file (settings.php) -# Globals: -# DRUPAL_* -# Arguments: -# $1 - Key -# Returns: -# None -######################### -drupal_database_conf_get() { - local -r key="${1:?key missing}" - debug "Getting ${key} from Drupal database configuration" - grep -E "^\s*'${key}' =>" "$DRUPAL_CONF_FILE" | grep -E -o "=> '.*'" | cut -f2 -d\' -} - -######################## -# Add or modify an entry in the Drupal configuration file (settings.php) -# Globals: -# DRUPAL_* -# Arguments: -# $1 - PHP variable name -# $2 - Value to assign to the PHP variable -# $3 - Whether the value is a literal, or if instead it should be quoted (default: no) -# Returns: -# None -######################### -drupal_conf_set() { - local -r key="${1:?key missing}" - local -r value="${2:?value missing}" - local -r is_literal="${3:-no}" - debug "Setting ${key} to '${value}' in Drupal configuration (literal: ${is_literal})" - # Sanitize key (sed does not support fixed string substitutions) - local sanitized_pattern - sanitized_pattern="^(#\s*)?$(sed 's/[]\[^$.*/]/\\&/g' <<< "$key")\s*=.*" - local entry - is_boolean_yes "$is_literal" && entry="${key} = $value;" || entry="${key} = '$value';" - # Check if the configuration exists in the file - if grep -q -E "$sanitized_pattern" "$DRUPAL_CONF_FILE"; then - # It exists, so replace the line - replace_in_file "$DRUPAL_CONF_FILE" "$sanitized_pattern" "$entry" - else - echo "$entry" >> "$DRUPAL_CONF_FILE" - fi -} - -######################## -# Wait until the database is accessible with the currently-known credentials -# Globals: -# * -# Arguments: -# $1 - database host -# $2 - database port -# $3 - database name -# $4 - database username -# $5 - database user password (optional) -# Returns: -# true if the database connection succeeded, false otherwise -######################### -drupal_wait_for_db_connection() { - local -r db_host="${1:?missing database host}" - local -r db_port="${2:?missing database port}" - local -r db_name="${3:?missing database name}" - local -r db_user="${4:?missing database user}" - local -r db_pass="${5:-}" - check_mysql_connection() { - echo "SELECT 1" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" - } - if ! retry_while "check_mysql_connection"; then - error "Could not connect to the database" - return 1 - fi -} - -######################## -# Drupal Site Install -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -drupal_site_install() { - is_empty_value "$DRUPAL_DATABASE_TLS_CA_FILE" || drupal_set_database_ssl_settings - - ( - # Unfortunately there is no way to disable mail sending via sendmail when installing Drupal - # The "hack" consists of overriding the sendmail path to an executable that does nothing (i.e. "/bin/true") - # This is also what Drush is doing in their CI - PHP_OPTIONS="-d sendmail_path=$(which true)" - export PHP_OPTIONS - - drush_execute "site:install" \ - "--db-url=mysql://${DRUPAL_DATABASE_USER}:${DRUPAL_DATABASE_PASSWORD}@${DRUPAL_DATABASE_HOST}:${DRUPAL_DATABASE_PORT_NUMBER}/${DRUPAL_DATABASE_NAME}" \ - "--account-name=${DRUPAL_USERNAME}" \ - "--account-mail=${DRUPAL_EMAIL}" \ - "--account-pass=${DRUPAL_PASSWORD}" \ - "--site-name=${DRUPAL_SITE_NAME}" \ - "--site-mail=${DRUPAL_EMAIL}" \ - "-y" "$DRUPAL_PROFILE" - ) - - # When Drupal settings are patched to allow SSL database connections, the database settings block is duplicated - # after the installation with Drush - is_empty_value "$DRUPAL_DATABASE_TLS_CA_FILE" || drupal_remove_duplicated_database_settings - # Restrict permissions of the configuration file to keep the site secure - if am_i_root; then - configure_permissions_ownership "$DRUPAL_CONF_FILE" -u "root" -g "$WEB_SERVER_DAEMON_USER" -f "644" - fi -} - -######################## -# Create Drupal sync configuration directory (DRUPAL_SKIP_BOOTSTRAP only) -# Globals: -# DRUPAL_BASE_DIR -# Arguments: -# None -# Returns: -# None -######################### -drupal_create_config_directory() { - local config_sync_dir="${DRUPAL_CONFIG_SYNC_DIR:-}" - if is_empty_value "$config_sync_dir"; then - config_sync_dir="${DRUPAL_BASE_DIR}/sites/default/files/config_$(generate_random_string -t alphanumeric -c 16)" - fi - ensure_dir_exists "$config_sync_dir" - drupal_conf_set "\$settings['config_sync_directory']" "$config_sync_dir" -} - -######################## -# Create Drupal hash salt value (DRUPAL_SKIP_BOOTSTRAP only) -# Globals: -# DRUPAL_HASH_SALT -# Arguments: -# None -# Returns: -# None -######################### -drupal_set_hash_salt() { - local hash_salt="${DRUPAL_HASH_SALT:-}" - if is_empty_value "$hash_salt"; then - hash_salt="$(generate_random_string -t alphanumeric -c 32)" - fi - drupal_conf_set "\$settings['hash_salt']" "$hash_salt" -} - -######################## -# Execute Drush Tool -# Globals: -# * -# Arguments: -# $@ - Arguments to pass to the Drush tool -# Returns: -# None -######################### -drush_execute() { - if am_i_root; then - debug_execute run_as_user "$WEB_SERVER_DAEMON_USER" drush "--root=${DRUPAL_BASE_DIR}" "$@" - else - debug_execute drush "--root=${DRUPAL_BASE_DIR}" "$@" - fi -} - -######################## -# Execute Drush Tool to set a config option -# Globals: -# * -# Arguments: -# $1 - config group -# $2 - config key -# $3 - config value -# Returns: -# None -######################### -drush_config_set() { - local -r group="${1:?missing config group}" - local -r key="${2:?missing config key}" - local -r value="${3:-}" - - drush_execute "config-set" "--yes" "$group" "$key" "$value" -} - -######################## -# Drupal enable modules -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -drupal_enable_modules() { - local -a modules - read -r -a modules <<< "${DRUPAL_ENABLE_MODULES/,/ }" - [[ "${#modules[@]}" -gt 0 ]] || return 0 - drush_execute "pm:enable" "--yes" "${modules[@]}" -} - -######################## -# Drupal configure SMTP -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -drupal_configure_smtp() { - drush_execute "pm:enable" "--yes" "smtp" - - drush_config_set "system.mail" "interface.default" "SMTPMailSystem" - drush_config_set "smtp.settings" "smtp_on" "1" - drush_config_set "smtp.settings" "smtp_host" "$DRUPAL_SMTP_HOST" - drush_config_set "smtp.settings" "smtp_port" "$DRUPAL_SMTP_PORT_NUMBER" - drush_config_set "smtp.settings" "smtp_protocol" "$DRUPAL_SMTP_PROTOCOL" - drush_config_set "smtp.settings" "smtp_username" "$DRUPAL_SMTP_USER" - drush_config_set "smtp.settings" "smtp_password" "$DRUPAL_SMTP_PASSWORD" - drush_config_set "smtp.settings" "smtp_from" "$DRUPAL_EMAIL" - drush_config_set "smtp.settings" "smtp_fromname" "$DRUPAL_SITE_NAME" -} - -######################## -# Drupal flush cache -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -drupal_flush_cache() { - drush_execute "cache:rebuild" -} - -######################## -# Drupal update database -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -drupal_update_database() { - debug 'Upgrading Drupal database with drush...' - drush_execute "updatedb" -} - -######################## -# Drupal set database SSL settings -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -drupal_set_database_ssl_settings() { - cat >>"$DRUPAL_CONF_FILE" < '${DRUPAL_DATABASE_NAME}', - 'username' => '${DRUPAL_DATABASE_USER}', - 'password' => '${DRUPAL_DATABASE_PASSWORD}', - 'prefix' => '', - 'host' => '${DRUPAL_DATABASE_HOST}', - 'port' => '${DRUPAL_DATABASE_PORT_NUMBER}', - 'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql', - 'driver' => 'mysql', - 'pdo' => array ( - PDO::MYSQL_ATTR_SSL_CA => '${DRUPAL_DATABASE_TLS_CA_FILE}', - PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => 0 - ) -); -EOF -} - -######################## -# Drupal set database non-SSL settings (DRUPAL_SKIP_BOOTSTRAP only) -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -drupal_set_database_settings() { - cat >>"$DRUPAL_CONF_FILE" < '${DRUPAL_DATABASE_NAME}', - 'username' => '${DRUPAL_DATABASE_USER}', - 'password' => '${DRUPAL_DATABASE_PASSWORD}', - 'prefix' => '', - 'host' => '${DRUPAL_DATABASE_HOST}', - 'port' => '${DRUPAL_DATABASE_PORT_NUMBER}', - 'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql', - 'driver' => 'mysql', -); -EOF -} - -######################## -# Drupal remove duplicated database block from settings file -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -drupal_remove_duplicated_database_settings() { - local -r first_line_block=$'\$databases\[\'default\'\]\[\'default\'\] = array \($' - local -r last_line_block='\);' - - remove_in_file "$DRUPAL_CONF_FILE" "${first_line_block}/,/${last_line_block}" -} - -######################## -# Drupal fix htaccess warning protection. -# Drupal checks for the htaccess file to prevent malicious attacks -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -drupal_fix_htaccess_warning_protection() { - local -r files_dir="${DRUPAL_BASE_DIR}/sites/default/files/" - local -r htaccess_file="${files_dir}/.htaccess" - - ensure_dir_exists "$files_dir" - cat <"$htaccess_file" -# Recommended protections: https://www.drupal.org/forum/newsletters/security-advisories-for-drupal-core/2013-11-20/sa-core-2013-003-drupal-core - -# Turn off all options we don\'t need. -Options -Indexes -ExecCGI -Includes -MultiViews - -# Set the catch-all handler to prevent scripts from being executed. -SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006 - - # Override the handler again if we\'re run later in the evaluation list. - SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003 - - -# If we know how to do it safely, disable the PHP engine entirely. - - php_flag engine off - -EOF -} diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/libnginx.sh b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/libnginx.sh deleted file mode 100644 index 40f204ea4f7c7..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/libnginx.sh +++ /dev/null @@ -1,669 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Bitnami NGINX library - -# shellcheck disable=SC1090,SC1091 - -# Load Generic Libraries -. /opt/bitnami/scripts/libfs.sh -. /opt/bitnami/scripts/libfile.sh -. /opt/bitnami/scripts/liblog.sh -. /opt/bitnami/scripts/libos.sh -. /opt/bitnami/scripts/libservice.sh -. /opt/bitnami/scripts/libvalidations.sh - -# Functions - -######################## -# Check if NGINX is running -# Globals: -# NGINX_TMP_DIR -# Arguments: -# None -# Returns: -# Boolean -######################### -is_nginx_running() { - local pid - pid="$(get_pid_from_file "$NGINX_PID_FILE")" - if [[ -n "$pid" ]]; then - is_service_running "$pid" - else - false - fi -} - -######################## -# Check if NGINX is not running -# Globals: -# NGINX_TMP_DIR -# Arguments: -# None -# Returns: -# Boolean -######################### -is_nginx_not_running() { - ! is_nginx_running -} - -######################## -# Stop NGINX -# Globals: -# NGINX_TMP_DIR -# Arguments: -# None -# Returns: -# None -######################### -nginx_stop() { - ! is_nginx_running && return - debug "Stopping NGINX" - stop_service_using_pid "$NGINX_PID_FILE" -} - -######################## -# Configure NGINX server block port -# Globals: -# NGINX_CONF_DIR -# Arguments: -# $1 - Port number -# $2 - (optional) Path to server block file -# Returns: -# None -######################### -nginx_configure_port() { - local port=${1:?missing port} - local file=${2:-"$NGINX_CONF_FILE"} - if is_file_writable "$file"; then - local nginx_configuration - debug "Setting port number to ${port} in '${file}'" - # TODO: find an appropriate NGINX parser to avoid 'sed calls' - nginx_configuration="$(sed -E "s/(listen\s+)[0-9]{1,5}(.*);/\1${port}\2;/g" "$file")" - echo "$nginx_configuration" >"$file" - fi -} - -######################## -# Configure NGINX directives -# Globals: -# NGINX_CONF_DIR -# Arguments: -# $1 - Directive to modify -# $2 - Value -# $3 - (optional) Path to server block file -# Returns: -# None -######################### -nginx_configure() { - local directive=${1:?missing directive} - local value=${2:?missing value} - local file=${3:-"$NGINX_CONF_FILE"} - if is_file_writable "$file"; then - local nginx_configuration - debug "Setting directive '${directive}' to '${value}' in '${file}'" - nginx_configuration="$(sed -E "s/(\s*${directive}\s+)(.+);/\1${value};/g" "$file")" - echo "$nginx_configuration" >"$file" - fi -} - -######################## -# Validate settings in NGINX_* env vars -# Globals: -# NGINX_* -# Arguments: -# None -# Returns: -# None -######################### -nginx_validate() { - info "Validating settings in NGINX_* env vars" - local error_code=0 - # Auxiliary functions - print_validation_error() { - error "$1" - error_code=1 - } - check_yes_no_value() { - if ! is_yes_no_value "${!1}" && ! is_true_false_value "${!1}"; then - print_validation_error "The allowed values for ${1} are: yes no" - fi - } - check_valid_port() { - local port_var="${1:?missing port variable}" - local validate_port_args=() - local err - ! am_i_root && validate_port_args+=("-unprivileged") - if ! err="$(validate_port "${validate_port_args[@]}" "${!port_var}")"; then - print_validation_error "An invalid port was specified in the environment variable ${port_var}: ${err}." - fi - } - - ! is_empty_value "$NGINX_ENABLE_ABSOLUTE_REDIRECT" && check_yes_no_value "NGINX_ENABLE_ABSOLUTE_REDIRECT" - ! is_empty_value "$NGINX_ENABLE_PORT_IN_REDIRECT" && check_yes_no_value "NGINX_ENABLE_PORT_IN_REDIRECT" - - ! is_empty_value "$NGINX_HTTP_PORT_NUMBER" && check_valid_port "NGINX_HTTP_PORT_NUMBER" - ! is_empty_value "$NGINX_HTTPS_PORT_NUMBER" && check_valid_port "NGINX_HTTPS_PORT_NUMBER" - - if ! is_file_writable "$NGINX_CONF_FILE"; then - warn "The NGINX configuration file '${NGINX_CONF_FILE}' is not writable by current user. Configurations based on environment variables will not be applied." - fi - return "$error_code" -} - -######################## -# Initialize NGINX -# Globals: -# NGINX_* -# Arguments: -# None -# Returns: -# None -######################### -nginx_initialize() { - info "Initializing NGINX" - - # This fixes an issue where the trap would kill the entrypoint.sh, if a PID was left over from a previous run - # Exec replaces the process without creating a new one, and when the container is restarted it may have the same PID - rm -f "${NGINX_TMP_DIR}/nginx.pid" - - # Persisted configuration files from old versions - if [[ -f "$NGINX_VOLUME_DIR/conf/nginx.conf" ]]; then - error "A 'nginx.conf' file was found inside '${NGINX_VOLUME_DIR}/conf'. This configuration is not supported anymore. Please mount the configuration file at '${NGINX_CONF_FILE}' instead." - exit 1 - fi - if ! is_dir_empty "$NGINX_VOLUME_DIR/conf/vhosts"; then - error "Custom server blocks files were found inside '$NGINX_VOLUME_DIR/conf/vhosts'. This configuration is not supported anymore. Please mount your custom server blocks config files at '${NGINX_SERVER_BLOCKS_DIR}' instead." - exit 1 - fi - - debug "Updating NGINX configuration based on environment variables" - local nginx_user_configuration - if am_i_root; then - debug "Ensuring NGINX daemon user/group exists" - ensure_user_exists "$NGINX_DAEMON_USER" --group "$NGINX_DAEMON_GROUP" - if [[ -n "${NGINX_DAEMON_USER:-}" ]]; then - chown -R "${NGINX_DAEMON_USER:-}" "$NGINX_TMP_DIR" - fi - nginx_configure "user" "${NGINX_DAEMON_USER:-} ${NGINX_DAEMON_GROUP:-}" - else - # The "user" directive makes sense only if the master process runs with super-user privileges - # TODO: find an appropriate NGINX parser to avoid 'sed calls' - nginx_user_configuration="$(sed -E "s/(^user)/# \1/g" "$NGINX_CONF_FILE")" - is_file_writable "$NGINX_CONF_FILE" && echo "$nginx_user_configuration" >"$NGINX_CONF_FILE" - fi - # Configure HTTP port number - if [[ -n "${NGINX_HTTP_PORT_NUMBER:-}" ]]; then - nginx_configure_port "$NGINX_HTTP_PORT_NUMBER" - fi - # Configure HTTPS port number - if [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]] && [[ -f "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" ]]; then - nginx_configure_port "$NGINX_HTTPS_PORT_NUMBER" "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" - fi - nginx_configure "absolute_redirect" "$(is_boolean_yes "$NGINX_ENABLE_ABSOLUTE_REDIRECT" && echo "on" || echo "off" )" - nginx_configure "port_in_redirect" "$(is_boolean_yes "$NGINX_ENABLE_PORT_IN_REDIRECT" && echo "on" || echo "off" )" -} - -######################## -# Ensure an NGINX application configuration exists (in server block format) -# Globals: -# NGINX_* -# Arguments: -# $1 - App name -# Flags: -# --type - Application type, which has an effect on what configuration template will be used, allowed values: php, (empty) -# --hosts - Host listen addresses -# --server-name - Server name (if not specified, a catch-all server block will be created) -# --server-aliases - Server aliases -# --allow-remote-connections - Whether to allow remote connections or to require local connections -# --disable - Whether to render the app's server blocks with a .disabled prefix -# --disable-http - Whether to render the app's HTTP server block with a .disabled prefix -# --disable-https - Whether to render the app's HTTPS server block with a .disabled prefix -# --http-port - HTTP port number -# --https-port - HTTPS port number -# --additional-configuration - Additional server block configuration (no default) -# --external-configuration - Configuration external to server block (no default) -# --document-root - Path to document root directory -# Returns: -# true if the configuration was enabled, false otherwise -######################## -ensure_nginx_app_configuration_exists() { - export app="${1:?missing app}" - # Default options - local type="" - local -a hosts=() - local server_name - local -a server_aliases=() - local allow_remote_connections="yes" - local disable="no" - local disable_http="no" - local disable_https="no" - # Template variables defaults - export additional_configuration="" - export external_configuration="" - export document_root="${BITNAMI_ROOT_DIR}/${app}" - export http_port="${NGINX_HTTP_PORT_NUMBER:-"$NGINX_DEFAULT_HTTP_PORT_NUMBER"}" - export https_port="${NGINX_HTTPS_PORT_NUMBER:-"$NGINX_DEFAULT_HTTPS_PORT_NUMBER"}" - # Validate arguments - local var_name - shift - while [[ "$#" -gt 0 ]]; do - case "$1" in - --hosts | \ - --server-aliases) - var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" - shift - read -r -a "${var_name?}" <<<"$1" - ;; - --disable | \ - --disable-http | \ - --disable-https) - - var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" - export "${var_name?}=yes" - ;; - --type | \ - --server-name | \ - --allow-remote-connections | \ - --http-port | \ - --https-port | \ - --additional-configuration | \ - --external-configuration | \ - --document-root | \ - --extra-directory-configuration) - - var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" - shift - export "${var_name?}"="$1" - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - # Construct host string in the format of "listen host1:port1", "listen host2:port2", ... - export http_listen_configuration="" - export https_listen_configuration="" - if [[ "${#hosts[@]}" -gt 0 ]]; then - for host in "${hosts[@]}"; do - http_listen=$'\n'"listen ${host}:${http_port};" - https_listen=$'\n'"listen ${host}:${https_port} ssl;" - [[ -z "${http_listen_configuration:-}" ]] && http_listen_configuration="$http_listen" || http_listen_configuration="${http_listen_configuration}${http_listen}" - [[ -z "${https_listen_configuration:-}" ]] && https_listen_configuration="$https_listen" || https_listen_configuration="${https_listen_configuration}${https_listen}" - done - else - http_listen_configuration=$'\n'"listen ${http_port} default_server;" - https_listen_configuration=$'\n'"listen ${https_port} ssl default_server;" - fi - # Construct server_name block - export server_name_configuration="" - if ! is_empty_value "${server_name:-}"; then - server_name_configuration="server_name ${server_name}" - if [[ "${#server_aliases[@]}" -gt 0 ]]; then - server_name_configuration+=" ${server_aliases[*]}" - fi - server_name_configuration+=";" - else - server_name_configuration=" -# Catch-all server block -# See: https://nginx.org/en/docs/http/server_names.html#miscellaneous_names -server_name _;" - fi - # ACL configuration - export acl_configuration="" - if ! is_boolean_yes "$allow_remote_connections"; then - acl_configuration=" -default_type text/html; -if (\$remote_addr != 127.0.0.1) { - return 403 'For security reasons, this URL is only accessible using localhost (127.0.0.1) as the hostname.'; -} -# Avoid absolute redirects when connecting through a SSH tunnel -absolute_redirect off;" - fi - # Indent configurations - server_name_configuration="$(indent $'\n'"$server_name_configuration" 4)" - acl_configuration="$(indent "$acl_configuration" 4)" - additional_configuration=$'\n'"$(indent "$additional_configuration" 4)" - external_configuration=$'\n'"$external_configuration" - http_listen_configuration="$(indent "$http_listen_configuration" 4)" - https_listen_configuration="$(indent "$https_listen_configuration" 4)" - # Render templates - # We remove lines that are empty or contain only newspaces with 'sed', so the resulting file looks better - local template_name="app" - [[ -n "$type" && "$type" != "php" ]] && template_name="app-${type}" - local template_dir="${BITNAMI_ROOT_DIR}/scripts/nginx/bitnami-templates" - local http_server_block="${NGINX_SERVER_BLOCKS_DIR}/${app}-server-block.conf" - local https_server_block="${NGINX_SERVER_BLOCKS_DIR}/${app}-https-server-block.conf" - local -r disable_suffix=".disabled" - (is_boolean_yes "$disable" || is_boolean_yes "$disable_http") && http_server_block+="$disable_suffix" - (is_boolean_yes "$disable" || is_boolean_yes "$disable_https") && https_server_block+="$disable_suffix" - if is_file_writable "$http_server_block"; then - # Create file with root group write privileges, so it can be modified in non-root containers - [[ ! -f "$http_server_block" ]] && touch "$http_server_block" && chmod g+rw "$http_server_block" - render-template "${template_dir}/${template_name}-http-server-block.conf.tpl" | sed '/^\s*$/d' >"$http_server_block" - elif [[ ! -f "$http_server_block" ]]; then - error "Could not create server block for ${app} at '${http_server_block}'. Check permissions and ownership for parent directories." - return 1 - else - warn "The ${app} server block file '${http_server_block}' is not writable. Configurations based on environment variables will not be applied for this file." - fi - if is_file_writable "$https_server_block"; then - # Create file with root group write privileges, so it can be modified in non-root containers - [[ ! -f "$https_server_block" ]] && touch "$https_server_block" && chmod g+rw "$https_server_block" - render-template "${template_dir}/${template_name}-https-server-block.conf.tpl" | sed '/^\s*$/d' >"$https_server_block" - elif [[ ! -f "$https_server_block" ]]; then - error "Could not create server block for ${app} at '${https_server_block}'. Check permissions and ownership for parent directories." - return 1 - else - warn "The ${app} server block file '${https_server_block}' is not writable. Configurations based on environment variables will not be applied for this file." - fi -} - -######################## -# Ensure an NGINX application configuration does not exist anymore (in server block format) -# Globals: -# * -# Arguments: -# $1 - App name -# Returns: -# true if the configuration was disabled, false otherwise -######################## -ensure_nginx_app_configuration_not_exists() { - local app="${1:?missing app}" - local http_server_block="${NGINX_SERVER_BLOCKS_DIR}/${app}-server-block.conf" - local https_server_block="${NGINX_SERVER_BLOCKS_DIR}/${app}-https-server-block.conf" - local -r disable_suffix=".disabled" - # Note that 'rm -f' will not fail if the files don't exist - # However if we lack permissions to remove the file, it will result in a non-zero exit code, as expected by this function - rm -f "$http_server_block" "$https_server_block" "${http_server_block}${disable_suffix}" "${https_server_block}${disable_suffix}" -} - -######################## -# Ensure NGINX loads the configuration for an application in a URL prefix -# Globals: -# NGINX_* -# Arguments: -# $1 - App name -# Flags: -# --type - Application type, which has an effect on what configuration template will be used, allowed values: php, (empty) -# --allow-remote-connections - Whether to allow remote connections or to require local connections -# --prefix - URL prefix from where it will be accessible (i.e. /myapp) -# --additional-configuration - Additional server block configuration (no default) -# --document-root - Path to document root directory -# --extra-directory-configuration - Extra configuration for the document root directory -# Returns: -# true if the configuration was enabled, false otherwise -######################## -ensure_nginx_prefix_configuration_exists() { - local app="${1:?missing app}" - # Default options - local type="" - local allow_remote_connections="yes" - local prefix="/${app}" - # Template variables defaults - export additional_configuration="" - export document_root="${BITNAMI_ROOT_DIR}/${app}" - export extra_directory_configuration="" - # Validate arguments - local var_name - shift - while [[ "$#" -gt 0 ]]; do - case "$1" in - --type | \ - --allow-remote-connections | \ - --additional-configuration | \ - --document-root | \ - --extra-directory-configuration | \ - --prefix) - - var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" - shift - declare "${var_name?}"="$1" - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - # ACL configuration - export acl_configuration="" - if ! is_boolean_yes "$allow_remote_connections"; then - acl_configuration=" -default_type text/html; -if (\$remote_addr != 127.0.0.1) { - return 403 'For security reasons, this URL is only accessible using localhost (127.0.0.1) as the hostname.'; -} -# Avoid absolute redirects when connecting through a SSH tunnel -absolute_redirect off;" - fi - # Prefix configuration - export location="$prefix" - # Indent configurations - acl_configuration="$(indent "$acl_configuration" 4)" - additional_configuration=$'\n'"$(indent "$additional_configuration" 4)" - # Render templates - # We remove lines that are empty or contain only newspaces with 'sed', so the resulting file looks better - local template_name="app" - [[ -n "$type" ]] && template_name="app-${type}" - local template_dir="${BITNAMI_ROOT_DIR}/scripts/nginx/bitnami-templates" - local prefix_file="${NGINX_CONF_DIR}/bitnami/${app}.conf" - if is_file_writable "$prefix_file"; then - # Create file with root group write privileges, so it can be modified in non-root containers - [[ ! -f "$prefix_file" ]] && touch "$prefix_file" && chmod g+rw "$prefix_file" - render-template "${template_dir}/${template_name}-prefix.conf.tpl" | sed '/^\s*$/d' >"$prefix_file" - elif [[ ! -f "$prefix_file" ]]; then - error "Could not create web server configuration file for ${app} at '${prefix_file}'. Check permissions and ownership for parent directories." - return 1 - else - warn "The ${app} web server configuration file '${prefix_file}' is not writable. Configurations based on environment variables will not be applied for this file." - fi -} - -######################## -# Ensure NGINX application configuration is updated with the runtime configuration (i.e. ports) -# Globals: -# * -# Arguments: -# $1 - App name -# Flags: -# --hosts - Hosts to enable -# --enable-http - Enable HTTP app configuration (if not enabled already) -# --enable-https - Enable HTTPS app configuration (if not enabled already) -# --disable-http - Disable HTTP app configuration (if not disabled already) -# --disable-https - Disable HTTPS app configuration (if not disabled already) -# --http-port - HTTP port number -# --https-port - HTTPS port number -# Returns: -# true if the configuration was updated, false otherwise -######################## -nginx_update_app_configuration() { - local -r app="${1:?missing app}" - # Default options - local -a hosts=() - local enable_http="no" - local enable_https="no" - local disable_http="no" - local disable_https="no" - local http_port="${NGINX_HTTP_PORT_NUMBER:-"$NGINX_DEFAULT_HTTP_PORT_NUMBER"}" - local https_port="${NGINX_HTTPS_PORT_NUMBER:-"$NGINX_DEFAULT_HTTPS_PORT_NUMBER"}" - # Validate arguments - local var_name - shift - while [[ "$#" -gt 0 ]]; do - case "$1" in - --hosts \ - | --server-aliases \ - ) - var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" - shift - read -r -a "${var_name?}" <<<"$1" - ;; - # Common flags - --enable-http \ - | --enable-https \ - | --disable-http \ - | --disable-https \ - ) - var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" - declare "${var_name?}=yes" - ;; - --server-name \ - | --http-port \ - | --https-port \ - ) - var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" - shift - declare "${var_name?}=${1}" - ;; - - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - # Construct host string in the format of "listen host1:port1", "listen host2:port2", ... - export http_listen_configuration="" - export https_listen_configuration="" - if [[ "${#hosts[@]}" -gt 0 ]]; then - for host in "${hosts[@]}"; do - http_listen="listen ${host}:${http_port};" - https_listen="listen ${host}:${https_port} ssl;" - [[ -z "${http_listen_configuration:-}" ]] && http_listen_configuration="$http_listen" || http_listen_configuration="${http_listen_configuration}"$'\\\n'"${http_listen}" - [[ -z "${https_listen_configuration:-}" ]] && https_listen_configuration="$https_listen" || https_listen_configuration="${https_listen_configuration}"$'\\\n'"${https_listen}" - done - else - http_listen_configuration="listen ${http_port} default_server;" - https_listen_configuration="listen ${https_port} ssl default_server;" - fi - # Indent configurations - http_listen_configuration="$(indent "$http_listen_configuration" 4)" - https_listen_configuration="$(indent "$https_listen_configuration" 4)" - # Update configuration - local -r http_server_block="${NGINX_SERVER_BLOCKS_DIR}/${app}-server-block.conf" - local -r https_server_block="${NGINX_SERVER_BLOCKS_DIR}/${app}-https-server-block.conf" - # Helper function to avoid duplicating code - update_common_server_block_config() { - local -r server_block_file="${1:?missing server block}" - # Update server_name - if ! is_empty_value "${server_name:-}"; then - local server_name_list="$server_name" - if [[ "${#server_aliases[@]}" -gt 0 ]]; then - server_name_list+=" ${server_aliases[*]}" - fi - replace_in_file "$server_block_file" "^(\s*server_name\s+)[^;]*" "\1${server_name_list}" - fi - } - # Disable and enable configuration files - rename_conf_file() { - local -r origin="$1" - local -r destination="$2" - if is_file_writable "$origin" && is_file_writable "$destination"; then - warn "Could not rename server block file '${origin}' to '${destination}' due to lack of permissions." - else - mv "$origin" "$destination" - fi - } - is_boolean_yes "$disable_http" && [[ -e "$http_server_block" ]] && rename_conf_file "${http_server_block}${disable_suffix}" "$http_server_block" - is_boolean_yes "$disable_https" && [[ -e "$https_server_block" ]] && rename_conf_file "${https_server_block}${disable_suffix}" "$https_server_block" - is_boolean_yes "$enable_http" && [[ -e "${http_server_block}${disable_suffix}" ]] && rename_conf_file "${http_server_block}${disable_suffix}" "$http_server_block" - is_boolean_yes "$enable_https" && [[ -e "${https_server_block}${disable_suffix}" ]] && rename_conf_file "${https_server_block}${disable_suffix}" "$https_server_block" - # Update only configuration files without the '.disabled' suffix - if [[ -e "$http_server_block" ]]; then - if is_file_writable "$http_server_block"; then - update_common_server_block_config "$http_server_block" - # Update specific server block config (listen addresses) - replace_in_file "$http_server_block" "^\s*listen\s.*;" "$http_listen_configuration" - else - warn "The ${app} server block file '${http_server_block}' is not writable. Configurations based on environment variables will not be applied for this file." - fi - fi - if [[ -e "$https_server_block" ]]; then - if is_file_writable "$https_server_block"; then - update_common_server_block_config "$https_server_block" - # Update specific server block config (listen addresses) - replace_in_file "$https_server_block" "^\s*listen\s.*\sssl;" "$https_listen_configuration" - else - warn "The ${app} server block file '${https_server_block}' is not writable. Configurations based on environment variables will not be applied for this file." - fi - fi -} - -######################## -# Run custom initialization scripts -# Globals: -# NGINX_* -# Arguments: -# None -# Returns: -# None -######################### -nginx_custom_init_scripts() { - if [[ -n $(find "${NGINX_INITSCRIPTS_DIR}/" -type f -regex ".*\.sh") ]]; then - info "Loading user's custom files from $NGINX_INITSCRIPTS_DIR ..." - local -r tmp_file="/tmp/filelist" - find "${NGINX_INITSCRIPTS_DIR}/" -type f -regex ".*\.sh" | sort >"$tmp_file" - while read -r f; do - case "$f" in - *.sh) - if [[ -x "$f" ]]; then - debug "Executing $f" - "$f" - else - debug "Sourcing $f" - . "$f" - fi - ;; - *) - debug "Ignoring $f" - ;; - esac - done <$tmp_file - nginx_stop - rm -f "$tmp_file" - else - info "No custom scripts in $NGINX_INITSCRIPTS_DIR" - fi -} - -######################## -# Generate sample TLS certificates without passphrase for sample HTTPS server_block -# Globals: -# NGINX_* -# Arguments: -# None -# Returns: -# None -######################### -nginx_generate_sample_certs() { - local certs_dir="${NGINX_CONF_DIR}/bitnami/certs" - - if ! is_boolean_yes "$NGINX_SKIP_SAMPLE_CERTS" && [[ ! -f "${certs_dir}/server.crt" ]]; then - # Check certificates directory exists and is writable - if [[ -d "$certs_dir" && -w "$certs_dir" ]]; then - SSL_KEY_FILE="${certs_dir}/server.key" - SSL_CERT_FILE="${certs_dir}/server.crt" - SSL_CSR_FILE="${certs_dir}/server.csr" - SSL_SUBJ="/CN=example.com" - SSL_EXT="subjectAltName=DNS:example.com,DNS:www.example.com,IP:127.0.0.1" - rm -f "$SSL_KEY_FILE" "$SSL_CERT_FILE" - openssl genrsa -out "$SSL_KEY_FILE" 4096 - # OpenSSL version 1.0.x does not use the same parameters as OpenSSL >= 1.1.x - if [[ "$(openssl version | grep -oE "[0-9]+\.[0-9]+")" == "1.0" ]]; then - openssl req -new -sha256 -out "$SSL_CSR_FILE" -key "$SSL_KEY_FILE" -nodes -subj "$SSL_SUBJ" - else - openssl req -new -sha256 -out "$SSL_CSR_FILE" -key "$SSL_KEY_FILE" -nodes -subj "$SSL_SUBJ" -addext "$SSL_EXT" - fi - openssl x509 -req -sha256 -in "$SSL_CSR_FILE" -signkey "$SSL_KEY_FILE" -out "$SSL_CERT_FILE" -days 1825 -extfile <(echo -n "$SSL_EXT") - rm -f "$SSL_CSR_FILE" - else - warn "The certificates directories '${certs_dir}' does not exist or is not writable, skipping sample HTTPS certificates generation" - fi - fi -} diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx-env.sh b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx-env.sh deleted file mode 100644 index 1d584e7b82c1a..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx-env.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Environment configuration for nginx - -# The values for all environment variables will be set in the below order of precedence -# 1. Custom environment variables defined below after Bitnami defaults -# 2. Constants defined in this file (environment variables with no default), i.e. BITNAMI_ROOT_DIR -# 3. Environment variables overridden via external files using *_FILE variables (see below) -# 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata) - -# Load logging library -# shellcheck disable=SC1090,SC1091 -. /opt/bitnami/scripts/liblog.sh - -export BITNAMI_ROOT_DIR="/opt/bitnami" -export BITNAMI_VOLUME_DIR="/bitnami" - -# Logging configuration -export MODULE="${MODULE:-nginx}" -export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}" - -# By setting an environment variable matching *_FILE to a file path, the prefixed environment -# variable will be overridden with the value specified in that file -nginx_env_vars=( - NGINX_HTTP_PORT_NUMBER - NGINX_HTTPS_PORT_NUMBER - NGINX_SKIP_SAMPLE_CERTS - NGINX_ENABLE_ABSOLUTE_REDIRECT - NGINX_ENABLE_PORT_IN_REDIRECT -) -for env_var in "${nginx_env_vars[@]}"; do - file_env_var="${env_var}_FILE" - if [[ -n "${!file_env_var:-}" ]]; then - if [[ -r "${!file_env_var:-}" ]]; then - export "${env_var}=$(< "${!file_env_var}")" - unset "${file_env_var}" - else - warn "Skipping export of '${env_var}'. '${!file_env_var:-}' is not readable." - fi - fi -done -unset nginx_env_vars -export WEB_SERVER_TYPE="nginx" - -# Paths -export NGINX_BASE_DIR="${BITNAMI_ROOT_DIR}/nginx" -export NGINX_VOLUME_DIR="${BITNAMI_VOLUME_DIR}/nginx" -export NGINX_SBIN_DIR="${NGINX_BASE_DIR}/sbin" -export NGINX_CONF_DIR="${NGINX_BASE_DIR}/conf" -export NGINX_HTDOCS_DIR="${NGINX_BASE_DIR}/html" -export NGINX_TMP_DIR="${NGINX_BASE_DIR}/tmp" -export NGINX_LOGS_DIR="${NGINX_BASE_DIR}/logs" -export NGINX_SERVER_BLOCKS_DIR="${NGINX_CONF_DIR}/server_blocks" -export NGINX_INITSCRIPTS_DIR="/docker-entrypoint-initdb.d" -export NGINX_CONF_FILE="${NGINX_CONF_DIR}/nginx.conf" -export NGINX_PID_FILE="${NGINX_TMP_DIR}/nginx.pid" -export PATH="${NGINX_SBIN_DIR}:${BITNAMI_ROOT_DIR}/common/bin:${PATH}" - -# System users (when running with a privileged user) -export NGINX_DAEMON_USER="daemon" -export WEB_SERVER_DAEMON_USER="$NGINX_DAEMON_USER" -export NGINX_DAEMON_GROUP="daemon" -export WEB_SERVER_DAEMON_GROUP="$NGINX_DAEMON_GROUP" -export NGINX_DEFAULT_HTTP_PORT_NUMBER="8080" -export WEB_SERVER_DEFAULT_HTTP_PORT_NUMBER="$NGINX_DEFAULT_HTTP_PORT_NUMBER" # only used at build time -export NGINX_DEFAULT_HTTPS_PORT_NUMBER="8443" -export WEB_SERVER_DEFAULT_HTTPS_PORT_NUMBER="$NGINX_DEFAULT_HTTPS_PORT_NUMBER" # only used at build time - -# NGINX configuration -export NGINX_HTTP_PORT_NUMBER="${NGINX_HTTP_PORT_NUMBER:-}" -export WEB_SERVER_HTTP_PORT_NUMBER="$NGINX_HTTP_PORT_NUMBER" -export NGINX_HTTPS_PORT_NUMBER="${NGINX_HTTPS_PORT_NUMBER:-}" -export WEB_SERVER_HTTPS_PORT_NUMBER="$NGINX_HTTPS_PORT_NUMBER" -export NGINX_SKIP_SAMPLE_CERTS="${NGINX_SKIP_SAMPLE_CERTS:-false}" -export NGINX_ENABLE_ABSOLUTE_REDIRECT="${NGINX_ENABLE_ABSOLUTE_REDIRECT:-no}" -export NGINX_ENABLE_PORT_IN_REDIRECT="${NGINX_ENABLE_PORT_IN_REDIRECT:-no}" - -# Custom environment variables may be defined below diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx-php-fpm/postunpack.sh b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx-php-fpm/postunpack.sh deleted file mode 100755 index 215e58a7b9767..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx-php-fpm/postunpack.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load libraries -. /opt/bitnami/scripts/libnginx.sh -. /opt/bitnami/scripts/libvalidations.sh - -# Load NGINX environment -. /opt/bitnami/scripts/nginx-env.sh -. /opt/bitnami/scripts/php-env.sh - -# Write NGINX configuration -nginx_php_fpm_conf_file="${NGINX_CONF_DIR}/bitnami/php-fpm.conf" -fastcgi_pass="$PHP_FPM_DEFAULT_LISTEN_ADDRESS" -# Check if PHP_FPM_DEFAULT_LISTEN_ADDRESS refers to a socket file, and add the required prefix for NGINX to understand it -[[ "$fastcgi_pass" == "/"* ]] && fastcgi_pass="unix:$fastcgi_pass" -cat >"$nginx_php_fpm_conf_file" </dev/null - wait - exit $? -} -trap _forwardTerm TERM - -info "Starting PHP-FPM..." -/opt/bitnami/scripts/php/run.sh & - -info "Starting NGINX..." -/opt/bitnami/scripts/nginx/run.sh diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-http-server-block.conf.tpl b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-http-server-block.conf.tpl deleted file mode 100644 index 4ebeed5738891..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-http-server-block.conf.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{{external_configuration}} - -server { - # Port to listen on, can also be set in IP:PORT format - {{http_listen_configuration}} - - root {{document_root}}; - - {{server_name_configuration}} - - {{acl_configuration}} - - {{additional_configuration}} - - include "/opt/bitnami/nginx/conf/bitnami/*.conf"; -} diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-https-server-block.conf.tpl b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-https-server-block.conf.tpl deleted file mode 100644 index 02acfbb055c64..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-https-server-block.conf.tpl +++ /dev/null @@ -1,19 +0,0 @@ -{{external_configuration}} - -server { - # Port to listen on, can also be set in IP:PORT format - {{https_listen_configuration}} - - root {{document_root}}; - - {{server_name_configuration}} - - ssl_certificate bitnami/certs/server.crt; - ssl_certificate_key bitnami/certs/server.key; - - {{acl_configuration}} - - {{additional_configuration}} - - include "/opt/bitnami/nginx/conf/bitnami/*.conf"; -} diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-php-prefix.conf.tpl b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-php-prefix.conf.tpl deleted file mode 100644 index 28bb0393aaa35..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-php-prefix.conf.tpl +++ /dev/null @@ -1,10 +0,0 @@ -location ^~ {{location}} { - alias "{{document_root}}"; - - {{acl_configuration}} - - include "/opt/bitnami/nginx/conf/bitnami/protect-hidden-files.conf"; - include "/opt/bitnami/nginx/conf/bitnami/php-fpm.conf"; -} - -{{additional_configuration}} diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-prefix.conf.tpl b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-prefix.conf.tpl deleted file mode 100644 index b7d04e1e80f7c..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-prefix.conf.tpl +++ /dev/null @@ -1,9 +0,0 @@ -location ^~ {{location}} { - alias "{{document_root}}"; - - {{acl_configuration}} - - include "/opt/bitnami/nginx/conf/bitnami/protect-hidden-files.conf"; -} - -{{additional_configuration}} diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/default-https-server-block.conf b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/default-https-server-block.conf deleted file mode 100644 index 27284a637c317..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/default-https-server-block.conf +++ /dev/null @@ -1,17 +0,0 @@ -# HTTPS Server -server { - # Port to listen on, can also be set in IP:PORT format - listen 443 ssl; - - ssl_certificate bitnami/certs/server.crt; - ssl_certificate_key bitnami/certs/server.key; - - include "/opt/bitnami/nginx/conf/bitnami/*.conf"; - - location /status { - stub_status on; - access_log off; - allow 127.0.0.1; - deny all; - } -} diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/postunpack.sh b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/postunpack.sh deleted file mode 100755 index 2ebe0fb36870a..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/postunpack.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load libraries -. /opt/bitnami/scripts/libnginx.sh -. /opt/bitnami/scripts/libfs.sh - -# Auxiliar Functions - -######################## -# Unset HTTP_PROXY header to protect vs HTTPPOXY vulnerability -# Ref: https://www.digitalocean.com/community/tutorials/how-to-protect-your-server-against-the-httpoxy-vulnerability -# Globals: -# NGINX_* -# Arguments: -# None -# Returns: -# None -######################### -nginx_patch_httpoxy_vulnerability() { - debug "Unsetting HTTP_PROXY header..." - echo '# Unset the HTTP_PROXY header' >>"${NGINX_CONF_DIR}/fastcgi_params" - echo 'fastcgi_param HTTP_PROXY "";' >>"${NGINX_CONF_DIR}/fastcgi_params" -} - -# Load NGINX environment variables -. /opt/bitnami/scripts/nginx-env.sh - -# Remove unnecessary directories that come with the tarball -rm -rf "${BITNAMI_ROOT_DIR}/certs" "${BITNAMI_ROOT_DIR}/server_blocks" - -# Ensure non-root user has write permissions on a set of directories -for dir in "$NGINX_VOLUME_DIR" "$NGINX_CONF_DIR" "$NGINX_INITSCRIPTS_DIR" "$NGINX_SERVER_BLOCKS_DIR" "${NGINX_CONF_DIR}/bitnami" "${NGINX_CONF_DIR}/bitnami/certs" "$NGINX_LOGS_DIR" "$NGINX_TMP_DIR"; do - ensure_dir_exists "$dir" - chmod -R g+rwX "$dir" -done - -# Unset HTTP_PROXY header to protect vs HTTPPOXY vulnerability -nginx_patch_httpoxy_vulnerability - -# Configure default HTTP port -nginx_configure_port "$NGINX_DEFAULT_HTTP_PORT_NUMBER" -# Configure default HTTPS port -nginx_configure_port "$NGINX_DEFAULT_HTTPS_PORT_NUMBER" "${BITNAMI_ROOT_DIR}/scripts/nginx/bitnami-templates/default-https-server-block.conf" - -# shellcheck disable=SC1091 - -# Load additional libraries -. /opt/bitnami/scripts/libfs.sh - -# Users can mount their html sites at /app -mv "${NGINX_BASE_DIR}/html" /app -ln -sf /app "${NGINX_BASE_DIR}/html" - -# Users can mount their certificates at /certs -mv "${NGINX_CONF_DIR}/bitnami/certs" /certs -ln -sf /certs "${NGINX_CONF_DIR}/bitnami/certs" - -ln -sf "/dev/stdout" "${NGINX_LOGS_DIR}/access.log" -ln -sf "/dev/stderr" "${NGINX_LOGS_DIR}/error.log" - -# This file is necessary for avoiding the error -# "unable to write random state" -# Source: https://stackoverflow.com/questions/94445/using-openssl-what-does-unable-to-write-random-state-mean - -touch /.rnd && chmod g+rw /.rnd diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/reload.sh b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/reload.sh deleted file mode 100755 index 1b18ed6d9637b..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/reload.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load libraries -. /opt/bitnami/scripts/libnginx.sh -. /opt/bitnami/scripts/liblog.sh - -# Load NGINX environment -. /opt/bitnami/scripts/nginx-env.sh - -info "** Reloading NGINX configuration **" -exec "${NGINX_SBIN_DIR}/nginx" -s reload diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/run.sh b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/run.sh deleted file mode 100755 index a2f3b57114d06..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/run.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load libraries -. /opt/bitnami/scripts/liblog.sh -. /opt/bitnami/scripts/libnginx.sh - -# Load NGINX environment variables -. /opt/bitnami/scripts/nginx-env.sh - -info "** Starting NGINX **" -exec "${NGINX_SBIN_DIR}/nginx" -c "$NGINX_CONF_FILE" -g "daemon off;" diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh deleted file mode 100755 index 084490b6ac836..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load libraries -. /opt/bitnami/scripts/libos.sh -. /opt/bitnami/scripts/libfs.sh -. /opt/bitnami/scripts/libnginx.sh - -# Load NGINX environment variables -. /opt/bitnami/scripts/nginx-env.sh - -# Ensure NGINX environment variables settings are valid -nginx_validate - -# Ensure NGINX is stopped when this script ends -trap "nginx_stop" EXIT - -# Ensure NGINX daemon user exists when running as 'root' -am_i_root && ensure_user_exists "$NGINX_DAEMON_USER" --group "$NGINX_DAEMON_GROUP" - -# Configure HTTPS sample block using generated SSL certs -nginx_generate_sample_certs - -# Run init scripts -nginx_custom_init_scripts - -# Fix logging issue when running as root -! am_i_root || chmod o+w "$(readlink /dev/stdout)" "$(readlink /dev/stderr)" - -# Configure HTTPS port number -if [[ -f "${NGINX_CONF_DIR}/bitnami/certs/server.crt" ]] && [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]] && [[ ! -f "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" ]] && is_file_writable "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf"; then - cp "${BITNAMI_ROOT_DIR}/scripts/nginx/bitnami-templates/default-https-server-block.conf" "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" -fi - -# Initialize NGINX -nginx_initialize - diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/start.sh b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/start.sh deleted file mode 100755 index 1dc8e8e746ddc..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/start.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load libraries -. /opt/bitnami/scripts/libnginx.sh -. /opt/bitnami/scripts/libos.sh -. /opt/bitnami/scripts/liblog.sh - -# Load NGINX environment variables -. /opt/bitnami/scripts/nginx-env.sh - -error_code=0 - -if is_nginx_not_running; then - "${NGINX_SBIN_DIR}/nginx" -c "$NGINX_CONF_FILE" - if ! retry_while "is_nginx_running"; then - error "nginx did not start" - error_code=1 - else - info "nginx started" - fi -else - info "nginx is already running" -fi - -exit "$error_code" diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/status.sh b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/status.sh deleted file mode 100755 index 16b35ef1b0e87..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/status.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load libraries -. /opt/bitnami/scripts/libnginx.sh -. /opt/bitnami/scripts/liblog.sh - -# Load NGINX environment variables -. /opt/bitnami/scripts/nginx-env.sh - -if is_nginx_running; then - info "nginx is already running" -else - info "nginx is not running" -fi diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/stop.sh b/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/stop.sh deleted file mode 100755 index bc6f4f3fd8aa2..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/stop.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load libraries -. /opt/bitnami/scripts/libnginx.sh -. /opt/bitnami/scripts/libos.sh -. /opt/bitnami/scripts/liblog.sh - -# Load NGINX environment variables -. /opt/bitnami/scripts/nginx-env.sh - -error_code=0 - -if is_nginx_running; then - BITNAMI_QUIET=1 nginx_stop - if ! retry_while "is_nginx_not_running"; then - error "nginx could not be stopped" - error_code=1 - else - info "nginx stopped" - fi -else - info "nginx is not running" -fi - -exit "$error_code" diff --git a/bitnami/drupal-nginx/9/debian-11/tags-info.yaml b/bitnami/drupal-nginx/9/debian-11/tags-info.yaml deleted file mode 100644 index d8e405007077d..0000000000000 --- a/bitnami/drupal-nginx/9/debian-11/tags-info.yaml +++ /dev/null @@ -1,4 +0,0 @@ -rolling-tags: -- "9" -- 9-debian-11 -- 9.5.11 diff --git a/bitnami/drupal-nginx/README.md b/bitnami/drupal-nginx/README.md index 9163774b92251..2c7bca3378194 100644 --- a/bitnami/drupal-nginx/README.md +++ b/bitnami/drupal-nginx/README.md @@ -1,4 +1,4 @@ -# Drupal with NGINX packaged by Bitnami +# Bitnami package for Drupal with NGINX ## What is Drupal with NGINX? @@ -21,7 +21,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/drupal/10/debian-11/Dockerfile b/bitnami/drupal/10/debian-11/Dockerfile index 03931a6446954..00d31c260fd2e 100644 --- a/bitnami/drupal/10/debian-11/Dockerfile +++ b/bitnami/drupal/10/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:44:16Z" \ + org.opencontainers.image.created="2023-12-08T01:11:41Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.1.5-debian-11-r3" \ + org.opencontainers.image.ref.name="10.1.7-debian-11-r0" \ org.opencontainers.image.title="drupal" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="10.1.5" + org.opencontainers.image.version="10.1.7" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,25 +21,25 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gnupg libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps unzip zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.2.11-3-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.57-12-linux-${OS_ARCH}-debian-11" \ - "mysql-client-11.1.2-0-linux-${OS_ARCH}-debian-11" \ - "libphp-8.2.11-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "drupal-10.1.5-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "php-8.2.13-8-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.58-2-linux-${OS_ARCH}-debian-11" \ + "mysql-client-11.1.3-0-linux-${OS_ARCH}-debian-11" \ + "libphp-8.2.13-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "drupal-10.1.7-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -55,7 +55,7 @@ RUN /opt/bitnami/scripts/drupal/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ - APP_VERSION="10.1.5" \ + APP_VERSION="10.1.7" \ BITNAMI_APP_NAME="drupal" \ PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/drupal/vendor/bin:$PATH" diff --git a/bitnami/drupal/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/drupal/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index eacc8d29ee68e..27c2e1a916214 100644 --- a/bitnami/drupal/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/drupal/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,36 +3,36 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.57-12" + "version": "2.4.58-2" }, "drupal": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.1.5-0" + "version": "10.1.7-0" }, "libphp": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.11-0" + "version": "8.2.13-0" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.1.2-0" + "version": "11.1.3-0" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.11-3" + "version": "8.2.13-8" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" } } \ No newline at end of file diff --git a/bitnami/drupal/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/drupal/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/drupal/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/drupal/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/drupal/10/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/drupal/10/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/drupal/10/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/drupal/10/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/drupal/10/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/drupal/10/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh index 765d1d8ce1ed5..6a480ad4ddde9 100755 --- a/bitnami/drupal/10/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh +++ b/bitnami/drupal/10/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh @@ -46,6 +46,7 @@ apache_setup_bitnami_config() { local -a modules_to_disable=( "http2_module" "proxy_hcheck_module" + "proxy_html_module" "proxy_http2_module" ) for module in "${modules_to_disable[@]}"; do diff --git a/bitnami/drupal/10/debian-11/tags-info.yaml b/bitnami/drupal/10/debian-11/tags-info.yaml index 0e576b3479e26..df1b2afa5a69d 100644 --- a/bitnami/drupal/10/debian-11/tags-info.yaml +++ b/bitnami/drupal/10/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "10" - 10-debian-11 -- 10.1.5 +- 10.1.7 - latest diff --git a/bitnami/drupal/9/debian-11/Dockerfile b/bitnami/drupal/9/debian-11/Dockerfile deleted file mode 100644 index c1f6551f51a23..0000000000000 --- a/bitnami/drupal/9/debian-11/Dockerfile +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -FROM docker.io/bitnami/minideb:bullseye - -ARG TARGETARCH - -LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ - org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:06:02Z" \ - org.opencontainers.image.description="Application packaged by VMware, Inc" \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="9.5.11-debian-11-r12" \ - org.opencontainers.image.title="drupal" \ - org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="9.5.11" - -ENV HOME="/" \ - OS_ARCH="${TARGETARCH:-amd64}" \ - OS_FLAVOUR="debian-11" \ - OS_NAME="linux" - -COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] -# Install required system packages and dependencies -RUN install_packages acl ca-certificates curl gnupg libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps unzip zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - COMPONENTS=( \ - "php-8.1.24-3-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.57-12-linux-${OS_ARCH}-debian-11" \ - "mysql-client-11.1.2-0-linux-${OS_ARCH}-debian-11" \ - "libphp-8.1.24-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "drupal-9.5.11-1-linux-${OS_ARCH}-debian-11" \ - ) && \ - for COMPONENT in "${COMPONENTS[@]}"; do \ - if [ ! -f "${COMPONENT}.tar.gz" ]; then \ - curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ - curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ - done -RUN apt-get autoremove --purge -y curl && \ - apt-get update && apt-get upgrade -y && \ - apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives -RUN chmod g+rwX /opt/bitnami - -COPY rootfs / -RUN /opt/bitnami/scripts/apache/postunpack.sh -RUN /opt/bitnami/scripts/php/postunpack.sh -RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh -RUN /opt/bitnami/scripts/drupal/postunpack.sh -RUN /opt/bitnami/scripts/mysql-client/postunpack.sh -ENV APACHE_HTTPS_PORT_NUMBER="" \ - APACHE_HTTP_PORT_NUMBER="" \ - APP_VERSION="9.5.11" \ - BITNAMI_APP_NAME="drupal" \ - PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/drupal/vendor/bin:$PATH" - -EXPOSE 8080 8443 - -USER 1001 -ENTRYPOINT [ "/opt/bitnami/scripts/drupal/entrypoint.sh" ] -CMD [ "/opt/bitnami/scripts/apache/run.sh" ] diff --git a/bitnami/drupal/9/debian-11/docker-compose.yml b/bitnami/drupal/9/debian-11/docker-compose.yml deleted file mode 100644 index 6f39754025d10..0000000000000 --- a/bitnami/drupal/9/debian-11/docker-compose.yml +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -version: '2' -services: - mariadb: - image: docker.io/bitnami/mariadb:11.1 - environment: - # ALLOW_EMPTY_PASSWORD is recommended only for development. - - ALLOW_EMPTY_PASSWORD=yes - - MARIADB_USER=bn_drupal - - MARIADB_DATABASE=bitnami_drupal - volumes: - - 'mariadb_data:/bitnami/mariadb' - drupal: - image: docker.io/bitnami/drupal:9 - ports: - - '80:8080' - - '443:8443' - environment: - - DRUPAL_DATABASE_HOST=mariadb - - DRUPAL_DATABASE_PORT_NUMBER=3306 - - DRUPAL_DATABASE_USER=bn_drupal - - DRUPAL_DATABASE_NAME=bitnami_drupal - # ALLOW_EMPTY_PASSWORD is recommended only for development. - - ALLOW_EMPTY_PASSWORD=yes - volumes: - - 'drupal_data:/bitnami/drupal' - depends_on: - - mariadb -volumes: - mariadb_data: - driver: local - drupal_data: - driver: local diff --git a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json deleted file mode 100644 index 2bd3d6a8771a1..0000000000000 --- a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "apache": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "2.4.57-12" - }, - "drupal": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "9.5.11-1" - }, - "libphp": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "8.1.24-0" - }, - "mysql-client": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "11.1.2-0" - }, - "php": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "8.1.24-3" - }, - "render-template": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "1.0.6-2" - } -} \ No newline at end of file diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/apache/conf/deflate.conf b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/apache/conf/deflate.conf deleted file mode 100644 index ca9bc1d6e4b6f..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/apache/conf/deflate.conf +++ /dev/null @@ -1,5 +0,0 @@ - - AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css - AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript - AddOutputFilterByType DEFLATE application/rss+xml - diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/apache/conf/vhosts/00_status-vhost.conf b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/apache/conf/vhosts/00_status-vhost.conf deleted file mode 100644 index c0838da2a4e53..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/apache/conf/vhosts/00_status-vhost.conf +++ /dev/null @@ -1,7 +0,0 @@ - - ServerName status.localhost - - Require local - SetHandler server-status - - diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache-env.sh b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache-env.sh deleted file mode 100644 index 449481062e54d..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache-env.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Environment configuration for apache - -# The values for all environment variables will be set in the below order of precedence -# 1. Custom environment variables defined below after Bitnami defaults -# 2. Constants defined in this file (environment variables with no default), i.e. BITNAMI_ROOT_DIR -# 3. Environment variables overridden via external files using *_FILE variables (see below) -# 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata) - -# Load logging library -# shellcheck disable=SC1090,SC1091 -. /opt/bitnami/scripts/liblog.sh - -export BITNAMI_ROOT_DIR="/opt/bitnami" -export BITNAMI_VOLUME_DIR="/bitnami" - -# Logging configuration -export MODULE="${MODULE:-apache}" -export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}" - -# By setting an environment variable matching *_FILE to a file path, the prefixed environment -# variable will be overridden with the value specified in that file -apache_env_vars=( - APACHE_HTTP_PORT_NUMBER - APACHE_HTTPS_PORT_NUMBER - APACHE_SERVER_TOKENS - APACHE_HTTP_PORT - APACHE_HTTPS_PORT -) -for env_var in "${apache_env_vars[@]}"; do - file_env_var="${env_var}_FILE" - if [[ -n "${!file_env_var:-}" ]]; then - if [[ -r "${!file_env_var:-}" ]]; then - export "${env_var}=$(< "${!file_env_var}")" - unset "${file_env_var}" - else - warn "Skipping export of '${env_var}'. '${!file_env_var:-}' is not readable." - fi - fi -done -unset apache_env_vars -export WEB_SERVER_TYPE="apache" - -# Paths -export APACHE_BASE_DIR="${BITNAMI_ROOT_DIR}/apache" -export APACHE_BIN_DIR="${APACHE_BASE_DIR}/bin" -export APACHE_CONF_DIR="${APACHE_BASE_DIR}/conf" -export APACHE_HTDOCS_DIR="${APACHE_BASE_DIR}/htdocs" -export APACHE_TMP_DIR="${APACHE_BASE_DIR}/var/run" -export APACHE_LOGS_DIR="${APACHE_BASE_DIR}/logs" -export APACHE_VHOSTS_DIR="${APACHE_CONF_DIR}/vhosts" -export APACHE_HTACCESS_DIR="${APACHE_VHOSTS_DIR}/htaccess" -export APACHE_CONF_FILE="${APACHE_CONF_DIR}/httpd.conf" -export APACHE_PID_FILE="${APACHE_TMP_DIR}/httpd.pid" -export PATH="${APACHE_BIN_DIR}:${BITNAMI_ROOT_DIR}/common/bin:${PATH}" - -# System users (when running with a privileged user) -export APACHE_DAEMON_USER="daemon" -export WEB_SERVER_DAEMON_USER="$APACHE_DAEMON_USER" -export APACHE_DAEMON_GROUP="daemon" -export WEB_SERVER_DAEMON_GROUP="$APACHE_DAEMON_GROUP" -export WEB_SERVER_GROUP="$APACHE_DAEMON_GROUP" - -# Apache configuration -export APACHE_DEFAULT_HTTP_PORT_NUMBER="8080" -export WEB_SERVER_DEFAULT_HTTP_PORT_NUMBER="$APACHE_DEFAULT_HTTP_PORT_NUMBER" # only used at build time -export APACHE_DEFAULT_HTTPS_PORT_NUMBER="8443" -export WEB_SERVER_DEFAULT_HTTPS_PORT_NUMBER="$APACHE_DEFAULT_HTTPS_PORT_NUMBER" # only used at build time -APACHE_HTTP_PORT_NUMBER="${APACHE_HTTP_PORT_NUMBER:-"${APACHE_HTTP_PORT:-}"}" -export APACHE_HTTP_PORT_NUMBER="${APACHE_HTTP_PORT_NUMBER:-}" -export WEB_SERVER_HTTP_PORT_NUMBER="$APACHE_HTTP_PORT_NUMBER" -APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-"${APACHE_HTTPS_PORT:-}"}" -export APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-}" -export WEB_SERVER_HTTPS_PORT_NUMBER="$APACHE_HTTPS_PORT_NUMBER" -export APACHE_SERVER_TOKENS="${APACHE_SERVER_TOKENS:-Prod}" - -# Custom environment variables may be defined below diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh deleted file mode 100755 index a415969338cc9..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load libraries -. /opt/bitnami/scripts/libversion.sh -. /opt/bitnami/scripts/libapache.sh - -# Load Apache environment -. /opt/bitnami/scripts/apache-env.sh -. /opt/bitnami/scripts/php-env.sh - -# Enable required Apache modules -apache_enable_module "mpm_prefork_module" -php_version="$("${PHP_BIN_DIR}/php" -v | grep ^PHP | cut -d' ' -f2))" -php_major_version="$(get_sematic_version "$php_version" 1)" -if [[ "$php_major_version" -eq "8" ]]; then - apache_enable_module "php_module" "modules/libphp.so" -else - apache_enable_module "php${php_major_version}_module" "modules/libphp${php_major_version}.so" -fi - -# Disable incompatible Apache modules -apache_disable_module "mpm_event_module" - -# Write Apache configuration -apache_php_conf_file="${APACHE_CONF_DIR}/bitnami/php.conf" -cat > "$apache_php_conf_file" < - {{server_name_configuration}} - {{additional_http_configuration}} - {{additional_configuration}} - diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-https-vhost.conf.tpl b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-https-vhost.conf.tpl deleted file mode 100644 index 589538513c9c9..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-https-vhost.conf.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{https_listen_configuration}} -{{before_vhost_configuration}} - - {{server_name_configuration}} - SSLEngine on - SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.crt" - SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.key" - {{additional_https_configuration}} - {{additional_configuration}} - diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-prefix.conf.tpl b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-prefix.conf.tpl deleted file mode 100644 index c895e537502a2..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-prefix.conf.tpl +++ /dev/null @@ -1 +0,0 @@ -{{additional_configuration}} diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-http-vhost.conf.tpl b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-http-vhost.conf.tpl deleted file mode 100644 index 96be8f8227715..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-http-vhost.conf.tpl +++ /dev/null @@ -1,15 +0,0 @@ -{{http_listen_configuration}} -{{before_vhost_configuration}} - - {{server_name_configuration}} - DocumentRoot {{document_root}} - - Options -Indexes +FollowSymLinks -MultiViews - AllowOverride {{allow_override}} - {{acl_configuration}} - {{extra_directory_configuration}} - - {{additional_http_configuration}} - {{additional_configuration}} - {{htaccess_include}} - diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-https-vhost.conf.tpl b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-https-vhost.conf.tpl deleted file mode 100644 index 1ad938929726e..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-https-vhost.conf.tpl +++ /dev/null @@ -1,18 +0,0 @@ -{{https_listen_configuration}} -{{before_vhost_configuration}} - - {{server_name_configuration}} - SSLEngine on - SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.crt" - SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.key" - DocumentRoot {{document_root}} - - Options -Indexes +FollowSymLinks -MultiViews - AllowOverride {{allow_override}} - {{acl_configuration}} - {{extra_directory_configuration}} - - {{additional_https_configuration}} - {{additional_configuration}} - {{htaccess_include}} - diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-prefix.conf.tpl b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-prefix.conf.tpl deleted file mode 100644 index fc0f6c2181961..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-prefix.conf.tpl +++ /dev/null @@ -1,9 +0,0 @@ -{{prefix_conf}} - - Options -Indexes +FollowSymLinks -MultiViews - AllowOverride {{allow_override}} - {{acl_configuration}} - {{extra_directory_configuration}} - -{{additional_configuration}} -{{htaccess_include}} diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl deleted file mode 100644 index 9440b89d28bfa..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl +++ /dev/null @@ -1,11 +0,0 @@ -{{http_listen_configuration}} -{{before_vhost_configuration}} - - {{server_name_configuration}} - {{proxy_configuration}} - {{proxy_http_configuration}} - ProxyPass / {{proxy_address}} - ProxyPassReverse / {{proxy_address}} - {{additional_http_configuration}} - {{additional_configuration}} - diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl deleted file mode 100644 index 577cd461eb9dc..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl +++ /dev/null @@ -1,14 +0,0 @@ -{{https_listen_configuration}} -{{before_vhost_configuration}} - - {{server_name_configuration}} - SSLEngine on - SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.crt" - SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.key" - {{proxy_configuration}} - {{proxy_https_configuration}} - ProxyPass / {{proxy_address}} - ProxyPassReverse / {{proxy_address}} - {{additional_https_configuration}} - {{additional_configuration}} - diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-prefix.conf.tpl b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-prefix.conf.tpl deleted file mode 100644 index 7ac08b131680b..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-prefix.conf.tpl +++ /dev/null @@ -1,11 +0,0 @@ -{{prefix_conf}} - - Options -Indexes +FollowSymLinks -MultiViews - AllowOverride {{allow_override}} - {{acl_configuration}} - {{proxy_configuration}} - ProxyPass / {{proxy_address}} - ProxyPassReverse / {{proxy_address}} - {{extra_directory_configuration}} - -{{additional_configuration}} diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-http-vhost.conf.tpl b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-http-vhost.conf.tpl deleted file mode 100644 index f518c7d42aab8..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-http-vhost.conf.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{{http_listen_configuration}} -{{before_vhost_configuration}} -PassengerPreStart http://localhost:{{http_port}}/ - - {{server_name_configuration}} - DocumentRoot {{document_root}} - - Options -Indexes +FollowSymLinks -MultiViews - AllowOverride {{allow_override}} - {{acl_configuration}} - PassengerEnabled on - {{extra_directory_configuration}} - - {{additional_http_configuration}} - {{additional_configuration}} - diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-https-vhost.conf.tpl b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-https-vhost.conf.tpl deleted file mode 100644 index 5aae54c37d3ba..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-https-vhost.conf.tpl +++ /dev/null @@ -1,19 +0,0 @@ -{{https_listen_configuration}} -{{before_vhost_configuration}} -PassengerPreStart https://localhost:{{https_port}}/ - - {{server_name_configuration}} - SSLEngine on - SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.crt" - SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.key" - DocumentRoot {{document_root}} - - Options -Indexes +FollowSymLinks -MultiViews - AllowOverride {{allow_override}} - {{acl_configuration}} - PassengerEnabled on - {{extra_directory_configuration}} - - {{additional_https_configuration}} - {{additional_configuration}} - diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-prefix.conf.tpl b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-prefix.conf.tpl deleted file mode 100644 index 2242d656b5a83..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-prefix.conf.tpl +++ /dev/null @@ -1,9 +0,0 @@ -{{prefix_conf}} - - Options -Indexes +FollowSymLinks -MultiViews - AllowOverride {{allow_override}} - {{acl_configuration}} - PassengerEnabled on - {{extra_directory_configuration}} - -{{additional_configuration}} diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami-ssl.conf.tpl b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami-ssl.conf.tpl deleted file mode 100644 index f1d31ed3ecc35..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami-ssl.conf.tpl +++ /dev/null @@ -1,29 +0,0 @@ -# Default SSL Virtual Host configuration. - - - LoadModule ssl_module modules/mod_ssl.so - - -Listen 443 -SSLProtocol all -SSLv2 -SSLv3 -SSLHonorCipherOrder on -SSLCipherSuite "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS !EDH !RC4" -SSLPassPhraseDialog builtin -SSLSessionCache "shmcb:{{APACHE_LOGS_DIR}}/ssl_scache(512000)" -SSLSessionCacheTimeout 300 - - - DocumentRoot "{{APACHE_BASE_DIR}}/htdocs" - SSLEngine on - SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.crt" - SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.key" - - - Options Indexes FollowSymLinks - AllowOverride All - Require all granted - - - # Error Documents - ErrorDocument 503 /503.html - diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami.conf.tpl b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami.conf.tpl deleted file mode 100644 index 75a255c3efee8..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami.conf.tpl +++ /dev/null @@ -1,17 +0,0 @@ -# Default Virtual Host configuration. - -# Let Apache know we're behind a SSL reverse proxy -SetEnvIf X-Forwarded-Proto https HTTPS=on - - - DocumentRoot "{{APACHE_BASE_DIR}}/htdocs" - - Options Indexes FollowSymLinks - AllowOverride All - Require all granted - - - # Error Documents - ErrorDocument 503 /503.html - - diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/entrypoint.sh b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/entrypoint.sh deleted file mode 100755 index dad82feba3894..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/entrypoint.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -#set -o xtrace - -# Load libraries -. /opt/bitnami/scripts/libapache.sh -. /opt/bitnami/scripts/libbitnami.sh -. /opt/bitnami/scripts/liblog.sh - -# Load Apache environment -. /opt/bitnami/scripts/apache-env.sh - -print_welcome_page - -if [[ "$*" == *"/opt/bitnami/scripts/apache/run.sh"* ]]; then - info "** Starting Apache setup **" - /opt/bitnami/scripts/apache/setup.sh - info "** Apache setup finished! **" -fi - -echo "" -exec "$@" diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh deleted file mode 100755 index 765d1d8ce1ed5..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load libraries -. /opt/bitnami/scripts/libapache.sh -. /opt/bitnami/scripts/libfs.sh -. /opt/bitnami/scripts/liblog.sh - -######################## -# Sets up the default Bitnami configuration -# Globals: -# APACHE_* -# Arguments: -# None -# Returns: -# None -######################### -apache_setup_bitnami_config() { - local template_dir="${BITNAMI_ROOT_DIR}/scripts/apache/bitnami-templates" - - # Enable Apache modules - local -a modules_to_enable=( - "deflate_module" - "negotiation_module" - "proxy[^\s]*_module" - "rewrite_module" - "slotmem_shm_module" - "socache_shmcb_module" - "ssl_module" - "status_module" - "version_module" - ) - for module in "${modules_to_enable[@]}"; do - apache_enable_module "$module" - done - - # Disable Apache modules - local -a modules_to_disable=( - "http2_module" - "proxy_hcheck_module" - "proxy_http2_module" - ) - for module in "${modules_to_disable[@]}"; do - apache_disable_module "$module" - done - - # Bitnami customizations - ensure_dir_exists "${APACHE_CONF_DIR}/bitnami" - render-template "${template_dir}/bitnami.conf.tpl" > "${APACHE_CONF_DIR}/bitnami/bitnami.conf" - render-template "${template_dir}/bitnami-ssl.conf.tpl" > "${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf" - - # Add new configuration only once, to avoid a second postunpack run breaking Apache - local apache_conf_add - apache_conf_add="$(cat <>"$APACHE_CONF_FILE" < - RequestHeader unset Proxy - -EOF - fi -} - -# Load Apache environment -. /opt/bitnami/scripts/apache-env.sh - -apache_setup_bitnami_config - -# Ensure non-root user has write permissions on a set of directories -for dir in "$APACHE_TMP_DIR" "$APACHE_CONF_DIR" "$APACHE_LOGS_DIR" "$APACHE_VHOSTS_DIR" "$APACHE_HTACCESS_DIR" "$APACHE_HTDOCS_DIR"; do - ensure_dir_exists "$dir" - chmod -R g+rwX "$dir" -done - -# Create 'apache2' symlink pointing to the 'apache' directory, for compatibility with Bitnami Docs guides -ln -sf apache "${BITNAMI_ROOT_DIR}/apache2" - -ln -sf "/dev/stdout" "${APACHE_LOGS_DIR}/access_log" -ln -sf "/dev/stderr" "${APACHE_LOGS_DIR}/error_log" - -# This file is necessary for avoiding the error -# "unable to write random state" -# Source: https://stackoverflow.com/questions/94445/using-openssl-what-does-unable-to-write-random-state-mean - -touch /.rnd && chmod g+rw /.rnd diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/reload.sh b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/reload.sh deleted file mode 100755 index 759c76157cc5f..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/reload.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load libraries -. /opt/bitnami/scripts/libapache.sh -. /opt/bitnami/scripts/liblog.sh - -# Load Apache environment -. /opt/bitnami/scripts/apache-env.sh - -info "** Reloading Apache configuration **" -exec "${APACHE_BIN_DIR}/apachectl" -k graceful diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/restart.sh b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/restart.sh deleted file mode 100755 index a58851df0bab1..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/restart.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load libraries -. /opt/bitnami/scripts/libapache.sh - -# Load Apache environment variables -. /opt/bitnami/scripts/apache-env.sh - -/opt/bitnami/scripts/apache/stop.sh -/opt/bitnami/scripts/apache/start.sh diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/run.sh b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/run.sh deleted file mode 100755 index 01872e16a58a2..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/run.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load libraries -. /opt/bitnami/scripts/libapache.sh -. /opt/bitnami/scripts/liblog.sh - -# Load Apache environment -. /opt/bitnami/scripts/apache-env.sh - -info "** Starting Apache **" -exec "${APACHE_BIN_DIR}/httpd" -f "$APACHE_CONF_FILE" -D "FOREGROUND" diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh deleted file mode 100755 index ab451b6c1442e..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load libraries -. /opt/bitnami/scripts/liblog.sh -. /opt/bitnami/scripts/libapache.sh - -# Load Apache environment -. /opt/bitnami/scripts/apache-env.sh - -# Ensure Apache environment variables are valid -apache_validate - -# Ensure Apache daemon user exists when running as 'root' -am_i_root && ensure_user_exists "$APACHE_DAEMON_USER" --group "$APACHE_DAEMON_GROUP" - -# Generate SSL certs (without a passphrase) -ensure_dir_exists "${APACHE_CONF_DIR}/bitnami/certs" -if [[ ! -f "${APACHE_CONF_DIR}/bitnami/certs/server.crt" ]]; then - info "Generating sample certificates" - SSL_KEY_FILE="${APACHE_CONF_DIR}/bitnami/certs/server.key" - SSL_CERT_FILE="${APACHE_CONF_DIR}/bitnami/certs/server.crt" - SSL_CSR_FILE="${APACHE_CONF_DIR}/bitnami/certs/server.csr" - SSL_SUBJ="/CN=example.com" - SSL_EXT="subjectAltName=DNS:example.com,DNS:www.example.com,IP:127.0.0.1" - rm -f "$SSL_KEY_FILE" "$SSL_CERT_FILE" - openssl genrsa -out "$SSL_KEY_FILE" 4096 - # OpenSSL version 1.0.x does not use the same parameters as OpenSSL >= 1.1.x - if [[ "$(openssl version | grep -oE "[0-9]+\.[0-9]+")" == "1.0" ]]; then - openssl req -new -sha256 -out "$SSL_CSR_FILE" -key "$SSL_KEY_FILE" -nodes -subj "$SSL_SUBJ" - else - openssl req -new -sha256 -out "$SSL_CSR_FILE" -key "$SSL_KEY_FILE" -nodes -subj "$SSL_SUBJ" -addext "$SSL_EXT" - fi - openssl x509 -req -sha256 -in "$SSL_CSR_FILE" -signkey "$SSL_KEY_FILE" -out "$SSL_CERT_FILE" -days 1825 -extfile <(echo -n "$SSL_EXT") - rm -f "$SSL_CSR_FILE" -fi -# Load SSL configuration -if [[ -f "${APACHE_CONF_DIR}/bitnami/bitnami.conf" ]] && [[ -f "${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf" ]]; then - ensure_apache_configuration_exists "Include \"${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf\"" "bitnami-ssl\.conf" "${APACHE_CONF_DIR}/bitnami/bitnami.conf" -fi - -# Copy vhosts files -if ! is_dir_empty "/vhosts"; then - info "Found mounted virtual hosts in '/vhosts'. Copying them to '${APACHE_BASE_DIR}/conf/vhosts'" - cp -Lr "/vhosts/." "${APACHE_VHOSTS_DIR}" -fi - -# Mount certificate files -if ! is_dir_empty "${APACHE_BASE_DIR}/certs"; then - warn "The directory '${APACHE_BASE_DIR}/certs' was externally mounted. This is a legacy configuration and will be deprecated soon. Please mount certificate files at '/certs' instead. Find an example at: https://github.com/bitnami/containers/tree/main/bitnami/apache#using-custom-ssl-certificates" - warn "Restoring certificates at '${APACHE_BASE_DIR}/certs' to '${APACHE_CONF_DIR}/bitnami/certs'" - rm -rf "${APACHE_CONF_DIR}/bitnami/certs" - ln -sf "${APACHE_BASE_DIR}/certs" "${APACHE_CONF_DIR}/bitnami/certs" -elif ! is_dir_empty "/certs"; then - info "Mounting certificates files from '/certs'" - rm -rf "${APACHE_CONF_DIR}/bitnami/certs" - ln -sf "/certs" "${APACHE_CONF_DIR}/bitnami/certs" -fi - -# Mount application files -if ! is_dir_empty "/app"; then - info "Mounting application files from '/app'" - rm -rf "$APACHE_HTDOCS_DIR" - ln -sf "/app" "$APACHE_HTDOCS_DIR" -fi - -# Restore persisted configuration files (deprecated) -if ! is_dir_empty "/bitnami/apache/conf"; then - warn "The directory '/bitnami/apache/conf' was externally mounted. This is a legacy configuration and will be deprecated soon. Please mount certificate files at '${APACHE_CONF_DIR}' instead. Find an example at: https://github.com/bitnami/containers/tree/main/bitnami/apache#full-configuration" - warn "Restoring configuration at '/bitnami/apache/conf' to '${APACHE_CONF_DIR}'" - rm -rf "$APACHE_CONF_DIR" - ln -sf "/bitnami/apache/conf" "$APACHE_CONF_DIR" -fi - -# Update ports in configuration -[[ -n "$APACHE_HTTP_PORT_NUMBER" ]] && info "Configuring the HTTP port" && apache_configure_http_port "$APACHE_HTTP_PORT_NUMBER" -[[ -n "$APACHE_HTTPS_PORT_NUMBER" ]] && info "Configuring the HTTPS port" && apache_configure_https_port "$APACHE_HTTPS_PORT_NUMBER" - -# Configure ServerTokens with user values -[[ -n "$APACHE_SERVER_TOKENS" ]] && info "Configuring Apache ServerTokens directive" && apache_configure_server_tokens "$APACHE_SERVER_TOKENS" - -# Fix logging issue when running as root -! am_i_root || chmod o+w "$(readlink /dev/stdout)" "$(readlink /dev/stderr)" diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/start.sh b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/start.sh deleted file mode 100755 index 28425368c3326..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/start.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load libraries -. /opt/bitnami/scripts/libapache.sh -. /opt/bitnami/scripts/libos.sh -. /opt/bitnami/scripts/liblog.sh - -# Load Apache environment variables -. /opt/bitnami/scripts/apache-env.sh - -error_code=0 - -if is_apache_not_running; then - "${APACHE_BIN_DIR}/httpd" -f "$APACHE_CONF_FILE" - if ! retry_while "is_apache_running"; then - error "apache did not start" - error_code=1 - else - info "apache started" - fi -else - info "apache is already running" -fi - -exit "$error_code" diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/status.sh b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/status.sh deleted file mode 100755 index 825fe8d376206..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/status.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load libraries -. /opt/bitnami/scripts/libapache.sh -. /opt/bitnami/scripts/liblog.sh - -# Load Apache environment variables -. /opt/bitnami/scripts/apache-env.sh - -if is_apache_running; then - info "apache is already running" -else - info "apache is not running" -fi diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/stop.sh b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/stop.sh deleted file mode 100755 index 8cca0a07ac64a..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/apache/stop.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load libraries -. /opt/bitnami/scripts/libapache.sh -. /opt/bitnami/scripts/libos.sh -. /opt/bitnami/scripts/liblog.sh - -# Load Apache environment variables -. /opt/bitnami/scripts/apache-env.sh - -error_code=0 - -if is_apache_running; then - BITNAMI_QUIET=1 apache_stop - if ! retry_while "is_apache_not_running"; then - error "apache could not be stopped" - error_code=1 - else - info "apache stopped" - fi -else - info "apache is not running" -fi - -exit "$error_code" diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/drupal-env.sh b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/drupal-env.sh deleted file mode 100644 index d5ba3ac86026d..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/drupal-env.sh +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Environment configuration for drupal - -# The values for all environment variables will be set in the below order of precedence -# 1. Custom environment variables defined below after Bitnami defaults -# 2. Constants defined in this file (environment variables with no default), i.e. BITNAMI_ROOT_DIR -# 3. Environment variables overridden via external files using *_FILE variables (see below) -# 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata) - -# Load logging library -# shellcheck disable=SC1090,SC1091 -. /opt/bitnami/scripts/liblog.sh - -export BITNAMI_ROOT_DIR="/opt/bitnami" -export BITNAMI_VOLUME_DIR="/bitnami" - -# Logging configuration -export MODULE="${MODULE:-drupal}" -export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}" - -# By setting an environment variable matching *_FILE to a file path, the prefixed environment -# variable will be overridden with the value specified in that file -drupal_env_vars=( - DRUPAL_DATA_TO_PERSIST - DRUPAL_PROFILE - DRUPAL_SITE_NAME - DRUPAL_SKIP_BOOTSTRAP - DRUPAL_ENABLE_MODULES - DRUPAL_CONFIG_SYNC_DIR - DRUPAL_HASH_SALT - DRUPAL_USERNAME - DRUPAL_PASSWORD - DRUPAL_EMAIL - DRUPAL_SMTP_HOST - DRUPAL_SMTP_PORT_NUMBER - DRUPAL_SMTP_USER - DRUPAL_SMTP_PASSWORD - DRUPAL_SMTP_PROTOCOL - DRUPAL_DATABASE_HOST - DRUPAL_DATABASE_PORT_NUMBER - DRUPAL_DATABASE_NAME - DRUPAL_DATABASE_USER - DRUPAL_DATABASE_PASSWORD - DRUPAL_DATABASE_TLS_CA_FILE - SMTP_HOST - SMTP_PORT - DRUPAL_SMTP_PORT - SMTP_USER - SMTP_PASSWORD - SMTP_PROTOCOL - MARIADB_HOST - MARIADB_PORT_NUMBER -) -for env_var in "${drupal_env_vars[@]}"; do - file_env_var="${env_var}_FILE" - if [[ -n "${!file_env_var:-}" ]]; then - if [[ -r "${!file_env_var:-}" ]]; then - export "${env_var}=$(< "${!file_env_var}")" - unset "${file_env_var}" - else - warn "Skipping export of '${env_var}'. '${!file_env_var:-}' is not readable." - fi - fi -done -unset drupal_env_vars - -# Paths -export DRUPAL_BASE_DIR="${BITNAMI_ROOT_DIR}/drupal" -export DRUPAL_CONF_FILE="${DRUPAL_BASE_DIR}/sites/default/settings.php" -export DRUPAL_MODULES_DIR="${DRUPAL_BASE_DIR}/modules" - -# Drupal persistence configuration -export DRUPAL_VOLUME_DIR="${BITNAMI_VOLUME_DIR}/drupal" -export DRUPAL_MOUNTED_CONF_FILE="${DRUPAL_VOLUME_DIR}/settings.php" -export DRUPAL_DATA_TO_PERSIST="${DRUPAL_DATA_TO_PERSIST:-sites/ themes/ modules/ profiles/}" - -# Drupal configuration -export DRUPAL_PROFILE="${DRUPAL_PROFILE:-standard}" # only used during the first initialization -export DRUPAL_SITE_NAME="${DRUPAL_SITE_NAME:-My blog}" # only used during the first initialization -export DRUPAL_SKIP_BOOTSTRAP="${DRUPAL_SKIP_BOOTSTRAP:-}" # only used during the first initialization -export DRUPAL_ENABLE_MODULES="${DRUPAL_ENABLE_MODULES:-}" # only used during the first initialization -export DRUPAL_CONFIG_SYNC_DIR="${DRUPAL_CONFIG_SYNC_DIR:-}" # only used during the first initialization -export DRUPAL_HASH_SALT="${DRUPAL_HASH_SALT:-}" # only used during the first initialization - -# Drupal credentials -export DRUPAL_USERNAME="${DRUPAL_USERNAME:-user}" # only used during the first initialization -export DRUPAL_PASSWORD="${DRUPAL_PASSWORD:-bitnami}" # only used during the first initialization -export DRUPAL_EMAIL="${DRUPAL_EMAIL:-user@example.com}" # only used during the first initialization - -# Drupal SMTP credentials -DRUPAL_SMTP_HOST="${DRUPAL_SMTP_HOST:-"${SMTP_HOST:-}"}" -export DRUPAL_SMTP_HOST="${DRUPAL_SMTP_HOST:-}" # only used during the first initialization -DRUPAL_SMTP_PORT_NUMBER="${DRUPAL_SMTP_PORT_NUMBER:-"${SMTP_PORT:-}"}" -DRUPAL_SMTP_PORT_NUMBER="${DRUPAL_SMTP_PORT_NUMBER:-"${DRUPAL_SMTP_PORT:-}"}" -export DRUPAL_SMTP_PORT_NUMBER="${DRUPAL_SMTP_PORT_NUMBER:-25}" # only used during the first initialization -DRUPAL_SMTP_USER="${DRUPAL_SMTP_USER:-"${SMTP_USER:-}"}" -export DRUPAL_SMTP_USER="${DRUPAL_SMTP_USER:-}" # only used during the first initialization -DRUPAL_SMTP_PASSWORD="${DRUPAL_SMTP_PASSWORD:-"${SMTP_PASSWORD:-}"}" -export DRUPAL_SMTP_PASSWORD="${DRUPAL_SMTP_PASSWORD:-}" # only used during the first initialization -DRUPAL_SMTP_PROTOCOL="${DRUPAL_SMTP_PROTOCOL:-"${SMTP_PROTOCOL:-}"}" -export DRUPAL_SMTP_PROTOCOL="${DRUPAL_SMTP_PROTOCOL:-standard}" # only used during the first initialization - -# Database configuration -export DRUPAL_DEFAULT_DATABASE_HOST="mariadb" # only used at build time -DRUPAL_DATABASE_HOST="${DRUPAL_DATABASE_HOST:-"${MARIADB_HOST:-}"}" -export DRUPAL_DATABASE_HOST="${DRUPAL_DATABASE_HOST:-$DRUPAL_DEFAULT_DATABASE_HOST}" # only used during the first initialization -DRUPAL_DATABASE_PORT_NUMBER="${DRUPAL_DATABASE_PORT_NUMBER:-"${MARIADB_PORT_NUMBER:-}"}" -export DRUPAL_DATABASE_PORT_NUMBER="${DRUPAL_DATABASE_PORT_NUMBER:-3306}" # only used during the first initialization -export DRUPAL_DATABASE_NAME="${DRUPAL_DATABASE_NAME:-bitnami_drupal}" # only used during the first initialization -export DRUPAL_DATABASE_USER="${DRUPAL_DATABASE_USER:-bn_drupal}" # only used during the first initialization -export DRUPAL_DATABASE_PASSWORD="${DRUPAL_DATABASE_PASSWORD:-}" # only used during the first initialization -export DRUPAL_DATABASE_TLS_CA_FILE="${DRUPAL_DATABASE_TLS_CA_FILE:-}" # only used during the first initialization - -# PHP configuration -export PHP_DEFAULT_MEMORY_LIMIT="256M" # only used at build time - -# Custom environment variables may be defined below diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/drupal/postunpack.sh b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/drupal/postunpack.sh deleted file mode 100755 index f20ef95c82f4d..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/drupal/postunpack.sh +++ /dev/null @@ -1,129 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1090,SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load Drupal environment -. /opt/bitnami/scripts/drupal-env.sh - -# Load PHP environment for 'php_conf_set' (after 'drupal-env.sh' so that MODULE is not set to a wrong value) -. /opt/bitnami/scripts/php-env.sh - -# Load libraries -. /opt/bitnami/scripts/libdrupal.sh -. /opt/bitnami/scripts/libfile.sh -. /opt/bitnami/scripts/libfs.sh -. /opt/bitnami/scripts/liblog.sh -. /opt/bitnami/scripts/libphp.sh -. /opt/bitnami/scripts/libwebserver.sh - -# Load web server environment and functions (after Drupal environment file so MODULE is not set to a wrong value) -. "/opt/bitnami/scripts/$(web_server_type)-env.sh" - -# Enable Drupal configuration file -[[ ! -f "$DRUPAL_CONF_FILE" ]] && cp "${DRUPAL_BASE_DIR}/sites/default/default.settings.php" "$DRUPAL_CONF_FILE" - -# Create .htaccess file to avoid warning in Drupal administration panel -drupal_fix_htaccess_warning_protection - -# Ensure the Drupal base directory exists and has proper permissions -info "Configuring file permissions for Drupal" -for dir in "$DRUPAL_BASE_DIR" "${DRUPAL_BASE_DIR}/sites/default/files" "$DRUPAL_VOLUME_DIR" "${HOME}/.drush"; do - ensure_dir_exists "$dir" - configure_permissions_ownership "$dir" -d "775" -f "664" -done -for dir in "${DRUPAL_BASE_DIR}/themes" "${DRUPAL_BASE_DIR}/modules" "${DRUPAL_BASE_DIR}/sites/default/files"; do - ensure_dir_exists "$dir" - configure_permissions_ownership "$dir" -u "$WEB_SERVER_DAEMON_USER" -g "root" -done -chown "$WEB_SERVER_DAEMON_USER" "${DRUPAL_BASE_DIR}/sites/default" -chown "$WEB_SERVER_DAEMON_USER" "$DRUPAL_CONF_FILE" -for script in "${DRUPAL_BASE_DIR}/vendor/bin/drush" "${DRUPAL_BASE_DIR}/vendor/drush/drush/drush" "${DRUPAL_BASE_DIR}/vendor/drush/drush/drush.launcher" "${DRUPAL_BASE_DIR}/vendor/bin/drush.launcher"; do - [[ -f "$script" ]] && chmod +x "$script" -done - -# Configure Drupal based on build-time defaults -drupal_conf_set "\$settings['trusted_host_patterns']" "array('^.*$')" yes - -# Configure required PHP options for application to work properly, based on build-time defaults -info "Configuring default PHP options for Drupal" -php_conf_set memory_limit "$PHP_DEFAULT_MEMORY_LIMIT" - -# Enable default web server configuration for Drupal -info "Creating default web server configuration for Drupal" -web_server_validate -ensure_web_server_app_configuration_exists "drupal" \ - --type php \ - --nginx-additional-configuration $' -location = /favicon.ico { - log_not_found off; - access_log off; -} - -location = /robots.txt { - allow all; - log_not_found off; - access_log off; -} - -location ~ ^/sites/.*/private/ { - return 403; -} - -# Block access to scripts in site files directory -location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; -} - -# Allow "Well-Known URIs" as per RFC 5785 -location ~* ^/.well-known/ { - allow all; -} - -location / { - try_files $uri /index.php?$query_string; -} - -location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; -} - -# Don\'t allow direct access to PHP files in the vendor directory. -location ~ /vendor/.*\.php$ { - deny all; - return 404; -} - -# Fighting with Styles? This little gem is amazing. -location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; -} - -# Handle private files through Drupal. Private file\'s path can come -# with a language prefix. -location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; -} - -location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; -}' - -# Fix common issues running Drupal on top of the NGINX web server, if enabled -# See: https://pantheon.io/blog/update-your-nginx-config-drupal-8 -nginx_php_fpm_conf_file="${BITNAMI_ROOT_DIR}/nginx/conf/bitnami/php-fpm.conf" -if [[ -f "$nginx_php_fpm_conf_file" ]]; then - replace_in_file "$nginx_php_fpm_conf_file" '^(\s*)(fastcgi_index\s+index\.php;)$' '\1\2\n\1fastcgi_split_path_info ^(.+?\.php)(|/.*)$;' - replace_in_file "$nginx_php_fpm_conf_file" '(\s\\.php\$)(\s)' '\1|^/update.php\2' -fi - -# Re-create .htaccess file after being moved into 'apache/conf/vhosts/htaccess' directory, to avoid Drupal warning -drupal_fix_htaccess_warning_protection diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/drupal/setup.sh b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/drupal/setup.sh deleted file mode 100755 index 270c64aaafc86..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/drupal/setup.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1090,SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load Drupal environment -. /opt/bitnami/scripts/drupal-env.sh - -# Load MySQL Client environment for 'mysql_remote_execute' (after 'drupal-env.sh' so that MODULE is not set to a wrong value) -if [[ -f /opt/bitnami/scripts/mysql-client-env.sh ]]; then - . /opt/bitnami/scripts/mysql-client-env.sh -elif [[ -f /opt/bitnami/scripts/mysql-env.sh ]]; then - . /opt/bitnami/scripts/mysql-env.sh -elif [[ -f /opt/bitnami/scripts/mariadb-env.sh ]]; then - . /opt/bitnami/scripts/mariadb-env.sh -fi - -# Load libraries -. /opt/bitnami/scripts/libdrupal.sh -. /opt/bitnami/scripts/libwebserver.sh - -# Load web server environment and functions (after Drupal environment file so MODULE is not set to a wrong value) -. "/opt/bitnami/scripts/$(web_server_type)-env.sh" - -# Ensure Drupal environment variables are valid -drupal_validate - -# Update web server configuration with runtime environment (needs to happen before the initialization) -web_server_update_app_configuration "drupal" - -# Ensure Drupal is initialized -drupal_initialize diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/libapache.sh b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/libapache.sh deleted file mode 100644 index c83892a10c5f1..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/libapache.sh +++ /dev/null @@ -1,808 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Bitnami Apache library - -# shellcheck disable=SC1091 - -# Load Generic Libraries -. /opt/bitnami/scripts/libfs.sh -. /opt/bitnami/scripts/libfile.sh -. /opt/bitnami/scripts/liblog.sh -. /opt/bitnami/scripts/libos.sh -. /opt/bitnami/scripts/libvalidations.sh -. /opt/bitnami/scripts/libservice.sh - -######################## -# Validate settings in APACHE_* env vars -# Globals: -# APACHE_* -# Arguments: -# None -# Returns: -# None -######################### -apache_validate() { - debug "Validating settings in APACHE_* environment variables" - local error_code=0 - - # Auxiliary functions - print_validation_error() { - error "$1" - error_code=1 - } - - check_allowed_port() { - local port_var="${1:?missing port variable}" - local -a validate_port_args=() - ! am_i_root && validate_port_args+=("-unprivileged") - validate_port_args+=("${!port_var}") - if ! err=$(validate_port "${validate_port_args[@]}"); then - print_validation_error "An invalid port was specified in the environment variable ${port_var}: ${err}." - fi - } - - [[ -w "$APACHE_CONF_FILE" ]] || warn "The Apache configuration file '${APACHE_CONF_FILE}' is not writable. Configurations based on environment variables will not be applied." - - if [[ -n "$APACHE_HTTP_PORT_NUMBER" ]] && [[ -n "$APACHE_HTTPS_PORT_NUMBER" ]]; then - if [[ "$APACHE_HTTP_PORT_NUMBER" -eq "$APACHE_HTTPS_PORT_NUMBER" ]]; then - print_validation_error "APACHE_HTTP_PORT_NUMBER and APACHE_HTTPS_PORT_NUMBER are bound to the same port!" - fi - fi - - [[ -n "$APACHE_HTTP_PORT_NUMBER" ]] && check_allowed_port APACHE_HTTP_PORT_NUMBER - [[ -n "$APACHE_HTTPS_PORT_NUMBER" ]] && check_allowed_port APACHE_HTTPS_PORT_NUMBER - - [[ "$error_code" -eq 0 ]] || exit "$error_code" -} - -######################## -# Configure Apache's HTTP port -# Globals: -# APACHE_CONF_FILE, APACHE_CONF_DIR -# Arguments: -# None -# Returns: -# None -######################### -apache_configure_http_port() { - local -r port=${1:?missing port} - local -r listen_exp="s|^\s*Listen\s+([^:]*:)?[0-9]+\s*$|Listen ${port}|" - local -r server_name_exp="s|^\s*#?\s*ServerName\s+([^:\s]+)(:[0-9]+)?$|ServerName \1:${port}|" - local -r vhost_exp="s|VirtualHost\s+([^:>]+)(:[0-9]+)|VirtualHost \1:${port}|" - local apache_configuration - - if [[ -w "$APACHE_CONF_FILE" ]]; then - debug "Configuring port ${port} on file ${APACHE_CONF_FILE}" - apache_configuration="$(sed -E -e "$listen_exp" -e "$server_name_exp" "$APACHE_CONF_FILE")" - echo "$apache_configuration" > "$APACHE_CONF_FILE" - fi - - if [[ -w "${APACHE_CONF_DIR}/bitnami/bitnami.conf" ]]; then - debug "Configuring port ${port} on file ${APACHE_CONF_DIR}/bitnami/bitnami.conf" - apache_configuration="$(sed -E "$vhost_exp" "${APACHE_CONF_DIR}/bitnami/bitnami.conf")" - echo "$apache_configuration" > "${APACHE_CONF_DIR}/bitnami/bitnami.conf" - fi - - if [[ -w "${APACHE_VHOSTS_DIR}/00_status-vhost.conf" ]]; then - debug "Configuring port ${port} on file ${APACHE_VHOSTS_DIR}/00_status-vhost.conf" - apache_configuration="$(sed -E "$vhost_exp" "${APACHE_VHOSTS_DIR}/00_status-vhost.conf")" - echo "$apache_configuration" > "${APACHE_VHOSTS_DIR}/00_status-vhost.conf" - fi -} - -######################## -# Configure Apache's HTTPS port -# Globals: -# APACHE_CONF_DIR -# Arguments: -# None -# Returns: -# None -######################### -apache_configure_https_port() { - local -r port=${1:?missing port} - local -r listen_exp="s|^\s*Listen\s+([^:]*:)?[0-9]+\s*$|Listen ${port}|" - local -r vhost_exp="s|VirtualHost\s+([^:>]+)(:[0-9]+)|VirtualHost \1:${port}|" - local apache_configuration - - if [[ -w "${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf" ]]; then - debug "Configuring port ${port} on file ${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf" - apache_configuration="$(sed -E -e "$listen_exp" -e "$vhost_exp" "${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf")" - echo "$apache_configuration" > "${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf" - fi -} - -######################## -# Configure Apache's ServerTokens directive -# Globals: -# APACHE_CONF_DIR -# Arguments: -# $1 - Value for ServerTokens directive -# Returns: -# None -######################### -apache_configure_server_tokens() { - local -r value=${1:?missing value} - local -r server_tokens_exp="s|^\s*ServerTokens\s+\w+\s*$|ServerTokens ${value}|" - local apache_configuration - - if [[ -w "$APACHE_CONF_FILE" ]]; then - debug "Configuring ServerTokens ${value} on file ${APACHE_CONF_FILE}" - apache_configuration="$(sed -E -e "$server_tokens_exp" "$APACHE_CONF_FILE")" - echo "$apache_configuration" > "$APACHE_CONF_FILE" - fi -} - -######################## -# Enable a module in the Apache configuration file -# Globals: -# APACHE_CONF_FILE -# Arguments: -# $1 - Module to enable -# $2 - Path to module .so file (optional if already defined in httpd.conf) -# Returns: -# None -######################### -apache_enable_module() { - local -r name="${1:?missing name}" - local -r file="${2:-}" - local -r regex="[#\s]*(LoadModule\s+${name}\s+.*)$" - local apache_configuration - - if [[ -w "$APACHE_CONF_FILE" ]]; then - debug "Enabling module '${name}'" - if grep -q -E "$regex" "$APACHE_CONF_FILE"; then - # Uncomment line if the module was already defined - replace_in_file "$APACHE_CONF_FILE" "$regex" "\1" - elif [[ -n "$file" ]]; then - # Add right after the last LoadModule, so all Apache modules are organized in the same section of the file - append_file_after_last_match "$APACHE_CONF_FILE" "^[#\s]*LoadModule" "LoadModule ${name} ${file}" - else - error "Module ${name} was not defined in ${APACHE_CONF_FILE}. Please specify the 'file' parameter for 'apache_enable_module'." - fi - fi -} - -######################## -# Disable a module in the Apache configuration file -# Globals: -# APACHE_CONF_FILE -# Arguments: -# $1 - Module to disable -# Returns: -# None -######################### -apache_disable_module() { - local -r name="${1:?missing name}" - local -r file="${2:-}" - local -r regex="[#\s]*(LoadModule\s+${name}\s+.*)$" - local apache_configuration - - if [[ -w "$APACHE_CONF_FILE" ]]; then - debug "Disabling module '${name}'" - replace_in_file "$APACHE_CONF_FILE" "$regex" "#\1" - fi -} - -######################## -# Stop Apache -# Globals: -# APACHE_* -# Arguments: -# None -# Returns: -# None -######################### -apache_stop() { - is_apache_not_running && return - stop_service_using_pid "$APACHE_PID_FILE" -} - -######################## -# Check if Apache is running -# Globals: -# APACHE_PID_FILE -# Arguments: -# None -# Returns: -# Whether Apache is running -######################## -is_apache_running() { - local pid - pid="$(get_pid_from_file "$APACHE_PID_FILE")" - if [[ -n "$pid" ]]; then - is_service_running "$pid" - else - false - fi -} - -######################## -# Check if Apache is running -# Globals: -# APACHE_PID_FILE -# Arguments: -# None -# Returns: -# Whether Apache is not running -######################## -is_apache_not_running() { - ! is_apache_running -} - -######################## -# Ensure configuration gets added to the main Apache configuration file -# Globals: -# APACHE_* -# Arguments: -# $1 - configuration string -# $2 - pattern to use for checking if the configuration already exists (default: $1) -# $3 - Apache configuration file (default: $APACHE_CONF_FILE) -# Returns: -# None -######################## -ensure_apache_configuration_exists() { - local -r conf="${1:?conf missing}" - local -r pattern="${2:-"$conf"}" - local -r conf_file="${3:-"$APACHE_CONF_FILE"}" - # Enable configuration by appending to httpd.conf - if ! grep -E -q "$pattern" "$conf_file"; then - if is_file_writable "$conf_file"; then - cat >> "$conf_file" <<< "$conf" - else - error "Could not add the following configuration to '${conf_file}:" - error "" - error "$(indent "$conf" 4)" - error "" - error "Include the configuration manually and try again." - return 1 - fi - fi -} - -######################## -# Collect all the .htaccess files from /opt/bitnami/$name and write the result in the 'htaccess' directory -# Globals: -# APACHE_* -# Arguments: -# $1 - App name -# $2 - Overwrite the original .htaccess with the explanation text (defaults to 'yes') -# Flags: -# --document-root - Path to document root directory -# Returns: -# None -######################## -apache_replace_htaccess_files() { - local -r app="${1:?missing app}" - local -r result_file="${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" - # Default options - local document_root="${BITNAMI_ROOT_DIR}/${app}" - local overwrite="yes" - local -a htaccess_files - local htaccess_dir - local htaccess_contents - # Validate arguments - shift - while [[ "$#" -gt 0 ]]; do - case "$1" in - --document-root) - shift - document_root="$1" - ;; - --overwrite) - shift - overwrite="$1" - ;; - *) - echo "Invalid command line flag ${1}" >&2 - return 1 - ;; - esac - shift - done - if is_file_writable "$result_file"; then - # Locate all .htaccess files inside the document root - read -r -a htaccess_files <<< "$(find "$document_root" -name .htaccess -print0 | xargs -0)" - [[ "${#htaccess_files[@]}" = 0 ]] && return - # Create file with root group write privileges, so it can be modified in non-root containers - [[ ! -f "$result_file" ]] && touch "$result_file" && chmod g+rw "$result_file" - for htaccess_file in "${htaccess_files[@]}"; do - htaccess_dir="$(dirname "$htaccess_file")" - htaccess_contents="$(indent "$(< "$htaccess_file")" 2)" - # Skip if it was already included to the resulting htaccess file - if grep -q "^" <<< "$htaccess_contents"; then - continue - fi - # Add to the htaccess file - cat >> "$result_file" < -${htaccess_contents} - -EOF - # Overwrite the original .htaccess with the explanation text - if is_boolean_yes "$overwrite"; then - echo "# This configuration has been moved to the ${result_file} config file for performance and security reasons" > "$htaccess_file" - fi - done - elif [[ ! -f "$result_file" ]]; then - error "Could not create htaccess for ${app} at '${result_file}'. Check permissions and ownership for parent directories." - return 1 - else - warn "The ${app} htaccess file '${result_file}' is not writable. Configurations based on environment variables will not be applied for this file." - return - fi -} - -######################## -# Ensure an Apache application configuration exists (in virtual host format) -# Globals: -# APACHE_* -# Arguments: -# $1 - App name -# Flags: -# --type - Application type, which has an effect on what configuration template will be used, allowed values: php, (empty) -# --hosts - Host listen addresses -# --server-name - Server name -# --server-aliases - Server aliases (defaults to '*') -# --allow-remote-connections - Whether to allow remote connections or to require local connections -# --disable - Whether to render the app's virtual hosts with a .disabled prefix -# --disable-http - Whether to render the app's HTTP virtual host with a .disabled prefix -# --disable-https - Whether to render the app's HTTPS virtual host with a .disabled prefix -# --http-port - HTTP port number -# --https-port - HTTPS port number -# --move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup (only allowed when type is not defined) -# --additional-configuration - Additional vhost configuration (no default) -# --additional-http-configuration - Additional HTTP vhost configuration (no default) -# --additional-https-configuration - Additional HTTPS vhost configuration (no default) -# --before-vhost-configuration - Configuration to add before the directive (no default) -# --allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no' and type is not defined) -# --document-root - Path to document root directory -# --extra-directory-configuration - Extra configuration for the document root directory -# --proxy-address - Address where to proxy requests -# --proxy-configuration - Extra configuration for the proxy -# --proxy-http-configuration - Extra configuration for the proxy HTTP vhost -# --proxy-https-configuration - Extra configuration for the proxy HTTPS vhost -# Returns: -# true if the configuration was enabled, false otherwise -######################## -ensure_apache_app_configuration_exists() { - local -r app="${1:?missing app}" - # Default options - local type="" - local -a hosts=("127.0.0.1" "_default_") - local server_name="www.example.com" # Default ServerName in httpd.conf - local -a server_aliases=("*") - local allow_remote_connections="yes" - local disable="no" - local disable_http="no" - local disable_https="no" - local move_htaccess="yes" - # Template variables defaults - export additional_configuration="" - export additional_http_configuration="" - export additional_https_configuration="" - export before_vhost_configuration="" - export allow_override="All" - export document_root="${BITNAMI_ROOT_DIR}/${app}" - export extra_directory_configuration="" - export default_http_port="${APACHE_HTTP_PORT_NUMBER:-"$APACHE_DEFAULT_HTTP_PORT_NUMBER"}" - export default_https_port="${APACHE_HTTPS_PORT_NUMBER:-"$APACHE_DEFAULT_HTTPS_PORT_NUMBER"}" - export http_port="$default_http_port" - export https_port="$default_https_port" - export proxy_address="" - export proxy_configuration="" - export proxy_http_configuration="" - export proxy_https_configuration="" - # Validate arguments - local var_name - shift - while [[ "$#" -gt 0 ]]; do - case "$1" in - --hosts \ - | --server-aliases) - var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" - shift - read -r -a "${var_name?}" <<< "$1" - ;; - --disable \ - | --disable-http \ - | --disable-https \ - ) - var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" - export "${var_name}=yes" - ;; - --type \ - | --server-name \ - | --allow-remote-connections \ - | --http-port \ - | --https-port \ - | --move-htaccess \ - | --additional-configuration \ - | --additional-http-configuration \ - | --additional-https-configuration \ - | --before-vhost-configuration \ - | --allow-override \ - | --document-root \ - | --extra-directory-configuration \ - | --proxy-address \ - | --proxy-configuration \ - | --proxy-http-configuration \ - | --proxy-https-configuration \ - ) - var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" - shift - export "${var_name}=${1}" - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - # Construct listen ports configuration (only to add when using non-standard ports) - export http_listen_configuration="" - export https_listen_configuration="" - [[ "$http_port" != "$default_http_port" ]] && http_listen_configuration="Listen ${http_port}" - [[ "$https_port" != "$default_https_port" ]] && https_listen_configuration="Listen ${https_port}" - # Construct host string in the format of "host1:port1[ host2:port2[ ...]]" - export http_listen_addresses="" - export https_listen_addresses="" - for host in "${hosts[@]}"; do - http_listen="${host}:${http_port}" - https_listen="${host}:${https_port}" - [[ -z "${http_listen_addresses:-}" ]] && http_listen_addresses="$http_listen" || http_listen_addresses="${http_listen_addresses} ${http_listen}" - [[ -z "${https_listen_addresses:-}" ]] && https_listen_addresses="$https_listen" || https_listen_addresses="${https_listen_addresses} ${https_listen}" - done - # Construct ServerName/ServerAlias block - export server_name_configuration="" - if ! is_empty_value "${server_name:-}"; then - server_name_configuration="ServerName ${server_name}" - fi - if [[ "${#server_aliases[@]}" -gt 0 ]]; then - server_name_configuration+=$'\n'"ServerAlias ${server_aliases[*]}" - fi - # App .htaccess support (only when type is not defined) - export htaccess_include - [[ -z "$type" || "$type" = "php" ]] && is_boolean_yes "$move_htaccess" && apache_replace_htaccess_files "$app" --document-root "$document_root" - if [[ -z "$type" || "$type" = "php" ]] && [[ -f "${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" ]]; then - allow_override="None" - htaccess_include="Include \"${APACHE_HTACCESS_DIR}/${app}-htaccess.conf\"" - else - # allow_override is already set to the expected value - htaccess_include="" - fi - # ACL configuration - export acl_configuration - if is_boolean_yes "$allow_remote_connections"; then - acl_configuration="Require all granted" - else - acl_configuration="$(cat < "$http_vhost" - elif [[ ! -f "$http_vhost" ]]; then - error "Could not create virtual host for ${app} at '${http_vhost}'. Check permissions and ownership for parent directories." - return 1 - else - warn "The ${app} virtual host file '${http_vhost}' is not writable. Configurations based on environment variables will not be applied for this file." - fi - if is_file_writable "$https_vhost"; then - # Create file with root group write privileges, so it can be modified in non-root containers - [[ ! -f "$https_vhost" ]] && touch "$https_vhost" && chmod g+rw "$https_vhost" - render-template "${template_dir}/${template_name}-https-vhost.conf.tpl" | sed '/^\s*$/d' > "$https_vhost" - elif [[ ! -f "$https_vhost" ]]; then - error "Could not create virtual host for ${app} at '${https_vhost}'. Check permissions and ownership for parent directories." - return 1 - else - warn "The ${app} virtual host file '${https_vhost}' is not writable. Configurations based on environment variables will not be applied for this file." - fi -} - -######################## -# Ensure an Apache application configuration does not exist anymore (in virtual hosts format) -# Globals: -# * -# Arguments: -# $1 - App name -# Returns: -# true if the configuration was disabled, false otherwise -######################## -ensure_apache_app_configuration_not_exists() { - local -r app="${1:?missing app}" - local -r http_vhost="${APACHE_VHOSTS_DIR}/${app}-vhost.conf" - local -r https_vhost="${APACHE_VHOSTS_DIR}/${app}-https-vhost.conf" - local -r disable_suffix=".disabled" - # Note that 'rm -f' will not fail if the files don't exist - # However if we lack permissions to remove the file, it will result in a non-zero exit code, as expected by this function - rm -f "$http_vhost" "$https_vhost" "${http_vhost}${disable_suffix}" "${https_vhost}${disable_suffix}" -} - -######################## -# Ensure Apache loads the configuration for an application in a URL prefix -# Globals: -# APACHE_* -# Arguments: -# $1 - App name -# Flags: -# --type - Application type, which has an effect on what configuration template will be used, allowed values: php, (empty) -# --allow-remote-connections - Whether to allow remote connections or to require local connections -# --move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup (only allowed when type is not defined) -# --prefix - URL prefix from where it will be accessible (i.e. /myapp) -# --additional-configuration - Additional vhost configuration (no default) -# --allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no' and type is not defined) -# --document-root - Path to document root directory -# --extra-directory-configuration - Extra configuration for the document root directory -# Returns: -# true if the configuration was enabled, false otherwise -######################## -ensure_apache_prefix_configuration_exists() { - local -r app="${1:?missing app}" - # Default options - local type="" - local allow_remote_connections="yes" - local move_htaccess="yes" - local prefix="/${app}" - # Template variables defaults - export additional_configuration="" - export allow_override="All" - export document_root="${BITNAMI_ROOT_DIR}/${app}" - export extra_directory_configuration="" - # Validate arguments - local var_name - shift - while [[ "$#" -gt 0 ]]; do - case "$1" in - --type \ - | --allow-remote-connections \ - | --move-htaccess \ - | --prefix \ - | --additional-configuration \ - | --allow-override \ - | --document-root \ - | --extra-directory-configuration \ - ) - var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" - shift - declare "${var_name}=${1}" - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - # App .htaccess support (only when type is not defined) - export htaccess_include - [[ -z "$type" || "$type" = "php" ]] && is_boolean_yes "$move_htaccess" && apache_replace_htaccess_files "$app" --document-root "$document_root" - if [[ -z "$type" || "$type" = "php" ]] && [[ -f "${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" ]]; then - allow_override="None" - htaccess_include="Include \"${APACHE_HTACCESS_DIR}/${app}-htaccess.conf\"" - else - # allow_override is already set to the expected value - htaccess_include="" - fi - # ACL configuration - export acl_configuration - if is_boolean_yes "$allow_remote_connections"; then - acl_configuration="Require all granted" - else - acl_configuration="$(cat < "$prefix_file" - ensure_apache_configuration_exists "Include \"$prefix_file\"" - elif [[ ! -f "$prefix_file" ]]; then - error "Could not create web server configuration file for ${app} at '${prefix_file}'. Check permissions and ownership for parent directories." - return 1 - else - warn "The ${app} web server configuration file '${prefix_file}' is not writable. Configurations based on environment variables will not be applied for this file." - fi -} - -######################## -# Ensure Apache application configuration is updated with the runtime configuration (i.e. ports) -# Globals: -# * -# Arguments: -# $1 - App name -# Flags: -# --hosts - Host listen addresses -# --server-name - Server name -# --server-aliases - Server aliases -# --enable-http - Enable HTTP app configuration (if not enabled already) -# --enable-https - Enable HTTPS app configuration (if not enabled already) -# --disable-http - Disable HTTP app configuration (if not disabled already) -# --disable-https - Disable HTTPS app configuration (if not disabled already) -# --http-port - HTTP port number -# --https-port - HTTPS port number -# Returns: -# true if the configuration was updated, false otherwise -######################## -apache_update_app_configuration() { - local -r app="${1:?missing app}" - # Default options - local -a hosts=("127.0.0.1" "_default_") - local server_name="www.example.com" # Default ServerName in httpd.conf - local -a server_aliases=() - local enable_http="no" - local enable_https="no" - local disable_http="no" - local disable_https="no" - export default_http_port="${APACHE_HTTP_PORT_NUMBER:-"$APACHE_DEFAULT_HTTP_PORT_NUMBER"}" - export default_https_port="${APACHE_HTTPS_PORT_NUMBER:-"$APACHE_DEFAULT_HTTPS_PORT_NUMBER"}" - export http_port="$default_http_port" - export https_port="$default_https_port" - local var_name - # Validate arguments - local var_name - shift - while [[ "$#" -gt 0 ]]; do - case "$1" in - --hosts \ - | --server-aliases) - var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" - shift - read -r -a "${var_name?}" <<< "$1" - ;; - # Common flags - --enable-http \ - | --enable-https \ - | --disable-http \ - | --disable-https \ - ) - var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" - declare "${var_name}=yes" - ;; - --server-name \ - | --http-port \ - | --https-port \ - ) - var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" - shift - declare "${var_name}=${1}" - ;; - - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - # Construct host string in the format of "host1:port1[ host2:port2[ ...]]" - export http_listen_addresses="" - export https_listen_addresses="" - for host in "${hosts[@]}"; do - http_listen="${host}:${http_port}" - https_listen="${host}:${https_port}" - [[ -z "${http_listen_addresses:-}" ]] && http_listen_addresses="$http_listen" || http_listen_addresses="${http_listen_addresses} ${http_listen}" - [[ -z "${https_listen_addresses:-}" ]] && https_listen_addresses="$https_listen" || https_listen_addresses="${https_listen_addresses} ${https_listen}" - done - # Update configuration - local -r http_vhost="${APACHE_VHOSTS_DIR}/${app}-vhost.conf" - local -r https_vhost="${APACHE_VHOSTS_DIR}/${app}-https-vhost.conf" - local -r disable_suffix=".disabled" - # Helper function to avoid duplicating code - update_common_vhost_config() { - local -r vhost_file="${1:?missing virtual host}" - # Update ServerName - if ! is_empty_value "${server_name:-}"; then - replace_in_file "$vhost_file" "^(\s*ServerName\s+).*" "\1${server_name}" - fi - # Update ServerAlias - if [[ "${#server_aliases[@]}" -gt 0 ]]; then - replace_in_file "$vhost_file" "^(\s*ServerAlias\s+).*" "\1${server_aliases[*]}" - fi - } - # Disable and enable configuration files - rename_conf_file() { - local -r origin="$1" - local -r destination="$2" - if is_file_writable "$origin" && is_file_writable "$destination"; then - warn "Could not rename virtual host file '${origin}' to '${destination}' due to lack of permissions." - else - mv "$origin" "$destination" - fi - } - is_boolean_yes "$disable_http" && [[ -e "$http_vhost" ]] && rename_conf_file "${http_vhost}${disable_suffix}" "$http_vhost" - is_boolean_yes "$disable_https" && [[ -e "$https_vhost" ]] && rename_conf_file "${https_vhost}${disable_suffix}" "$https_vhost" - is_boolean_yes "$enable_http" && [[ -e "${http_vhost}${disable_suffix}" ]] && rename_conf_file "${http_vhost}${disable_suffix}" "$http_vhost" - is_boolean_yes "$enable_https" && [[ -e "${https_vhost}${disable_suffix}" ]] && rename_conf_file "${https_vhost}${disable_suffix}" "$https_vhost" - # Update only configuration files without the '.disabled' suffix - if [[ -e "$http_vhost" ]]; then - if is_file_writable "$http_vhost"; then - update_common_vhost_config "$http_vhost" - # Update vhost-specific config (listen port and addresses) - replace_in_file "$http_vhost" "^Listen .*" "Listen ${http_port}" - replace_in_file "$http_vhost" "^$" "" - else - warn "The ${app} virtual host file '${http_vhost}' is not writable. Configurations based on environment variables will not be applied for this file." - fi - fi - if [[ -e "$https_vhost" ]]; then - if is_file_writable "$https_vhost"; then - update_common_vhost_config "$https_vhost" - # Update vhost-specific config (listen port and addresses) - replace_in_file "$https_vhost" "^Listen .*" "Listen ${https_port}" - replace_in_file "$https_vhost" "^$" "" - else - warn "The ${app} virtual host file '${https_vhost}' is not writable. Configurations based on environment variables will not be applied for this file." - fi - fi -} - -######################## -# Create a password file for basic authentication and restrict its permissions -# Globals: -# * -# Arguments: -# $1 - file -# $2 - username -# $3 - password -# Returns: -# true if the configuration was updated, false otherwise -######################## -apache_create_password_file() { - local -r file="${1:?missing file}" - local -r username="${2:?missing username}" - local -r password="${3:?missing password}" - - "${APACHE_BIN_DIR}/htpasswd" -bc "$file" "$username" "$password" - am_i_root && configure_permissions_ownership "$file" --file-mode "600" --user "$APACHE_DAEMON_USER" --group "$APACHE_DAEMON_GROUP" -} diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/libdrupal.sh b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/libdrupal.sh deleted file mode 100644 index 2ee0d89de4ed5..0000000000000 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/libdrupal.sh +++ /dev/null @@ -1,543 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Bitnami Drupal library - -# shellcheck disable=SC1091 - -# Load Generic Libraries -. /opt/bitnami/scripts/libphp.sh -. /opt/bitnami/scripts/libfs.sh -. /opt/bitnami/scripts/libos.sh -. /opt/bitnami/scripts/libnet.sh -. /opt/bitnami/scripts/libvalidations.sh -. /opt/bitnami/scripts/libversion.sh -. /opt/bitnami/scripts/libpersistence.sh -. /opt/bitnami/scripts/libwebserver.sh - -# Load database library -if [[ -f /opt/bitnami/scripts/libmysqlclient.sh ]]; then - . /opt/bitnami/scripts/libmysqlclient.sh -elif [[ -f /opt/bitnami/scripts/libmysql.sh ]]; then - . /opt/bitnami/scripts/libmysql.sh -elif [[ -f /opt/bitnami/scripts/libmariadb.sh ]]; then - . /opt/bitnami/scripts/libmariadb.sh -fi - -######################## -# Validate settings in DRUPAL_* env vars -# Globals: -# DRUPAL_* -# Arguments: -# None -# Returns: -# 0 if the validation succeeded, 1 otherwise -######################### -drupal_validate() { - debug "Validating settings in DRUPAL_* environment variables..." - local error_code=0 - - # Auxiliary functions - print_validation_error() { - error "$1" - error_code=1 - } - - check_multi_value() { - if [[ " ${2} " != *" ${!1} "* ]]; then - print_validation_error "The allowed values for ${1} are: ${2}" - fi - } - - check_yes_no_value() { - if ! is_yes_no_value "${!1}" && ! is_true_false_value "${!1}"; then - print_validation_error "The allowed values for ${1} are: yes no" - fi - } - - check_resolved_hostname() { - if ! is_hostname_resolved "$1"; then - warn "Hostname $1 could not be resolved. This could lead to connection issues" - fi - } - - check_mounted_file() { - if [[ -n "${!1:-}" ]] && ! [[ -f "${!1:-}" ]]; then - print_validation_error "The variable ${1} is defined but the file ${!1} is not accessible or does not exist" - fi - } - check_valid_port() { - local port_var="${1:?missing port variable}" - local err - if ! err="$(validate_port "${!port_var}")"; then - print_validation_error "An invalid port was specified in the environment variable ${port_var}: ${err}." - fi - } - - # Warn users in case the configuration file is not writable - is_file_writable "$DRUPAL_CONF_FILE" || warn "The Drupal configuration file '${DRUPAL_CONF_FILE}' is not writable. Configurations based on environment variables will not be applied for this file." - - # Validate user inputs - ! is_empty_value "$DRUPAL_SKIP_BOOTSTRAP" && check_yes_no_value "DRUPAL_SKIP_BOOTSTRAP" - ! is_empty_value "$DRUPAL_DATABASE_PORT_NUMBER" && check_valid_port "DRUPAL_DATABASE_PORT_NUMBER" - ! is_empty_value "$DRUPAL_DATABASE_HOST" && check_resolved_hostname "$DRUPAL_DATABASE_HOST" - check_mounted_file "DRUPAL_DATABASE_TLS_CA_FILE" - - # Validate database credentials - if is_boolean_yes "$ALLOW_EMPTY_PASSWORD"; then - warn "You set the environment variable ALLOW_EMPTY_PASSWORD=${ALLOW_EMPTY_PASSWORD}. For safety reasons, do not use this flag in a production environment." - else - for empty_env_var in "DRUPAL_DATABASE_PASSWORD" "DRUPAL_PASSWORD"; do - is_empty_value "${!empty_env_var}" && print_validation_error "The ${empty_env_var} environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow a blank password. This is only recommended for development environments." - done - fi - - # Validate SMTP credentials - if ! is_empty_value "$DRUPAL_SMTP_HOST"; then - for empty_env_var in "DRUPAL_SMTP_USER" "DRUPAL_SMTP_PASSWORD"; do - is_empty_value "${!empty_env_var}" && warn "The ${empty_env_var} environment variable is empty or not set." - done - is_empty_value "$DRUPAL_SMTP_PORT_NUMBER" && print_validation_error "The DRUPAL_SMTP_PORT_NUMBER environment variable is empty or not set." - ! is_empty_value "$DRUPAL_SMTP_PORT_NUMBER" && check_valid_port "DRUPAL_SMTP_PORT_NUMBER" - ! is_empty_value "$DRUPAL_SMTP_PROTOCOL" && check_multi_value "DRUPAL_SMTP_PROTOCOL" "standard tls ssl" - fi - - # Check that the web server is properly set up - web_server_validate || print_validation_error "Web server validation failed" - - return "$error_code" -} - -######################## -# Ensure Drupal is initialized -# Globals: -# DRUPAL_* -# Arguments: -# None -# Returns: -# None -######################### -drupal_initialize() { - # Update Drupal configuration via mounted configuration files and environment variables - if is_file_writable "$DRUPAL_CONF_FILE"; then - # Enable mounted configuration files - if [[ -f "$DRUPAL_MOUNTED_CONF_FILE" ]]; then - info "Found mounted Drupal configuration file '${DRUPAL_MOUNTED_CONF_FILE}', copying to '${DRUPAL_CONF_FILE}'" - cp "$DRUPAL_MOUNTED_CONF_FILE" "$DRUPAL_CONF_FILE" - return - fi - fi - - # Check if Drupal has already been initialized and persisted in a previous run - local -r app_name="drupal" - if ! is_app_initialized "$app_name"; then - info "Trying to connect to the database server" - drupal_wait_for_db_connection "$DRUPAL_DATABASE_HOST" "$DRUPAL_DATABASE_PORT_NUMBER" "$DRUPAL_DATABASE_NAME" "$DRUPAL_DATABASE_USER" "$DRUPAL_DATABASE_PASSWORD" - - # Ensure the Drupal base directory exists and has proper permissions - info "Configuring file permissions for Drupal" - ensure_dir_exists "$DRUPAL_VOLUME_DIR" - # Use daemon:root ownership for compatibility when running as a non-root user - am_i_root && configure_permissions_ownership "$DRUPAL_VOLUME_DIR" -d "775" -f "664" -u "$WEB_SERVER_DAEMON_USER" -g "root" - - if ! is_boolean_yes "$DRUPAL_SKIP_BOOTSTRAP"; then - # Perform initial bootstrapping for Drupal - info "Installing Drupal site" - drupal_site_install - if ! is_empty_value "$DRUPAL_ENABLE_MODULES"; then - info "Enabling Drupal modules" - drupal_enable_modules - fi - if ! is_empty_value "$DRUPAL_SMTP_HOST"; then - info "Configuring SMTP" - drupal_configure_smtp - fi - info "Flushing Drupal cache" - drupal_flush_cache - else - info "An already initialized Drupal database was provided, configuration will be skipped" - if is_empty_value "$DRUPAL_DATABASE_TLS_CA_FILE"; then - drupal_set_database_settings - else - drupal_set_database_ssl_settings - fi - - # Drupal expects a directory for storing site configuration - # For more info see https://www.drupal.org/docs/configuration-management - drupal_create_config_directory - - # Drupal needs a hash value to build one-time login links, cancel links, form tokens, etc. - drupal_set_hash_salt - drupal_update_database - fi - - info "Persisting Drupal installation" - persist_app "$app_name" "$DRUPAL_DATA_TO_PERSIST" - else - info "Restoring persisted Drupal installation" - restore_persisted_app "$app_name" "$DRUPAL_DATA_TO_PERSIST" - info "Trying to connect to the database server" - db_host="$(drupal_database_conf_get 'host')" - db_port="$(drupal_database_conf_get 'port')" - db_name="$(drupal_database_conf_get 'database')" - db_user="$(drupal_database_conf_get 'username')" - db_pass="$(drupal_database_conf_get 'password')" - drupal_wait_for_db_connection "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" - drupal_update_database - fi - - # Avoid exit code of previous commands to affect the result of this function - true -} - -######################## -# Get a database entry from the Drupal configuration file (settings.php) -# Globals: -# DRUPAL_* -# Arguments: -# $1 - Key -# Returns: -# None -######################### -drupal_database_conf_get() { - local -r key="${1:?key missing}" - debug "Getting ${key} from Drupal database configuration" - grep -E "^\s*'${key}' =>" "$DRUPAL_CONF_FILE" | grep -E -o "=> '.*'" | cut -f2 -d\' -} - -######################## -# Add or modify an entry in the Drupal configuration file (settings.php) -# Globals: -# DRUPAL_* -# Arguments: -# $1 - PHP variable name -# $2 - Value to assign to the PHP variable -# $3 - Whether the value is a literal, or if instead it should be quoted (default: no) -# Returns: -# None -######################### -drupal_conf_set() { - local -r key="${1:?key missing}" - local -r value="${2:?value missing}" - local -r is_literal="${3:-no}" - debug "Setting ${key} to '${value}' in Drupal configuration (literal: ${is_literal})" - # Sanitize key (sed does not support fixed string substitutions) - local sanitized_pattern - sanitized_pattern="^(#\s*)?$(sed 's/[]\[^$.*/]/\\&/g' <<< "$key")\s*=.*" - local entry - is_boolean_yes "$is_literal" && entry="${key} = $value;" || entry="${key} = '$value';" - # Check if the configuration exists in the file - if grep -q -E "$sanitized_pattern" "$DRUPAL_CONF_FILE"; then - # It exists, so replace the line - replace_in_file "$DRUPAL_CONF_FILE" "$sanitized_pattern" "$entry" - else - echo "$entry" >> "$DRUPAL_CONF_FILE" - fi -} - -######################## -# Wait until the database is accessible with the currently-known credentials -# Globals: -# * -# Arguments: -# $1 - database host -# $2 - database port -# $3 - database name -# $4 - database username -# $5 - database user password (optional) -# Returns: -# true if the database connection succeeded, false otherwise -######################### -drupal_wait_for_db_connection() { - local -r db_host="${1:?missing database host}" - local -r db_port="${2:?missing database port}" - local -r db_name="${3:?missing database name}" - local -r db_user="${4:?missing database user}" - local -r db_pass="${5:-}" - check_mysql_connection() { - echo "SELECT 1" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" - } - if ! retry_while "check_mysql_connection"; then - error "Could not connect to the database" - return 1 - fi -} - -######################## -# Drupal Site Install -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -drupal_site_install() { - is_empty_value "$DRUPAL_DATABASE_TLS_CA_FILE" || drupal_set_database_ssl_settings - - ( - # Unfortunately there is no way to disable mail sending via sendmail when installing Drupal - # The "hack" consists of overriding the sendmail path to an executable that does nothing (i.e. "/bin/true") - # This is also what Drush is doing in their CI - PHP_OPTIONS="-d sendmail_path=$(which true)" - export PHP_OPTIONS - - drush_execute "site:install" \ - "--db-url=mysql://${DRUPAL_DATABASE_USER}:${DRUPAL_DATABASE_PASSWORD}@${DRUPAL_DATABASE_HOST}:${DRUPAL_DATABASE_PORT_NUMBER}/${DRUPAL_DATABASE_NAME}" \ - "--account-name=${DRUPAL_USERNAME}" \ - "--account-mail=${DRUPAL_EMAIL}" \ - "--account-pass=${DRUPAL_PASSWORD}" \ - "--site-name=${DRUPAL_SITE_NAME}" \ - "--site-mail=${DRUPAL_EMAIL}" \ - "-y" "$DRUPAL_PROFILE" - ) - - # When Drupal settings are patched to allow SSL database connections, the database settings block is duplicated - # after the installation with Drush - is_empty_value "$DRUPAL_DATABASE_TLS_CA_FILE" || drupal_remove_duplicated_database_settings - # Restrict permissions of the configuration file to keep the site secure - if am_i_root; then - configure_permissions_ownership "$DRUPAL_CONF_FILE" -u "root" -g "$WEB_SERVER_DAEMON_USER" -f "644" - fi -} - -######################## -# Create Drupal sync configuration directory (DRUPAL_SKIP_BOOTSTRAP only) -# Globals: -# DRUPAL_BASE_DIR -# Arguments: -# None -# Returns: -# None -######################### -drupal_create_config_directory() { - local config_sync_dir="${DRUPAL_CONFIG_SYNC_DIR:-}" - if is_empty_value "$config_sync_dir"; then - config_sync_dir="${DRUPAL_BASE_DIR}/sites/default/files/config_$(generate_random_string -t alphanumeric -c 16)" - fi - ensure_dir_exists "$config_sync_dir" - drupal_conf_set "\$settings['config_sync_directory']" "$config_sync_dir" -} - -######################## -# Create Drupal hash salt value (DRUPAL_SKIP_BOOTSTRAP only) -# Globals: -# DRUPAL_HASH_SALT -# Arguments: -# None -# Returns: -# None -######################### -drupal_set_hash_salt() { - local hash_salt="${DRUPAL_HASH_SALT:-}" - if is_empty_value "$hash_salt"; then - hash_salt="$(generate_random_string -t alphanumeric -c 32)" - fi - drupal_conf_set "\$settings['hash_salt']" "$hash_salt" -} - -######################## -# Execute Drush Tool -# Globals: -# * -# Arguments: -# $@ - Arguments to pass to the Drush tool -# Returns: -# None -######################### -drush_execute() { - if am_i_root; then - debug_execute run_as_user "$WEB_SERVER_DAEMON_USER" drush "--root=${DRUPAL_BASE_DIR}" "$@" - else - debug_execute drush "--root=${DRUPAL_BASE_DIR}" "$@" - fi -} - -######################## -# Execute Drush Tool to set a config option -# Globals: -# * -# Arguments: -# $1 - config group -# $2 - config key -# $3 - config value -# Returns: -# None -######################### -drush_config_set() { - local -r group="${1:?missing config group}" - local -r key="${2:?missing config key}" - local -r value="${3:-}" - - drush_execute "config-set" "--yes" "$group" "$key" "$value" -} - -######################## -# Drupal enable modules -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -drupal_enable_modules() { - local -a modules - read -r -a modules <<< "${DRUPAL_ENABLE_MODULES/,/ }" - [[ "${#modules[@]}" -gt 0 ]] || return 0 - drush_execute "pm:enable" "--yes" "${modules[@]}" -} - -######################## -# Drupal configure SMTP -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -drupal_configure_smtp() { - drush_execute "pm:enable" "--yes" "smtp" - - drush_config_set "system.mail" "interface.default" "SMTPMailSystem" - drush_config_set "smtp.settings" "smtp_on" "1" - drush_config_set "smtp.settings" "smtp_host" "$DRUPAL_SMTP_HOST" - drush_config_set "smtp.settings" "smtp_port" "$DRUPAL_SMTP_PORT_NUMBER" - drush_config_set "smtp.settings" "smtp_protocol" "$DRUPAL_SMTP_PROTOCOL" - drush_config_set "smtp.settings" "smtp_username" "$DRUPAL_SMTP_USER" - drush_config_set "smtp.settings" "smtp_password" "$DRUPAL_SMTP_PASSWORD" - drush_config_set "smtp.settings" "smtp_from" "$DRUPAL_EMAIL" - drush_config_set "smtp.settings" "smtp_fromname" "$DRUPAL_SITE_NAME" -} - -######################## -# Drupal flush cache -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -drupal_flush_cache() { - drush_execute "cache:rebuild" -} - -######################## -# Drupal update database -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -drupal_update_database() { - debug 'Upgrading Drupal database with drush...' - drush_execute "updatedb" -} - -######################## -# Drupal set database SSL settings -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -drupal_set_database_ssl_settings() { - cat >>"$DRUPAL_CONF_FILE" < '${DRUPAL_DATABASE_NAME}', - 'username' => '${DRUPAL_DATABASE_USER}', - 'password' => '${DRUPAL_DATABASE_PASSWORD}', - 'prefix' => '', - 'host' => '${DRUPAL_DATABASE_HOST}', - 'port' => '${DRUPAL_DATABASE_PORT_NUMBER}', - 'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql', - 'driver' => 'mysql', - 'pdo' => array ( - PDO::MYSQL_ATTR_SSL_CA => '${DRUPAL_DATABASE_TLS_CA_FILE}', - PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => 0 - ) -); -EOF -} - -######################## -# Drupal set database non-SSL settings (DRUPAL_SKIP_BOOTSTRAP only) -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -drupal_set_database_settings() { - cat >>"$DRUPAL_CONF_FILE" < '${DRUPAL_DATABASE_NAME}', - 'username' => '${DRUPAL_DATABASE_USER}', - 'password' => '${DRUPAL_DATABASE_PASSWORD}', - 'prefix' => '', - 'host' => '${DRUPAL_DATABASE_HOST}', - 'port' => '${DRUPAL_DATABASE_PORT_NUMBER}', - 'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql', - 'driver' => 'mysql', -); -EOF -} - -######################## -# Drupal remove duplicated database block from settings file -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -drupal_remove_duplicated_database_settings() { - local -r first_line_block=$'\$databases\[\'default\'\]\[\'default\'\] = array \($' - local -r last_line_block='\);' - - remove_in_file "$DRUPAL_CONF_FILE" "${first_line_block}/,/${last_line_block}" -} - -######################## -# Drupal fix htaccess warning protection. -# Drupal checks for the htaccess file to prevent malicious attacks -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -drupal_fix_htaccess_warning_protection() { - local -r files_dir="${DRUPAL_BASE_DIR}/sites/default/files/" - local -r htaccess_file="${files_dir}/.htaccess" - - ensure_dir_exists "$files_dir" - cat <"$htaccess_file" -# Recommended protections: https://www.drupal.org/forum/newsletters/security-advisories-for-drupal-core/2013-11-20/sa-core-2013-003-drupal-core - -# Turn off all options we don\'t need. -Options -Indexes -ExecCGI -Includes -MultiViews - -# Set the catch-all handler to prevent scripts from being executed. -SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006 - - # Override the handler again if we\'re run later in the evaluation list. - SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003 - - -# If we know how to do it safely, disable the PHP engine entirely. - - php_flag engine off - -EOF -} diff --git a/bitnami/drupal/9/debian-11/tags-info.yaml b/bitnami/drupal/9/debian-11/tags-info.yaml deleted file mode 100644 index d8e405007077d..0000000000000 --- a/bitnami/drupal/9/debian-11/tags-info.yaml +++ /dev/null @@ -1,4 +0,0 @@ -rolling-tags: -- "9" -- 9-debian-11 -- 9.5.11 diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md index beabbd73bb5c0..00cb86661e3a4 100644 --- a/bitnami/drupal/README.md +++ b/bitnami/drupal/README.md @@ -1,4 +1,4 @@ -# Drupal packaged by Bitnami +# Bitnami package for Drupal ## What is Drupal? @@ -21,7 +21,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/ejbca/8/debian-11/Dockerfile b/bitnami/ejbca/8/debian-11/Dockerfile index 1d98334f68a09..68a15e0f63e3d 100644 --- a/bitnami/ejbca/8/debian-11/Dockerfile +++ b/bitnami/ejbca/8/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T23:53:51Z" \ + org.opencontainers.image.created="2023-12-12T18:49:02Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.0.0-debian-11-r10" \ + org.opencontainers.image.ref.name="8.2.0-debian-11-r0" \ org.opencontainers.image.title="ejbca" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="8.0.0" + org.opencontainers.image.version="8.2.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,23 +22,23 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl libaio1 libaudit1 libcap-ng0 libgcc-s1 libicu67 liblzma5 libncurses6 libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-11.0.20-8-5-linux-${OS_ARCH}-debian-11" \ - "wildfly-26.1.3-14-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.11.5-1-linux-${OS_ARCH}-debian-11" \ - "ejbca-8.0.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-11.0.21-10-6-linux-${OS_ARCH}-debian-11" \ + "wildfly-26.1.3-18-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.11.6-0-linux-${OS_ARCH}-debian-11" \ + "ejbca-8.2.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -49,7 +49,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/ejbca/postunpack.sh RUN /opt/bitnami/scripts/java/postunpack.sh -ENV APP_VERSION="8.0.0" \ +ENV APP_VERSION="8.2.0" \ BITNAMI_APP_NAME="ejbca" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/wildfly/bin:/opt/bitnami/mysql/bin:/opt/bitnami/ejbca/bin:$PATH" diff --git a/bitnami/ejbca/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/ejbca/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8481bedc731c4..06cc1e3756e19 100644 --- a/bitnami/ejbca/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/ejbca/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,24 +3,24 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.0.0-0" + "version": "8.2.0-0" }, "java": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.0.20-8-5" + "version": "11.0.21-10-6" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.11.5-1" + "version": "10.11.6-0" }, "wildfly": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "26.1.3-14" + "version": "26.1.3-18" } } \ No newline at end of file diff --git a/bitnami/ejbca/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/ejbca/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/ejbca/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/ejbca/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/ejbca/8/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/ejbca/8/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/ejbca/8/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/ejbca/8/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/ejbca/8/debian-11/tags-info.yaml b/bitnami/ejbca/8/debian-11/tags-info.yaml index 965524a7a1b10..54e504ff0297f 100644 --- a/bitnami/ejbca/8/debian-11/tags-info.yaml +++ b/bitnami/ejbca/8/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "8" - 8-debian-11 -- 8.0.0 +- 8.2.0 - latest diff --git a/bitnami/ejbca/README.md b/bitnami/ejbca/README.md index 8844dbc753683..1c962f97cdf92 100644 --- a/bitnami/ejbca/README.md +++ b/bitnami/ejbca/README.md @@ -1,4 +1,4 @@ -# EJBCA packaged by Bitnami +# Bitnami package for EJBCA ## What is EJBCA? @@ -27,7 +27,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/elasticsearch-exporter/1/debian-11/Dockerfile b/bitnami/elasticsearch-exporter/1/debian-11/Dockerfile index 3e6ce9721952b..ae372ddbb8fe9 100644 --- a/bitnami/elasticsearch-exporter/1/debian-11/Dockerfile +++ b/bitnami/elasticsearch-exporter/1/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T01:15:51Z" \ + org.opencontainers.image.created="2023-12-06T15:23:02Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.6.0-debian-11-r95" \ + org.opencontainers.image.ref.name="1.6.0-debian-11-r97" \ org.opencontainers.image.title="elasticsearch-exporter" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.6.0" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "elasticsearch-exporter-1.6.0-5-linux-${OS_ARCH}-debian-11" \ - ) && \ + "elasticsearch-exporter-1.6.0-7-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/elasticsearch-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/elasticsearch-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 187e3796488c9..cc99fde6d3837 100644 --- a/bitnami/elasticsearch-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/elasticsearch-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.6.0-5" + "version": "1.6.0-7" } } \ No newline at end of file diff --git a/bitnami/elasticsearch-exporter/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/elasticsearch-exporter/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/elasticsearch-exporter/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/elasticsearch-exporter/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/elasticsearch-exporter/README.md b/bitnami/elasticsearch-exporter/README.md index bcb7e641bd797..1cad812e66389 100644 --- a/bitnami/elasticsearch-exporter/README.md +++ b/bitnami/elasticsearch-exporter/README.md @@ -1,4 +1,4 @@ -# Elasticsearch Exporter packaged by Bitnami +# Bitnami package for Elasticsearch Exporter ## What is Elasticsearch Exporter? @@ -18,7 +18,7 @@ docker run --name elasticsearch-exporter bitnami/elasticsearch-exporter:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/elasticsearch/7/debian-11/Dockerfile b/bitnami/elasticsearch/7/debian-11/Dockerfile index 715189bf1de70..42f4139dc2c13 100644 --- a/bitnami/elasticsearch/7/debian-11/Dockerfile +++ b/bitnami/elasticsearch/7/debian-11/Dockerfile @@ -9,13 +9,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:53:34Z" \ + org.opencontainers.image.created="2023-12-12T18:32:12Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.17.14-debian-11-r1" \ + org.opencontainers.image.ref.name="7.17.16-debian-11-r0" \ org.opencontainers.image.title="elasticsearch" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.17.14" + org.opencontainers.image.version="7.17.16" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -24,22 +24,22 @@ ENV HOME="/" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:/opt/bitnami/elasticsearch/bin:$PATH" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libasound2-dev libc6 libfreetype6 libfreetype6-dev libgcc1 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "elasticsearch-7.17.14-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "yq-4.40.5-0-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "elasticsearch-7.17.16-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -49,7 +49,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/elasticsearch/postunpack.sh RUN /opt/bitnami/scripts/java/postunpack.sh -ENV APP_VERSION="7.17.14" \ +ENV APP_VERSION="7.17.16" \ BITNAMI_APP_NAME="elasticsearch" \ ES_JAVA_HOME="/opt/bitnami/java" \ JAVA_HOME="/opt/bitnami/java" \ diff --git a/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 721ebab96e317..e82ea08694230 100644 --- a/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.17.14-0" + "version": "7.17.16-0" }, "java": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.5-0" } } \ No newline at end of file diff --git a/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/elasticsearch/7/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/elasticsearch/7/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/elasticsearch/7/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/elasticsearch/7/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/elasticsearch/7/debian-11/tags-info.yaml b/bitnami/elasticsearch/7/debian-11/tags-info.yaml index 948df5889c5b3..5d72cb9860503 100644 --- a/bitnami/elasticsearch/7/debian-11/tags-info.yaml +++ b/bitnami/elasticsearch/7/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "7" - 7-debian-11 -- 7.17.14 +- 7.17.16 diff --git a/bitnami/elasticsearch/8/debian-11/Dockerfile b/bitnami/elasticsearch/8/debian-11/Dockerfile index d6d7ea761f4bf..88d1804c94de6 100644 --- a/bitnami/elasticsearch/8/debian-11/Dockerfile +++ b/bitnami/elasticsearch/8/debian-11/Dockerfile @@ -9,13 +9,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-17T15:00:04Z" \ + org.opencontainers.image.created="2023-12-13T23:35:05Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.10.4-debian-11-r0" \ + org.opencontainers.image.ref.name="8.11.3-debian-11-r0" \ org.opencontainers.image.title="elasticsearch" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="8.10.4" + org.opencontainers.image.version="8.11.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -24,22 +24,22 @@ ENV HOME="/" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:/opt/bitnami/elasticsearch/bin:$PATH" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libasound2-dev libc6 libfreetype6 libfreetype6-dev libgcc1 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "elasticsearch-8.10.4-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "yq-4.40.5-0-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "elasticsearch-8.11.3-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -49,7 +49,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/elasticsearch/postunpack.sh RUN /opt/bitnami/scripts/java/postunpack.sh -ENV APP_VERSION="8.10.4" \ +ENV APP_VERSION="8.11.3" \ BITNAMI_APP_NAME="elasticsearch" \ ES_JAVA_HOME="/opt/bitnami/java" \ JAVA_HOME="/opt/bitnami/java" \ diff --git a/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index a490943633882..34bad1d19836b 100644 --- a/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.10.4-0" + "version": "8.11.3-0" }, "java": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.5-0" } } \ No newline at end of file diff --git a/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/elasticsearch/8/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/elasticsearch/8/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/elasticsearch/8/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/elasticsearch/8/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/elasticsearch/8/debian-11/tags-info.yaml b/bitnami/elasticsearch/8/debian-11/tags-info.yaml index ecbea73631d79..ccb5c9eb732e3 100644 --- a/bitnami/elasticsearch/8/debian-11/tags-info.yaml +++ b/bitnami/elasticsearch/8/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "8" - 8-debian-11 -- 8.10.4 +- 8.11.3 - latest diff --git a/bitnami/elasticsearch/README.md b/bitnami/elasticsearch/README.md index 0460df230e693..16d303a350303 100644 --- a/bitnami/elasticsearch/README.md +++ b/bitnami/elasticsearch/README.md @@ -27,7 +27,7 @@ You can find the available configuration options in the [Environment Variables]( * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/envoy/1.25/debian-11/Dockerfile b/bitnami/envoy/1.25/debian-11/Dockerfile index 0bb9b527c4e09..240b52325f932 100644 --- a/bitnami/envoy/1.25/debian-11/Dockerfile +++ b/bitnami/envoy/1.25/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-17T06:54:07Z" \ + org.opencontainers.image.created="2023-12-15T22:41:41Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.25.11-debian-11-r0" \ + org.opencontainers.image.ref.name="1.25.11-debian-11-r2" \ org.opencontainers.image.title="envoy" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.25.11" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "envoy-1.25.11-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "envoy-1.25.11-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/envoy/1.25/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/envoy/1.25/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8af4a3fac4da7..e88ffc8a0d3fe 100644 --- a/bitnami/envoy/1.25/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/envoy/1.25/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.25.11-0" + "version": "1.25.11-1" } } \ No newline at end of file diff --git a/bitnami/envoy/1.25/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/envoy/1.25/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/envoy/1.25/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/envoy/1.25/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/envoy/1.26/debian-11/Dockerfile b/bitnami/envoy/1.26/debian-11/Dockerfile index 5d90ae45bed30..ae0e9615bdb4d 100644 --- a/bitnami/envoy/1.26/debian-11/Dockerfile +++ b/bitnami/envoy/1.26/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-17T16:09:04Z" \ + org.opencontainers.image.created="2023-12-15T22:55:08Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.26.6-debian-11-r0" \ + org.opencontainers.image.ref.name="1.26.6-debian-11-r2" \ org.opencontainers.image.title="envoy" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.26.6" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "envoy-1.26.6-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "envoy-1.26.6-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/envoy/1.26/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/envoy/1.26/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 38ec9097e98c7..7e3d440c94917 100644 --- a/bitnami/envoy/1.26/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/envoy/1.26/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.26.6-0" + "version": "1.26.6-1" } } \ No newline at end of file diff --git a/bitnami/envoy/1.26/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/envoy/1.26/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/envoy/1.26/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/envoy/1.26/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/envoy/1.27/debian-11/Dockerfile b/bitnami/envoy/1.27/debian-11/Dockerfile index 6a32b31ac43fc..70df9bf9d9163 100644 --- a/bitnami/envoy/1.27/debian-11/Dockerfile +++ b/bitnami/envoy/1.27/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-17T23:01:30Z" \ + org.opencontainers.image.created="2023-12-15T23:03:37Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.27.2-debian-11-r0" \ + org.opencontainers.image.ref.name="1.27.2-debian-11-r2" \ org.opencontainers.image.title="envoy" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.27.2" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "envoy-1.27.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "envoy-1.27.2-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/envoy/1.27/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/envoy/1.27/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 859f11d54d653..4431fc22635c4 100644 --- a/bitnami/envoy/1.27/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/envoy/1.27/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.27.2-0" + "version": "1.27.2-1" } } \ No newline at end of file diff --git a/bitnami/envoy/1.27/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/envoy/1.27/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/envoy/1.27/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/envoy/1.27/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/envoy/1.27/debian-11/tags-info.yaml b/bitnami/envoy/1.27/debian-11/tags-info.yaml index d7be4fd008506..d740290a3f532 100644 --- a/bitnami/envoy/1.27/debian-11/tags-info.yaml +++ b/bitnami/envoy/1.27/debian-11/tags-info.yaml @@ -2,4 +2,3 @@ rolling-tags: - "1.27" - 1.27-debian-11 - 1.27.2 -- latest diff --git a/bitnami/envoy/1.28/debian-11/Dockerfile b/bitnami/envoy/1.28/debian-11/Dockerfile new file mode 100644 index 0000000000000..ca91cb8d8ebd7 --- /dev/null +++ b/bitnami/envoy/1.28/debian-11/Dockerfile @@ -0,0 +1,51 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +FROM docker.io/bitnami/minideb:bullseye + +ARG TARGETARCH + +LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-12-15T23:05:50Z" \ + org.opencontainers.image.description="Application packaged by VMware, Inc" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.ref.name="1.28.0-debian-11-r2" \ + org.opencontainers.image.title="envoy" \ + org.opencontainers.image.vendor="VMware, Inc." \ + org.opencontainers.image.version="1.28.0" + +ENV HOME="/" \ + OS_ARCH="${TARGETARCH:-amd64}" \ + OS_FLAVOUR="debian-11" \ + OS_NAME="linux" + +COPY prebuildfs / +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] +# Install required system packages and dependencies +RUN install_packages ca-certificates curl procps +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ + COMPONENTS=( \ + "envoy-1.28.0-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ + for COMPONENT in "${COMPONENTS[@]}"; do \ + if [ ! -f "${COMPONENT}.tar.gz" ]; then \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ + rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ + done +RUN apt-get autoremove --purge -y curl && \ + apt-get update && apt-get upgrade -y && \ + apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives +RUN chmod g+rwX /opt/bitnami + +ENV APP_VERSION="1.28.0" \ + BITNAMI_APP_NAME="envoy" \ + PATH="/opt/bitnami/envoy/bin:$PATH" + +USER 1001 +ENTRYPOINT [ "/opt/bitnami/envoy/bin/envoy" ] +CMD [ "-c", "/opt/bitnami/envoy/conf/envoy.yaml" ] diff --git a/bitnami/envoy/1.28/debian-11/docker-compose.yml b/bitnami/envoy/1.28/debian-11/docker-compose.yml new file mode 100644 index 0000000000000..f004dd98038d6 --- /dev/null +++ b/bitnami/envoy/1.28/debian-11/docker-compose.yml @@ -0,0 +1,7 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +version: '2' +services: + envoy: + image: docker.io/bitnami/envoy:1.28 diff --git a/bitnami/envoy/1.28/debian-11/examples/frontend.yaml b/bitnami/envoy/1.28/debian-11/examples/frontend.yaml new file mode 100644 index 0000000000000..0803f3c363620 --- /dev/null +++ b/bitnami/envoy/1.28/debian-11/examples/frontend.yaml @@ -0,0 +1,58 @@ +admin: + access_log_path: /tmp/admin_access.log + address: + socket_address: { address: 127.0.0.1, port_value: 8081 } + +static_resources: + listeners: + - name: listener_0 + address: + socket_address: { address: 0.0.0.0, port_value: 8080 } + filter_chains: + - filters: + - name: envoy.filters.network.http_connection_manager + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + stat_prefix: ingress_http + codec_type: AUTO + route_config: + name: local_route + virtual_hosts: + - name: local_service + domains: ["*"] + routes: + - match: { prefix: "/nginx" } + route: { cluster: service1, prefix_rewrite: "/" } + - match: { prefix: "/apache" } + route: { cluster: service2, prefix_rewrite: "/" } + http_filters: + - name: envoy.filters.http.router + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router + clusters: + - name: service1 + connect_timeout: 0.25s + type: STRICT_DNS + lb_policy: ROUND_ROBIN + load_assignment: + cluster_name: some_service + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: service1 + port_value: 8080 + - name: service2 + connect_timeout: 0.25s + type: STRICT_DNS + lb_policy: ROUND_ROBIN + load_assignment: + cluster_name: some_service + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: service2 + port_value: 8080 diff --git a/bitnami/envoy/1.28/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/envoy/1.28/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json new file mode 100644 index 0000000000000..db52af2e2f972 --- /dev/null +++ b/bitnami/envoy/1.28/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -0,0 +1,8 @@ +{ + "envoy": { + "arch": "amd64", + "distro": "debian-11", + "type": "NAMI", + "version": "1.28.0-1" + } +} \ No newline at end of file diff --git a/bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/envoy/1.28/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt similarity index 100% rename from bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt rename to bitnami/envoy/1.28/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt diff --git a/bitnami/odoo/14/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/envoy/1.28/debian-11/prebuildfs/usr/sbin/install_packages similarity index 100% rename from bitnami/odoo/14/debian-11/prebuildfs/usr/sbin/install_packages rename to bitnami/envoy/1.28/debian-11/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/envoy/1.28/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/envoy/1.28/debian-11/prebuildfs/usr/sbin/run-script new file mode 100755 index 0000000000000..b7a5bf1e50bff --- /dev/null +++ b/bitnami/envoy/1.28/debian-11/prebuildfs/usr/sbin/run-script @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -u + +if [ $# -eq 0 ]; then + >&2 echo "No arguments provided" + exit 1 +fi + +script=$1 +exit_code="${2:-96}" +fail_if_not_present="${3:-y}" + +if test -f "$script"; then + sh $script + + if [ $? -ne 0 ]; then + exit $((exit_code)) + fi +elif [ "$fail_if_not_present" = "y" ]; then + >&2 echo "script not found: $script" + exit 127 +fi diff --git a/bitnami/envoy/1.28/debian-11/tags-info.yaml b/bitnami/envoy/1.28/debian-11/tags-info.yaml new file mode 100644 index 0000000000000..28736ab698336 --- /dev/null +++ b/bitnami/envoy/1.28/debian-11/tags-info.yaml @@ -0,0 +1,5 @@ +rolling-tags: +- "1.28" +- 1.28-debian-11 +- 1.28.0 +- latest diff --git a/bitnami/envoy/README.md b/bitnami/envoy/README.md index 030a92beb765d..5f47a8918f50f 100644 --- a/bitnami/envoy/README.md +++ b/bitnami/envoy/README.md @@ -1,4 +1,4 @@ -# Envoy packaged by Bitnami +# Bitnami package for Envoy ## What is Envoy? @@ -18,7 +18,7 @@ docker run --name envoy bitnami/envoy:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/envoy/docker-compose.yml b/bitnami/envoy/docker-compose.yml index fdc921c380b37..f004dd98038d6 100644 --- a/bitnami/envoy/docker-compose.yml +++ b/bitnami/envoy/docker-compose.yml @@ -4,4 +4,4 @@ version: '2' services: envoy: - image: docker.io/bitnami/envoy:1.27 + image: docker.io/bitnami/envoy:1.28 diff --git a/bitnami/etcd/3.4/debian-11/Dockerfile b/bitnami/etcd/3.4/debian-11/Dockerfile index 957e998024d41..e6813524ab09c 100644 --- a/bitnami/etcd/3.4/debian-11/Dockerfile +++ b/bitnami/etcd/3.4/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T01:17:22Z" \ + org.opencontainers.image.created="2023-12-17T11:11:12Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.4.27-debian-11-r83" \ + org.opencontainers.image.ref.name="3.4.28-debian-11-r2" \ org.opencontainers.image.title="etcd" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="3.4.27" + org.opencontainers.image.version="3.4.28" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "yq-4.35.2-2-linux-${OS_ARCH}-debian-11" \ - "etcd-3.4.27-6-linux-${OS_ARCH}-debian-11" \ - ) && \ + "yq-4.40.5-0-linux-${OS_ARCH}-debian-11" \ + "etcd-3.4.28-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y ca-certificates curl && \ @@ -45,7 +45,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/etcd/postunpack.sh -ENV APP_VERSION="3.4.27" \ +ENV APP_VERSION="3.4.28" \ BITNAMI_APP_NAME="etcd" \ ETCDCTL_API="3" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/etcd/bin:$PATH" diff --git a/bitnami/etcd/3.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/etcd/3.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 99f69b9586529..b72bcc45ec01b 100644 --- a/bitnami/etcd/3.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/etcd/3.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.4.27-6" + "version": "3.4.28-2" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-2" + "version": "4.40.5-0" } } \ No newline at end of file diff --git a/bitnami/etcd/3.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/etcd/3.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/etcd/3.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/etcd/3.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/etcd/3.4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/etcd/3.4/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/etcd/3.4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/etcd/3.4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/etcd/3.4/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh b/bitnami/etcd/3.4/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh index 2266205c88756..a906d04e241c4 100644 --- a/bitnami/etcd/3.4/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh +++ b/bitnami/etcd/3.4/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh @@ -341,16 +341,23 @@ etcd_store_member_id() { # None ######################## etcd_configure_rbac() { - info "Enabling etcd authentication" ! is_etcd_running && etcd_start_bg read -r -a extra_flags <<<"$(etcdctl_auth_flags)" is_boolean_yes "$ETCD_ON_K8S" && extra_flags+=("--endpoints=$(etcdctl_get_endpoints)") if retry_while "etcdctl ${extra_flags[*]} member list" >/dev/null 2>&1; then - debug_execute etcdctl "${extra_flags[@]}" user add root --interactive=false <<<"$ETCD_ROOT_PASSWORD" - debug_execute etcdctl "${extra_flags[@]}" user grant-role root root - debug_execute etcdctl "${extra_flags[@]}" auth enable + if retry_while "etcdctl ${extra_flags[*]} auth status" >/dev/null 2>&1; then + if etcdctl "${extra_flags[@]}" auth status | grep -q "Authentication Status: true"; then + info "Authentication already enabled" + else + info "Enabling etcd authentication" + extra_flags=("--endpoints=$(etcdctl_get_endpoints)") + etcdctl "${extra_flags[@]}" user add root --interactive=false <<<"$ETCD_ROOT_PASSWORD" + etcdctl "${extra_flags[@]}" user grant-role root root + etcdctl "${extra_flags[@]}" auth enable + fi + fi fi etcd_stop } @@ -644,16 +651,6 @@ etcd_initialize() { exit 1 fi else - if [[ ${#initial_members[@]} -gt 1 ]]; then - # When there's more than one etcd replica, RBAC should be only enabled in one member - if ! is_empty_value "$ETCD_ROOT_PASSWORD" && [[ "$ETCD_INITIAL_CLUSTER_STATE" = "new" ]] && [[ "${initial_members[0]}" = *"$ETCD_INITIAL_ADVERTISE_PEER_URLS"* ]]; then - etcd_configure_rbac - else - debug "Skipping RBAC configuration in member $ETCD_NAME" - fi - else - ! is_empty_value "$ETCD_ROOT_PASSWORD" && etcd_configure_rbac - fi etcd_store_member_id fi else @@ -730,6 +727,18 @@ etcd_initialize() { fi fi + # For both existing and new deployments, configure RBAC if set + if [[ ${#initial_members[@]} -gt 1 ]]; then + # When there's more than one etcd replica, RBAC should be only enabled in one member + if ! is_empty_value "$ETCD_ROOT_PASSWORD" && [[ "${initial_members[0]}" = *"$ETCD_INITIAL_ADVERTISE_PEER_URLS"* ]]; then + etcd_configure_rbac + else + debug "Skipping RBAC configuration in member $ETCD_NAME" + fi + else + ! is_empty_value "$ETCD_ROOT_PASSWORD" && etcd_configure_rbac + fi + # Avoid exit code of previous commands to affect the result of this function true } diff --git a/bitnami/etcd/3.4/debian-11/tags-info.yaml b/bitnami/etcd/3.4/debian-11/tags-info.yaml index 6af7edcd0ca12..23781078581d3 100644 --- a/bitnami/etcd/3.4/debian-11/tags-info.yaml +++ b/bitnami/etcd/3.4/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "3.4" - 3.4-debian-11 -- 3.4.27 +- 3.4.28 diff --git a/bitnami/etcd/3.5/debian-11/Dockerfile b/bitnami/etcd/3.5/debian-11/Dockerfile index db4f46b950aa6..56161b5e0e642 100644 --- a/bitnami/etcd/3.5/debian-11/Dockerfile +++ b/bitnami/etcd/3.5/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-27T13:39:23Z" \ + org.opencontainers.image.created="2023-12-17T11:08:24Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.5.10-debian-11-r0" \ + org.opencontainers.image.ref.name="3.5.11-debian-11-r1" \ org.opencontainers.image.title="etcd" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="3.5.10" + org.opencontainers.image.version="3.5.11" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "etcd-3.5.10-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "yq-4.40.5-0-linux-${OS_ARCH}-debian-11" \ + "etcd-3.5.11-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y ca-certificates curl && \ @@ -45,7 +45,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/etcd/postunpack.sh -ENV APP_VERSION="3.5.10" \ +ENV APP_VERSION="3.5.11" \ BITNAMI_APP_NAME="etcd" \ ETCDCTL_API="3" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/etcd/bin:$PATH" diff --git a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 0ad3062d110cd..07c53ac76fcc7 100644 --- a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.5.10-0" + "version": "3.5.11-1" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.5-0" } } \ No newline at end of file diff --git a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/etcd/3.5/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/etcd/3.5/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/etcd/3.5/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/etcd/3.5/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh index 2266205c88756..a906d04e241c4 100644 --- a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh +++ b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh @@ -341,16 +341,23 @@ etcd_store_member_id() { # None ######################## etcd_configure_rbac() { - info "Enabling etcd authentication" ! is_etcd_running && etcd_start_bg read -r -a extra_flags <<<"$(etcdctl_auth_flags)" is_boolean_yes "$ETCD_ON_K8S" && extra_flags+=("--endpoints=$(etcdctl_get_endpoints)") if retry_while "etcdctl ${extra_flags[*]} member list" >/dev/null 2>&1; then - debug_execute etcdctl "${extra_flags[@]}" user add root --interactive=false <<<"$ETCD_ROOT_PASSWORD" - debug_execute etcdctl "${extra_flags[@]}" user grant-role root root - debug_execute etcdctl "${extra_flags[@]}" auth enable + if retry_while "etcdctl ${extra_flags[*]} auth status" >/dev/null 2>&1; then + if etcdctl "${extra_flags[@]}" auth status | grep -q "Authentication Status: true"; then + info "Authentication already enabled" + else + info "Enabling etcd authentication" + extra_flags=("--endpoints=$(etcdctl_get_endpoints)") + etcdctl "${extra_flags[@]}" user add root --interactive=false <<<"$ETCD_ROOT_PASSWORD" + etcdctl "${extra_flags[@]}" user grant-role root root + etcdctl "${extra_flags[@]}" auth enable + fi + fi fi etcd_stop } @@ -644,16 +651,6 @@ etcd_initialize() { exit 1 fi else - if [[ ${#initial_members[@]} -gt 1 ]]; then - # When there's more than one etcd replica, RBAC should be only enabled in one member - if ! is_empty_value "$ETCD_ROOT_PASSWORD" && [[ "$ETCD_INITIAL_CLUSTER_STATE" = "new" ]] && [[ "${initial_members[0]}" = *"$ETCD_INITIAL_ADVERTISE_PEER_URLS"* ]]; then - etcd_configure_rbac - else - debug "Skipping RBAC configuration in member $ETCD_NAME" - fi - else - ! is_empty_value "$ETCD_ROOT_PASSWORD" && etcd_configure_rbac - fi etcd_store_member_id fi else @@ -730,6 +727,18 @@ etcd_initialize() { fi fi + # For both existing and new deployments, configure RBAC if set + if [[ ${#initial_members[@]} -gt 1 ]]; then + # When there's more than one etcd replica, RBAC should be only enabled in one member + if ! is_empty_value "$ETCD_ROOT_PASSWORD" && [[ "${initial_members[0]}" = *"$ETCD_INITIAL_ADVERTISE_PEER_URLS"* ]]; then + etcd_configure_rbac + else + debug "Skipping RBAC configuration in member $ETCD_NAME" + fi + else + ! is_empty_value "$ETCD_ROOT_PASSWORD" && etcd_configure_rbac + fi + # Avoid exit code of previous commands to affect the result of this function true } diff --git a/bitnami/etcd/3.5/debian-11/tags-info.yaml b/bitnami/etcd/3.5/debian-11/tags-info.yaml index b2c6e1212f756..1d8825275cb69 100644 --- a/bitnami/etcd/3.5/debian-11/tags-info.yaml +++ b/bitnami/etcd/3.5/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "3.5" - 3.5-debian-11 -- 3.5.10 +- 3.5.11 - latest diff --git a/bitnami/etcd/README.md b/bitnami/etcd/README.md index 3cdc7fb420925..83a18f5a67881 100644 --- a/bitnami/etcd/README.md +++ b/bitnami/etcd/README.md @@ -1,4 +1,4 @@ -# Etcd packaged by Bitnami +# Bitnami package for Etcd ## What is Etcd? @@ -25,7 +25,7 @@ docker-compose up * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/express/4/debian-11/Dockerfile b/bitnami/express/4/debian-11/Dockerfile index e48bc49664374..efc890df06d0b 100644 --- a/bitnami/express/4/debian-11/Dockerfile +++ b/bitnami/express/4/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T08:01:01Z" \ + org.opencontainers.image.created="2023-12-02T08:14:34Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.18.2-debian-11-r167" \ + org.opencontainers.image.ref.name="4.18.2-debian-11-r170" \ org.opencontainers.image.title="express" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.18.2" @@ -20,23 +20,23 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "node-18.18.2-0-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "express-4.18.2-15-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.6-11-linux-${OS_ARCH}-debian-11" \ + "node-18.19.0-0-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-3-linux-${OS_ARCH}-debian-11" \ + "express-4.18.2-17-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/express/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/express/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 2e815e673c923..079b8bc4a7962 100644 --- a/bitnami/express/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/express/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,24 +3,24 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.18.2-15" + "version": "4.18.2-17" }, "node": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "18.18.2-0" + "version": "18.19.0-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.6-11" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-3" } } \ No newline at end of file diff --git a/bitnami/express/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/express/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/express/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/express/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/express/4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/express/4/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/express/4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/express/4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/express/README.md b/bitnami/express/README.md index 2ca4e1d97f3c2..3a69d6c2e2d05 100644 --- a/bitnami/express/README.md +++ b/bitnami/express/README.md @@ -1,4 +1,4 @@ -# Express packaged by Bitnami +# Bitnami package for Express ## What is Express? @@ -24,7 +24,7 @@ docker-compose up * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/express/docker-compose-postgresql.yml b/bitnami/express/docker-compose-postgresql.yml index aff30bd772919..2731ac923db35 100644 --- a/bitnami/express/docker-compose-postgresql.yml +++ b/bitnami/express/docker-compose-postgresql.yml @@ -5,7 +5,7 @@ version: '2' services: postgresql: - image: docker.io/bitnami/postgresql:11 + image: docker.io/bitnami/postgresql:15 environment: - POSTGRESQL_DATABASE=myapp - ALLOW_EMPTY_PASSWORD=yes diff --git a/bitnami/external-dns/0/debian-11/Dockerfile b/bitnami/external-dns/0/debian-11/Dockerfile index 002d715391fca..a002b50774db4 100644 --- a/bitnami/external-dns/0/debian-11/Dockerfile +++ b/bitnami/external-dns/0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-18T14:06:45Z" \ + org.opencontainers.image.created="2023-12-06T15:24:30Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.13.6-debian-11-r33" \ + org.opencontainers.image.ref.name="0.14.0-debian-11-r2" \ org.opencontainers.image.title="external-dns" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.13.6" + org.opencontainers.image.version="0.14.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "external-dns-0.13.6-6-linux-${OS_ARCH}-debian-11" \ - ) && \ + "external-dns-0.14.0-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="0.13.6" \ +ENV APP_VERSION="0.14.0" \ BITNAMI_APP_NAME="external-dns" \ PATH="/opt/bitnami/external-dns/bin:$PATH" diff --git a/bitnami/external-dns/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/external-dns/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 4e0cef692dab5..5f3339f55614a 100644 --- a/bitnami/external-dns/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/external-dns/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.13.6-6" + "version": "0.14.0-2" } } \ No newline at end of file diff --git a/bitnami/external-dns/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/external-dns/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/external-dns/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/external-dns/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/external-dns/0/debian-11/tags-info.yaml b/bitnami/external-dns/0/debian-11/tags-info.yaml index 3dab046b6246b..f290cc5e7027f 100644 --- a/bitnami/external-dns/0/debian-11/tags-info.yaml +++ b/bitnami/external-dns/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.13.6 +- 0.14.0 - latest diff --git a/bitnami/external-dns/README.md b/bitnami/external-dns/README.md index c760c701d2b67..ebda3cd8fe997 100644 --- a/bitnami/external-dns/README.md +++ b/bitnami/external-dns/README.md @@ -1,4 +1,4 @@ -# ExternalDNS packaged by Bitnami +# Bitnami package for ExternalDNS ## What is ExternalDNS? @@ -20,7 +20,7 @@ docker run --name external-dns bitnami/external-dns:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/flink/1/debian-11/Dockerfile b/bitnami/flink/1/debian-11/Dockerfile index 91bc57cc7527c..0150fe5ea4a40 100644 --- a/bitnami/flink/1/debian-11/Dockerfile +++ b/bitnami/flink/1/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T19:32:10Z" \ + org.opencontainers.image.created="2023-12-02T08:35:34Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.18.0-debian-11-r0" \ + org.opencontainers.image.ref.name="1.18.0-debian-11-r2" \ org.opencontainers.image.title="flink" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.18.0" @@ -22,21 +22,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gettext libjemalloc2 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-11.0.21-10-1-linux-${OS_ARCH}-debian-11" \ - "flink-1.18.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-11.0.21-10-6-linux-${OS_ARCH}-debian-11" \ + "flink-1.18.0-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/flink/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/flink/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index ffa5bd580575d..3acd66b961882 100644 --- a/bitnami/flink/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/flink/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.18.0-0" + "version": "1.18.0-1" }, "java": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.0.21-10-1" + "version": "11.0.21-10-6" } } \ No newline at end of file diff --git a/bitnami/flink/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/flink/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/flink/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/flink/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/flink/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/flink/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/flink/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/flink/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/flink/README.md b/bitnami/flink/README.md index 779b0b21c03d9..94fb7c697cfdf 100644 --- a/bitnami/flink/README.md +++ b/bitnami/flink/README.md @@ -1,4 +1,4 @@ -# Apache Flink packaged by Bitnami +# Bitnami package for Apache Flink ## What is Apache Flink? @@ -16,12 +16,12 @@ docker run --name v bitnami/flink:latest ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use Apache Flink in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/fluent-bit/2/debian-11/Dockerfile b/bitnami/fluent-bit/2/debian-11/Dockerfile index 609c0f7bd00bd..d772e7a2fea33 100644 --- a/bitnami/fluent-bit/2/debian-11/Dockerfile +++ b/bitnami/fluent-bit/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T22:44:51Z" \ + org.opencontainers.image.created="2023-12-08T23:50:47Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.1.10-debian-11-r12" \ + org.opencontainers.image.ref.name="2.2.0-debian-11-r1" \ org.opencontainers.image.title="fluent-bit" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.1.10" + org.opencontainers.image.version="2.2.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgcc-s1 libgcrypt20 libgpg-error0 liblz4-1 liblzma5 libsasl2-2 libssl1.1 libsystemd0 libyaml-0-2 libzstd1 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "fluent-bit-2.1.10-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "fluent-bit-2.2.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -43,7 +43,7 @@ RUN apt-get autoremove --purge -y curl && \ RUN chmod g+rwX /opt/bitnami RUN chown -R 1001:1001 /opt/bitnami/fluent-bit -ENV APP_VERSION="2.1.10" \ +ENV APP_VERSION="2.2.0" \ BITNAMI_APP_NAME="fluent-bit" \ PATH="/opt/bitnami/fluent-bit/bin:$PATH" diff --git a/bitnami/fluent-bit/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/fluent-bit/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 24863f867cf92..6c796bf2728ed 100644 --- a/bitnami/fluent-bit/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/fluent-bit/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.1.10-0" + "version": "2.2.0-0" } } \ No newline at end of file diff --git a/bitnami/fluent-bit/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/fluent-bit/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/fluent-bit/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/fluent-bit/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/fluent-bit/2/debian-11/tags-info.yaml b/bitnami/fluent-bit/2/debian-11/tags-info.yaml index 42d7f4f78f5dc..9f995c3791950 100644 --- a/bitnami/fluent-bit/2/debian-11/tags-info.yaml +++ b/bitnami/fluent-bit/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.1.10 +- 2.2.0 - latest diff --git a/bitnami/fluent-bit/README.md b/bitnami/fluent-bit/README.md index 4c1342e0bd0ed..cc5c24e1a3075 100644 --- a/bitnami/fluent-bit/README.md +++ b/bitnami/fluent-bit/README.md @@ -1,4 +1,4 @@ -# Fluent Bit packaged by Bitnami +# Bitnami package for Fluent Bit ## What is Fluent Bit? @@ -18,7 +18,7 @@ docker run --name fluent-bit bitnami/fluent-bit:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/fluentd/1/debian-11/Dockerfile b/bitnami/fluentd/1/debian-11/Dockerfile index 19933692403cb..f9b5d0a151ca6 100644 --- a/bitnami/fluentd/1/debian-11/Dockerfile +++ b/bitnami/fluentd/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T22:30:03Z" \ + org.opencontainers.image.created="2023-11-25T09:45:24Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.16.2-debian-11-r80" \ + org.opencontainers.image.ref.name="1.16.3-debian-11-r1" \ org.opencontainers.image.title="fluentd" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.16.2" + org.opencontainers.image.version="1.16.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages ca-certificates curl libcrypt1 libgcc-s1 libjemalloc-dev libreadline-dev libreadline8 libssl-dev libssl1.1 libstdc++6 libtinfo6 procps sqlite3 zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN install_packages ca-certificates curl libcrypt1 libgcc-s1 libjemalloc-dev libreadline-dev libreadline8 libssl-dev libssl1.1 libstdc++6 libtinfo6 libyaml-dev procps sqlite3 zlib1g +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ruby-3.1.4-7-linux-${OS_ARCH}-debian-11" \ - "fluentd-1.16.2-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "ruby-3.1.4-9-linux-${OS_ARCH}-debian-11" \ + "fluentd-1.16.3-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -45,7 +45,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/fluentd/postunpack.sh -ENV APP_VERSION="1.16.2" \ +ENV APP_VERSION="1.16.3" \ BITNAMI_APP_NAME="fluentd" \ GEM_HOME="/opt/bitnami/fluentd" \ PATH="/opt/bitnami/ruby/bin:/opt/bitnami/fluentd/bin:$PATH" diff --git a/bitnami/fluentd/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/fluentd/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 44e3ac6daa742..73cb01af73cda 100644 --- a/bitnami/fluentd/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/fluentd/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.16.2-3" + "version": "1.16.3-0" }, "ruby": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.1.4-7" + "version": "3.1.4-9" } } \ No newline at end of file diff --git a/bitnami/fluentd/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/fluentd/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/fluentd/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/fluentd/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/fluentd/1/debian-11/tags-info.yaml b/bitnami/fluentd/1/debian-11/tags-info.yaml index c486c6f8f6533..278df8920ebfd 100644 --- a/bitnami/fluentd/1/debian-11/tags-info.yaml +++ b/bitnami/fluentd/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.16.2 +- 1.16.3 - latest diff --git a/bitnami/fluentd/README.md b/bitnami/fluentd/README.md index cce8f724bc4c5..70b0f4d2d9c64 100644 --- a/bitnami/fluentd/README.md +++ b/bitnami/fluentd/README.md @@ -1,4 +1,4 @@ -# Fluentd packaged by Bitnami +# Bitnami package for Fluentd ## What is Fluentd? diff --git a/bitnami/fluxcd-helm-controller/0/debian-11/Dockerfile b/bitnami/fluxcd-helm-controller/0/debian-11/Dockerfile index 05e3d39f7647e..00d23c484d245 100644 --- a/bitnami/fluxcd-helm-controller/0/debian-11/Dockerfile +++ b/bitnami/fluxcd-helm-controller/0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T16:18:14Z" \ + org.opencontainers.image.created="2023-12-15T09:50:43Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.36.2-debian-11-r0" \ + org.opencontainers.image.ref.name="0.37.1-debian-11-r0" \ org.opencontainers.image.title="fluxcd-helm-controller" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.36.2" + org.opencontainers.image.version="0.37.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "fluxcd-helm-controller-0.36.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "fluxcd-helm-controller-0.37.1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN useradd -r -u 1001 -g root fluxcd-helm-controller -ENV APP_VERSION="0.36.2" \ +ENV APP_VERSION="0.37.1" \ BITNAMI_APP_NAME="fluxcd-helm-controller" \ PATH="/opt/bitnami/fluxcd-helm-controller/bin:$PATH" diff --git a/bitnami/fluxcd-helm-controller/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/fluxcd-helm-controller/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 00788ff5d115f..59a4561d157be 100644 --- a/bitnami/fluxcd-helm-controller/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/fluxcd-helm-controller/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.36.2-0" + "version": "0.37.1-0" } } \ No newline at end of file diff --git a/bitnami/fluxcd-helm-controller/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/fluxcd-helm-controller/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/fluxcd-helm-controller/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/fluxcd-helm-controller/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/fluxcd-helm-controller/0/debian-11/tags-info.yaml b/bitnami/fluxcd-helm-controller/0/debian-11/tags-info.yaml index 95356ff8424b9..46ecb1b62ca7a 100644 --- a/bitnami/fluxcd-helm-controller/0/debian-11/tags-info.yaml +++ b/bitnami/fluxcd-helm-controller/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.36.2 +- 0.37.1 - latest diff --git a/bitnami/fluxcd-helm-controller/README.md b/bitnami/fluxcd-helm-controller/README.md index 9baf00829c3e9..442133f08ad5c 100644 --- a/bitnami/fluxcd-helm-controller/README.md +++ b/bitnami/fluxcd-helm-controller/README.md @@ -1,4 +1,4 @@ -# Flux Helm Controller packaged by Bitnami +# Bitnami package for Flux Helm Controller ## What is Flux Helm Controller? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/fluxcd-image-automation-controller/0/debian-11/Dockerfile b/bitnami/fluxcd-image-automation-controller/0/debian-11/Dockerfile index 63118729b5242..6a2541a584fd1 100644 --- a/bitnami/fluxcd-image-automation-controller/0/debian-11/Dockerfile +++ b/bitnami/fluxcd-image-automation-controller/0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T02:01:39Z" \ + org.opencontainers.image.created="2023-12-11T15:46:49Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.36.1-debian-11-r6" \ + org.opencontainers.image.ref.name="0.37.0-debian-11-r0" \ org.opencontainers.image.title="fluxcd-image-automation-controller" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.36.1" + org.opencontainers.image.version="0.37.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "fluxcd-image-automation-controller-0.36.1-4-linux-${OS_ARCH}-debian-11" \ - ) && \ + "fluxcd-image-automation-controller-0.37.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN useradd -r -u 1001 -g root fluxcd-image-automation-controll -ENV APP_VERSION="0.36.1" \ +ENV APP_VERSION="0.37.0" \ BITNAMI_APP_NAME="fluxcd-image-automation-controller" \ PATH="/opt/bitnami/fluxcd-image-automation-controller/bin:$PATH" diff --git a/bitnami/fluxcd-image-automation-controller/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/fluxcd-image-automation-controller/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index a3b680b97a6c8..81d7c75314d2d 100644 --- a/bitnami/fluxcd-image-automation-controller/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/fluxcd-image-automation-controller/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.36.1-4" + "version": "0.37.0-0" } } \ No newline at end of file diff --git a/bitnami/fluxcd-image-automation-controller/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/fluxcd-image-automation-controller/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/fluxcd-image-automation-controller/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/fluxcd-image-automation-controller/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/fluxcd-image-automation-controller/0/debian-11/tags-info.yaml b/bitnami/fluxcd-image-automation-controller/0/debian-11/tags-info.yaml index 4855002de8742..a402b109ed8e8 100644 --- a/bitnami/fluxcd-image-automation-controller/0/debian-11/tags-info.yaml +++ b/bitnami/fluxcd-image-automation-controller/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.36.1 +- 0.37.0 - latest diff --git a/bitnami/fluxcd-image-automation-controller/README.md b/bitnami/fluxcd-image-automation-controller/README.md index f57b1c8acf506..64b638a27ffa9 100644 --- a/bitnami/fluxcd-image-automation-controller/README.md +++ b/bitnami/fluxcd-image-automation-controller/README.md @@ -1,4 +1,4 @@ -# Flux Image Automation Controller packaged by Bitnami +# Bitnami package for Flux Image Automation Controller ## What is Flux Image Automation Controller? @@ -26,7 +26,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/fluxcd-image-reflector-controller/0/debian-11/Dockerfile b/bitnami/fluxcd-image-reflector-controller/0/debian-11/Dockerfile index 74eb6b7ac0d37..a6ece53674f1d 100644 --- a/bitnami/fluxcd-image-reflector-controller/0/debian-11/Dockerfile +++ b/bitnami/fluxcd-image-reflector-controller/0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T02:03:59Z" \ + org.opencontainers.image.created="2023-12-11T15:51:31Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.30.0-debian-11-r43" \ + org.opencontainers.image.ref.name="0.31.1-debian-11-r0" \ org.opencontainers.image.title="fluxcd-image-reflector-controller" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.30.0" + org.opencontainers.image.version="0.31.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "fluxcd-image-reflector-controller-0.30.0-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "fluxcd-image-reflector-controller-0.31.1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN useradd -r -u 1001 -g root fluxcd-image-reflector-controlle -ENV APP_VERSION="0.30.0" \ +ENV APP_VERSION="0.31.1" \ BITNAMI_APP_NAME="fluxcd-image-reflector-controller" \ PATH="/opt/bitnami/fluxcd-image-reflector-controller/bin:$PATH" diff --git a/bitnami/fluxcd-image-reflector-controller/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/fluxcd-image-reflector-controller/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 092c0166de5af..0d936dbb165a7 100644 --- a/bitnami/fluxcd-image-reflector-controller/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/fluxcd-image-reflector-controller/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.30.0-3" + "version": "0.31.1-0" } } \ No newline at end of file diff --git a/bitnami/fluxcd-image-reflector-controller/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/fluxcd-image-reflector-controller/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/fluxcd-image-reflector-controller/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/fluxcd-image-reflector-controller/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/fluxcd-image-reflector-controller/0/debian-11/tags-info.yaml b/bitnami/fluxcd-image-reflector-controller/0/debian-11/tags-info.yaml index 1daf300da93a4..2e4d67954726f 100644 --- a/bitnami/fluxcd-image-reflector-controller/0/debian-11/tags-info.yaml +++ b/bitnami/fluxcd-image-reflector-controller/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.30.0 +- 0.31.1 - latest diff --git a/bitnami/fluxcd-image-reflector-controller/README.md b/bitnami/fluxcd-image-reflector-controller/README.md index e56b86ff2e14e..d4701b0be7444 100644 --- a/bitnami/fluxcd-image-reflector-controller/README.md +++ b/bitnami/fluxcd-image-reflector-controller/README.md @@ -1,4 +1,4 @@ -# Flux Image Reflector Controller packaged by Bitnami +# Bitnami package for Flux Image Reflector Controller ## What is Flux Image Reflector Controller? @@ -26,7 +26,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/fluxcd-kustomize-controller/1/debian-11/Dockerfile b/bitnami/fluxcd-kustomize-controller/1/debian-11/Dockerfile index 6a06f02779f49..a7183eef393c6 100644 --- a/bitnami/fluxcd-kustomize-controller/1/debian-11/Dockerfile +++ b/bitnami/fluxcd-kustomize-controller/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T17:21:57Z" \ + org.opencontainers.image.created="2023-12-15T01:04:57Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.1.1-debian-11-r0" \ + org.opencontainers.image.ref.name="1.2.1-debian-11-r0" \ org.opencontainers.image.title="fluxcd-kustomize-controller" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.1.1" + org.opencontainers.image.version="1.2.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl git gnupg openssh-client procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "fluxcd-kustomize-controller-1.1.1-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "fluxcd-kustomize-controller-1.2.1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN useradd -r -u 1001 -g root fluxcd-kustomize-controller -ENV APP_VERSION="1.1.1" \ +ENV APP_VERSION="1.2.1" \ BITNAMI_APP_NAME="fluxcd-kustomize-controller" \ PATH="/opt/bitnami/fluxcd-kustomize-controller/bin:$PATH" diff --git a/bitnami/fluxcd-kustomize-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/fluxcd-kustomize-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 242a7eea0ca55..67c57fe58deda 100644 --- a/bitnami/fluxcd-kustomize-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/fluxcd-kustomize-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.1.1-0" + "version": "1.2.1-0" } } \ No newline at end of file diff --git a/bitnami/fluxcd-kustomize-controller/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/fluxcd-kustomize-controller/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/fluxcd-kustomize-controller/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/fluxcd-kustomize-controller/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/fluxcd-kustomize-controller/1/debian-11/tags-info.yaml b/bitnami/fluxcd-kustomize-controller/1/debian-11/tags-info.yaml index 9343d37b086ea..8d5ac5b52dba0 100644 --- a/bitnami/fluxcd-kustomize-controller/1/debian-11/tags-info.yaml +++ b/bitnami/fluxcd-kustomize-controller/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.1.1 +- 1.2.1 - latest diff --git a/bitnami/fluxcd-kustomize-controller/README.md b/bitnami/fluxcd-kustomize-controller/README.md index c40da0f0c7f8c..7fa055375ff2a 100644 --- a/bitnami/fluxcd-kustomize-controller/README.md +++ b/bitnami/fluxcd-kustomize-controller/README.md @@ -1,4 +1,4 @@ -# Flux Kustomize Controller packaged by Bitnami +# Bitnami package for Flux Kustomize Controller ## What is Flux Kustomize Controller? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/fluxcd-notification-controller/1/debian-11/Dockerfile b/bitnami/fluxcd-notification-controller/1/debian-11/Dockerfile index ca97f097a67c8..5f319e3ed25a4 100644 --- a/bitnami/fluxcd-notification-controller/1/debian-11/Dockerfile +++ b/bitnami/fluxcd-notification-controller/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T02:26:09Z" \ + org.opencontainers.image.created="2023-12-15T00:19:09Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.1.0-debian-11-r29" \ + org.opencontainers.image.ref.name="1.2.3-debian-11-r0" \ org.opencontainers.image.title="fluxcd-notification-controller" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.1.0" + org.opencontainers.image.version="1.2.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "fluxcd-notification-controller-1.1.0-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "fluxcd-notification-controller-1.2.3-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN useradd -r -u 1001 -g root fluxcd-notification-controller -ENV APP_VERSION="1.1.0" \ +ENV APP_VERSION="1.2.3" \ BITNAMI_APP_NAME="fluxcd-notification-controller" \ PATH="/opt/bitnami/fluxcd-notification-controller/bin:$PATH" diff --git a/bitnami/fluxcd-notification-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/fluxcd-notification-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index cd2b2ff7ac02c..6f3561a6dcff4 100644 --- a/bitnami/fluxcd-notification-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/fluxcd-notification-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.1.0-3" + "version": "1.2.3-0" } } \ No newline at end of file diff --git a/bitnami/fluxcd-notification-controller/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/fluxcd-notification-controller/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/fluxcd-notification-controller/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/fluxcd-notification-controller/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/fluxcd-notification-controller/1/debian-11/tags-info.yaml b/bitnami/fluxcd-notification-controller/1/debian-11/tags-info.yaml index 60a3739c0bf0e..73832e374b1e6 100644 --- a/bitnami/fluxcd-notification-controller/1/debian-11/tags-info.yaml +++ b/bitnami/fluxcd-notification-controller/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.1.0 +- 1.2.3 - latest diff --git a/bitnami/fluxcd-notification-controller/README.md b/bitnami/fluxcd-notification-controller/README.md index 7f8f90b4b24f3..20f8f35e7c94f 100644 --- a/bitnami/fluxcd-notification-controller/README.md +++ b/bitnami/fluxcd-notification-controller/README.md @@ -1,4 +1,4 @@ -# Flux Notification Controller packaged by Bitnami +# Bitnami package for Flux Notification Controller ## What is Flux Notification Controller? @@ -26,7 +26,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/fluxcd-source-controller/1/debian-11/Dockerfile b/bitnami/fluxcd-source-controller/1/debian-11/Dockerfile index 8a668dcc4b827..2dd544600adcc 100644 --- a/bitnami/fluxcd-source-controller/1/debian-11/Dockerfile +++ b/bitnami/fluxcd-source-controller/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T17:25:11Z" \ + org.opencontainers.image.created="2023-12-14T19:06:41Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.1.2-debian-11-r0" \ - org.opencontainers.image.title="fluxcd-source-controller" \ + org.opencontainers.image.ref.name="1.2.3-debian-11-r0" \ + org.opencontainers.image.title="flux" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.1.2" + org.opencontainers.image.version="1.2.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,30 +21,30 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "fluxcd-source-controller-1.1.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "flux-1.2.3-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives -RUN useradd -r -u 1001 -g root fluxcd-source-controller +RUN useradd -r -u 1001 -g root flux -ENV APP_VERSION="1.1.2" \ - BITNAMI_APP_NAME="fluxcd-source-controller" \ - PATH="/opt/bitnami/fluxcd-source-controller/bin:$PATH" +ENV APP_VERSION="1.2.3" \ + BITNAMI_APP_NAME="flux" \ + PATH="/opt/bitnami/flux/bin:$PATH" USER 1001 -ENTRYPOINT [ "/opt/bitnami/fluxcd-source-controller/bin/source-controller" ] +ENTRYPOINT [ "/opt/bitnami/flux/bin/source-controller" ] diff --git a/bitnami/fluxcd-source-controller/1/debian-11/docker-compose.yml b/bitnami/fluxcd-source-controller/1/debian-11/docker-compose.yml index ae89407bac16c..7f547b51467b1 100644 --- a/bitnami/fluxcd-source-controller/1/debian-11/docker-compose.yml +++ b/bitnami/fluxcd-source-controller/1/debian-11/docker-compose.yml @@ -5,4 +5,4 @@ version: '2' services: fluxcd-source-controller: - image: docker.io/bitnami/fluxcd-source-controller:1 + image: diff --git a/bitnami/fluxcd-source-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/fluxcd-source-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index a45f801dc3a45..17adcc6fdb3c5 100644 --- a/bitnami/fluxcd-source-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/fluxcd-source-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,8 +1,8 @@ { - "fluxcd-source-controller": { + "flux": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.1.2-0" + "version": "1.2.3-0" } } \ No newline at end of file diff --git a/bitnami/fluxcd-source-controller/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/fluxcd-source-controller/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/fluxcd-source-controller/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/fluxcd-source-controller/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/fluxcd-source-controller/1/debian-11/tags-info.yaml b/bitnami/fluxcd-source-controller/1/debian-11/tags-info.yaml index 0283dbc118d6d..73832e374b1e6 100644 --- a/bitnami/fluxcd-source-controller/1/debian-11/tags-info.yaml +++ b/bitnami/fluxcd-source-controller/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.1.2 +- 1.2.3 - latest diff --git a/bitnami/fluxcd-source-controller/README.md b/bitnami/fluxcd-source-controller/README.md index c0ceb322da681..2f683a0ede628 100644 --- a/bitnami/fluxcd-source-controller/README.md +++ b/bitnami/fluxcd-source-controller/README.md @@ -1,10 +1,10 @@ -# Flux Source Controller packaged by Bitnami +# Bitnami package for Flux -## What is Flux Source Controller? +## What is Flux? > Source Controller is a component of Flux. Flux is a tool for keeping Kubernetes clusters in sync with sources of configuration. -[Overview of Flux Source Controller](https://github.com/fluxcd/source-controller) +[Overview of Flux](https://github.com/fluxcd/source-controller) Trademarks: This software listing is packaged by Bitnami. The respective trademarks mentioned in the offering are owned by the respective companies, and use of them does not imply any affiliation or endorsement. ## TL;DR @@ -25,11 +25,11 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. -Looking to use Flux Source Controller in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. +Looking to use Flux in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. ## Supported tags and respective `Dockerfile` links @@ -41,7 +41,7 @@ Subscribe to project updates by watching the [bitnami/containers GitHub repo](ht ## Get this image -The recommended way to get the Bitnami Flux Source Controller Docker Image is to pull the prebuilt image from the [Docker Hub Registry](https://hub.docker.com/r/bitnami/fluxcd-source-controller). +The recommended way to get the Bitnami Flux Docker Image is to pull the prebuilt image from the [Docker Hub Registry](https://hub.docker.com/r/bitnami/fluxcd-source-controller). ```console docker pull bitnami/fluxcd-source-controller:latest @@ -65,7 +65,7 @@ docker build -t bitnami/APP:latest . ### Upgrade this image -Bitnami provides up-to-date versions of Flux Source Controller, including security patches, soon after they are made upstream. We recommend that you follow these steps to upgrade your container. +Bitnami provides up-to-date versions of Flux, including security patches, soon after they are made upstream. We recommend that you follow these steps to upgrade your container. #### Step 1: Get the updated image @@ -111,7 +111,7 @@ To run commands inside this container you can use `docker run`, for example to e docker run --rm --name fluxcd-source-controller bitnami/fluxcd-source-controller:latest --help ``` -Check the [official Flux Source Controller documentation](https://github.com/fluxcd/source-controller) for more information about how to use Flux Source Controller. +Check the [official Flux documentation](https://github.com/fluxcd/source-controller) for more information about how to use Flux. ## Contributing diff --git a/bitnami/fluxcd-source-controller/docker-compose.yml b/bitnami/fluxcd-source-controller/docker-compose.yml index ae89407bac16c..7f547b51467b1 100644 --- a/bitnami/fluxcd-source-controller/docker-compose.yml +++ b/bitnami/fluxcd-source-controller/docker-compose.yml @@ -5,4 +5,4 @@ version: '2' services: fluxcd-source-controller: - image: docker.io/bitnami/fluxcd-source-controller:1 + image: diff --git a/bitnami/ghost/5/debian-11/Dockerfile b/bitnami/ghost/5/debian-11/Dockerfile index 3bfd324cf8fc7..a31b9ac14c0fa 100644 --- a/bitnami/ghost/5/debian-11/Dockerfile +++ b/bitnami/ghost/5/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-30T12:19:11Z" \ + org.opencontainers.image.created="2023-12-15T01:06:35Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.71.0-debian-11-r0" \ + org.opencontainers.image.ref.name="5.75.2-debian-11-r0" \ org.opencontainers.image.title="ghost" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="5.71.0" + org.opencontainers.image.version="5.75.2" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,23 +21,23 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl jq libaudit1 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libicu67 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncurses6 libncursesw6 libnsl2 libpam0g libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 libxml2 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-8-linux-${OS_ARCH}-debian-11" \ - "node-18.18.2-0-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.11.5-1-linux-${OS_ARCH}-debian-11" \ - "ghost-5.71.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.7-0-linux-${OS_ARCH}-debian-11" \ + "node-18.19.0-0-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.11.6-0-linux-${OS_ARCH}-debian-11" \ + "ghost-5.75.2-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -47,7 +47,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/ghost/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh -ENV APP_VERSION="5.71.0" \ +ENV APP_VERSION="5.75.2" \ BITNAMI_APP_NAME="ghost" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/node/bin:/opt/bitnami/mysql/bin:/opt/bitnami/ghost/bin:$PATH" diff --git a/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 2a8fea471b7de..786adccf3a661 100644 --- a/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,24 +3,24 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "5.71.0-0" + "version": "5.75.2-0" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.11.5-1" + "version": "10.11.6-0" }, "node": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "18.18.2-0" + "version": "18.19.0-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-8" + "version": "3.11.7-0" } } \ No newline at end of file diff --git a/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/ghost/5/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/ghost/5/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/ghost/5/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/ghost/5/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/ghost/5/debian-11/tags-info.yaml b/bitnami/ghost/5/debian-11/tags-info.yaml index f6f3b484255c8..b7651da23be0b 100644 --- a/bitnami/ghost/5/debian-11/tags-info.yaml +++ b/bitnami/ghost/5/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "5" - 5-debian-11 -- 5.71.0 +- 5.75.2 - latest diff --git a/bitnami/ghost/README.md b/bitnami/ghost/README.md index 45fbfaf27dfc0..2b4a6eac91ceb 100644 --- a/bitnami/ghost/README.md +++ b/bitnami/ghost/README.md @@ -1,4 +1,4 @@ -# Ghost packaged by Bitnami +# Bitnami package for Ghost ## What is Ghost? @@ -18,12 +18,12 @@ docker-compose up -d ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use Ghost in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/git/2/debian-11/Dockerfile b/bitnami/git/2/debian-11/Dockerfile index 8d2734d002f9f..73653f670371d 100644 --- a/bitnami/git/2/debian-11/Dockerfile +++ b/bitnami/git/2/debian-11/Dockerfile @@ -7,33 +7,33 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:03:50Z" \ + org.opencontainers.image.created="2023-12-02T07:28:31Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.42.0-debian-11-r45" \ + org.opencontainers.image.ref.name="2.43.0-debian-11-r1" \ org.opencontainers.image.title="git" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.42.0" + org.opencontainers.image.version="2.43.0" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl git-lfs less libbrotli1 libcom-err2 libcurl4 libffi7 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libtasn1-6 libunistring2 procps ssh zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "git-2.42.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "git-2.43.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -42,7 +42,7 @@ RUN apt-get update && apt-get upgrade -y && \ COPY rootfs / RUN rm -f /etc/ssh/ssh_host_* > /dev/null 2>&1 && \ chmod g+w /etc/ssh -ENV APP_VERSION="2.42.0" \ +ENV APP_VERSION="2.43.0" \ BITNAMI_APP_NAME="git" \ NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \ PATH="/opt/bitnami/git/bin:$PATH" diff --git a/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index caa696e8c0101..9130133b8dd0a 100644 --- a/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.42.0-0" + "version": "2.43.0-0" } } \ No newline at end of file diff --git a/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/git/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/git/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/git/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/git/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/git/2/debian-11/tags-info.yaml b/bitnami/git/2/debian-11/tags-info.yaml index b46a53d0d95f6..a26a55d8c4ca8 100644 --- a/bitnami/git/2/debian-11/tags-info.yaml +++ b/bitnami/git/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.42.0 +- 2.43.0 - latest diff --git a/bitnami/git/README.md b/bitnami/git/README.md index 321c1af107c5e..6c46bd546d1a5 100644 --- a/bitnami/git/README.md +++ b/bitnami/git/README.md @@ -1,4 +1,4 @@ -# Git packaged by Bitnami +# Bitnami package for Git ## What is Git? @@ -18,7 +18,7 @@ docker run --name git bitnami/git:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/gitea/1/debian-11/Dockerfile b/bitnami/gitea/1/debian-11/Dockerfile index 6fc57f3f6e892..4a37b2dc4ea5c 100644 --- a/bitnami/gitea/1/debian-11/Dockerfile +++ b/bitnami/gitea/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T20:28:58Z" \ + org.opencontainers.image.created="2023-12-12T16:34:44Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.20.5-debian-11-r6" \ + org.opencontainers.image.ref.name="1.21.2-debian-11-r0" \ org.opencontainers.image.title="gitea" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.20.5" + org.opencontainers.image.version="1.21.2" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,23 +21,23 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl git procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "ini-file-1.4.6-2-linux-${OS_ARCH}-debian-11" \ - "gitea-1.20.5-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "ini-file-1.4.6-4-linux-${OS_ARCH}-debian-11" \ + "gitea-1.21.2-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -46,7 +46,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/gitea/postunpack.sh -ENV APP_VERSION="1.20.5" \ +ENV APP_VERSION="1.21.2" \ BITNAMI_APP_NAME="gitea" \ NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/gitea/bin:$PATH" diff --git a/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 730e2c2a5af8e..2da9fccf0cf95 100644 --- a/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,24 +3,24 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.20.5-2" + "version": "1.21.2-0" }, "ini-file": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-2" + "version": "1.4.6-4" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" } } \ No newline at end of file diff --git a/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/gitea/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/gitea/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/gitea/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/gitea/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/gitea/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/gitea-env.sh b/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/gitea-env.sh index 2b5958220e2c2..7cf9171bd39c3 100644 --- a/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/gitea-env.sh +++ b/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/gitea-env.sh @@ -54,6 +54,7 @@ gitea_env_vars=( GITEA_DATABASE_CHARSET GITEA_SMTP_ENABLED GITEA_SMTP_HOST + GITEA_SMTP_PORT GITEA_SMTP_FROM GITEA_SMTP_USER GITEA_SMTP_PASSWORD @@ -116,6 +117,7 @@ export GITEA_DATABASE_SCHEMA="${GITEA_DATABASE_SCHEMA:-}" export GITEA_DATABASE_CHARSET="${GITEA_DATABASE_CHARSET:-utf8}" export GITEA_SMTP_ENABLED="${GITEA_SMTP_ENABLED:-false}" export GITEA_SMTP_HOST="${GITEA_SMTP_HOST:-}" +export GITEA_SMTP_PORT="${GITEA_SMTP_PORT:-}" export GITEA_SMTP_FROM="${GITEA_SMTP_FROM:-}" export GITEA_SMTP_USER="${GITEA_SMTP_USER:-}" export GITEA_SMTP_PASSWORD="${GITEA_SMTP_PASSWORD:-}" diff --git a/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/gitea/run.sh b/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/gitea/run.sh index 644cf8350e016..5da286fc0a8c8 100755 --- a/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/gitea/run.sh +++ b/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/gitea/run.sh @@ -19,7 +19,7 @@ set -o pipefail . /opt/bitnami/scripts/gitea-env.sh declare -a cmd=("${GITEA_BASE_DIR}/bin/gitea") -declare -a args=("--config=${GITEA_CONF_FILE}" "--pid=${GITEA_PID_FILE}" "--custom-path=${GITEA_CUSTOM_DIR}" "--work-path=${GITEA_WORK_DIR}") +declare -a args=("web" "--config=${GITEA_CONF_FILE}" "--pid=${GITEA_PID_FILE}" "--custom-path=${GITEA_CUSTOM_DIR}" "--work-path=${GITEA_WORK_DIR}") args+=("$@") info "** Starting Gitea **" diff --git a/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/libgitea.sh b/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/libgitea.sh index 281a406887d22..588e8943be9e2 100644 --- a/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/libgitea.sh +++ b/bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/libgitea.sh @@ -212,7 +212,8 @@ gitea_update_conf_file() { gitea_conf_set "security" "PASSWORD_HASH_ALGO" "$GITEA_PASSWORD_HASH_ALGO" gitea_conf_set "mailer" "ENABLED" "$GITEA_SMTP_ENABLED" - is_empty_value "$GITEA_SMTP_HOST" || gitea_conf_set "mailer" "HOST" "$GITEA_SMTP_HOST" + is_empty_value "$GITEA_SMTP_HOST" || gitea_conf_set "mailer" "SMTP_ADDR" "$GITEA_SMTP_HOST" + is_empty_value "$GITEA_SMTP_PORT" || gitea_conf_set "mailer" "SMTP_PORT" "$GITEA_SMTP_PORT" is_empty_value "$GITEA_SMTP_FROM" || gitea_conf_set "mailer" "FROM" "$GITEA_SMTP_FROM" is_empty_value "$GITEA_SMTP_USER" || gitea_conf_set "mailer" "USER" "$GITEA_SMTP_USER" is_empty_value "$GITEA_SMTP_PASSWORD" || gitea_conf_set "mailer" "PASSWD" "$GITEA_SMTP_PASSWORD" @@ -295,7 +296,8 @@ gitea_pass_wizard() { # Note in version 1.18 SMTP configuration is different if is_boolean_yes "${GITEA_SMTP_ENABLED}"; then curl_data_opts+=( - "--data-urlencode" "smtp_host=${GITEA_SMTP_HOST}" + "--data-urlencode" "smtp_addr=${GITEA_SMTP_HOST}" + "--data-urlencode" "smtp_port=${GITEA_SMTP_PORT}" "--data-urlencode" "smtp_from=${GITEA_SMTP_FROM}" "--data-urlencode" "smtp_user=${GITEA_SMTP_USER}" "--data-urlencode" "smtp_passwd=${GITEA_SMTP_PASSWORD}" @@ -325,7 +327,7 @@ gitea_start_bg() { is_gitea_running && return # This function is meant to be called for internal operations like the init scripts local -r cmd=("${GITEA_BASE_DIR}/bin/gitea") - local -r args=("--config=${GITEA_CONF_FILE}" "--pid=${GITEA_PID_FILE}" "--custom-path=${GITEA_CUSTOM_DIR}" "--work-path=${GITEA_WORK_DIR}") + local -r args=("web" "--config=${GITEA_CONF_FILE}" "--pid=${GITEA_PID_FILE}" "--custom-path=${GITEA_CUSTOM_DIR}" "--work-path=${GITEA_WORK_DIR}") if am_i_root; then run_as_user "$GITEA_DAEMON_USER" "${cmd[@]}" "${args[@]}" >"$log_file" 2>&1 & diff --git a/bitnami/gitea/1/debian-11/tags-info.yaml b/bitnami/gitea/1/debian-11/tags-info.yaml index 2a77b26d20664..a70623bbc053f 100644 --- a/bitnami/gitea/1/debian-11/tags-info.yaml +++ b/bitnami/gitea/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.20.5 +- 1.21.2 - latest diff --git a/bitnami/gitea/README.md b/bitnami/gitea/README.md index 5774a81046a12..b1dff5519ecfd 100644 --- a/bitnami/gitea/README.md +++ b/bitnami/gitea/README.md @@ -1,4 +1,4 @@ -# Gitea packaged by Bitnami +# Bitnami package for Gitea ## What is Gitea? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/gitlab-runner-helper/16/debian-11/Dockerfile b/bitnami/gitlab-runner-helper/16/debian-11/Dockerfile index c4a33f175eab4..1bbfa7ac7d2b7 100644 --- a/bitnami/gitlab-runner-helper/16/debian-11/Dockerfile +++ b/bitnami/gitlab-runner-helper/16/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-20T19:32:54Z" \ + org.opencontainers.image.created="2023-12-06T15:48:45Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="16.5.0-debian-11-r0" \ + org.opencontainers.image.ref.name="16.6.1-debian-11-r2" \ org.opencontainers.image.title="gitlab-runner-helper" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="16.5.0" + org.opencontainers.image.version="16.6.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl git git-lfs openssh-client procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "gitlab-runner-helper-16.5.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "gitlab-runner-helper-16.6.1-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -47,7 +47,7 @@ RUN mkdir /home/gitlab-runner && \ ln -s /opt/bitnami/common/bin/dumb-init /usr/bin/dumb-init && \ ln -s /opt/bitnami/scripts/gitlab-runner-helper/entrypoint.sh /entrypoint && \ ln -s /opt/bitnami/gitlab-runner-helper/bin/gitlab-runner-helper /usr/bin/gitlab-runner-helper -ENV APP_VERSION="16.5.0" \ +ENV APP_VERSION="16.6.1" \ BITNAMI_APP_NAME="gitlab-runner-helper" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/gitlab-runner-helper/bin:$PATH" diff --git a/bitnami/gitlab-runner-helper/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/gitlab-runner-helper/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 661ba557ba972..d40b23a596636 100644 --- a/bitnami/gitlab-runner-helper/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/gitlab-runner-helper/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.5.0-0" + "version": "16.6.1-1" } } \ No newline at end of file diff --git a/bitnami/gitlab-runner-helper/16/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/gitlab-runner-helper/16/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/gitlab-runner-helper/16/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/gitlab-runner-helper/16/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/gitlab-runner-helper/16/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/gitlab-runner-helper/16/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/gitlab-runner-helper/16/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/gitlab-runner-helper/16/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/gitlab-runner-helper/16/debian-11/tags-info.yaml b/bitnami/gitlab-runner-helper/16/debian-11/tags-info.yaml index a39fda7fb98fe..ad1b4afff7384 100644 --- a/bitnami/gitlab-runner-helper/16/debian-11/tags-info.yaml +++ b/bitnami/gitlab-runner-helper/16/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "16" - 16-debian-11 -- 16.5.0 +- 16.6.1 - latest diff --git a/bitnami/gitlab-runner-helper/README.md b/bitnami/gitlab-runner-helper/README.md index 89fc0c4492dbe..ccba125c349a4 100644 --- a/bitnami/gitlab-runner-helper/README.md +++ b/bitnami/gitlab-runner-helper/README.md @@ -1,4 +1,4 @@ -# Gitlab Runner Helper packaged by Bitnami +# Bitnami package for Gitlab Runner Helper ## What is Gitlab Runner Helper? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/gitlab-runner/16/debian-11/Dockerfile b/bitnami/gitlab-runner/16/debian-11/Dockerfile index af40cbe0edd0b..4c77484fe7b6d 100644 --- a/bitnami/gitlab-runner/16/debian-11/Dockerfile +++ b/bitnami/gitlab-runner/16/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-20T19:47:45Z" \ + org.opencontainers.image.created="2023-12-06T15:54:58Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="16.5.0-debian-11-r0" \ + org.opencontainers.image.ref.name="16.6.1-debian-11-r2" \ org.opencontainers.image.title="gitlab-runner" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="16.5.0" + org.opencontainers.image.version="16.6.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl git git-lfs openssh-client procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "gitlab-runner-16.5.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "gitlab-runner-16.6.1-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -43,7 +43,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN mkdir /home/gitlab-runner && chmod -R g+rwX /home/gitlab-runner && ln -s /opt/bitnami/common/bin/dumb-init /usr/bin/dumb-init && ln -s /opt/bitnami/scripts/gitlab-runner/entrypoint.sh /entrypoint -ENV APP_VERSION="16.5.0" \ +ENV APP_VERSION="16.6.1" \ BITNAMI_APP_NAME="gitlab-runner" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/gitlab-runner/bin:$PATH" diff --git a/bitnami/gitlab-runner/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/gitlab-runner/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index eb0f4c216c4b7..dbd5df01525a6 100644 --- a/bitnami/gitlab-runner/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/gitlab-runner/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.5.0-0" + "version": "16.6.1-1" } } \ No newline at end of file diff --git a/bitnami/gitlab-runner/16/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/gitlab-runner/16/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/gitlab-runner/16/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/gitlab-runner/16/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/gitlab-runner/16/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/gitlab-runner/16/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/gitlab-runner/16/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/gitlab-runner/16/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/gitlab-runner/16/debian-11/tags-info.yaml b/bitnami/gitlab-runner/16/debian-11/tags-info.yaml index a39fda7fb98fe..ad1b4afff7384 100644 --- a/bitnami/gitlab-runner/16/debian-11/tags-info.yaml +++ b/bitnami/gitlab-runner/16/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "16" - 16-debian-11 -- 16.5.0 +- 16.6.1 - latest diff --git a/bitnami/gitlab-runner/README.md b/bitnami/gitlab-runner/README.md index 33026d29ea0a5..c7db10a615077 100644 --- a/bitnami/gitlab-runner/README.md +++ b/bitnami/gitlab-runner/README.md @@ -1,4 +1,4 @@ -# Gitlab Runner packaged by Bitnami +# Bitnami package for Gitlab Runner ## What is Gitlab Runner? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/golang/1.20/debian-11/Dockerfile b/bitnami/golang/1.20/debian-11/Dockerfile index 1b739ce7f41fb..9894c5dea2c97 100644 --- a/bitnami/golang/1.20/debian-11/Dockerfile +++ b/bitnami/golang/1.20/debian-11/Dockerfile @@ -7,40 +7,40 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:57:08Z" \ + org.opencontainers.image.created="2023-12-06T15:06:57Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.20.10-debian-11-r1" \ + org.opencontainers.image.ref.name="1.20.12-debian-11-r0" \ org.opencontainers.image.title="golang" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.20.10" + org.opencontainers.image.version="1.20.12" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages build-essential ca-certificates curl git pkg-config procps unzip -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "golang-1.20.10-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "golang-1.20.12-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN mkdir -p "/go/src" "/go/bin" && chmod -R 777 "/go" -ENV APP_VERSION="1.20.10" \ +ENV APP_VERSION="1.20.12" \ BITNAMI_APP_NAME="golang" \ GOCACHE="/go/.cache" \ GOPATH="/go" \ diff --git a/bitnami/golang/1.20/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/golang/1.20/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 47a230fefa718..83aeb65101e28 100644 --- a/bitnami/golang/1.20/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/golang/1.20/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.20.10-0" + "version": "1.20.12-0" } } \ No newline at end of file diff --git a/bitnami/golang/1.20/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/golang/1.20/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/golang/1.20/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/golang/1.20/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/golang/1.20/debian-11/tags-info.yaml b/bitnami/golang/1.20/debian-11/tags-info.yaml index eedb65a5cf983..41d9d87bbe9fc 100644 --- a/bitnami/golang/1.20/debian-11/tags-info.yaml +++ b/bitnami/golang/1.20/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "1.20" - 1.20-debian-11 -- 1.20.10 +- 1.20.12 diff --git a/bitnami/golang/1.21/debian-11/Dockerfile b/bitnami/golang/1.21/debian-11/Dockerfile index 8b51190900e6b..39066d4551886 100644 --- a/bitnami/golang/1.21/debian-11/Dockerfile +++ b/bitnami/golang/1.21/debian-11/Dockerfile @@ -7,40 +7,40 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T21:26:26Z" \ + org.opencontainers.image.created="2023-12-06T15:07:51Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.21.3-debian-11-r1" \ + org.opencontainers.image.ref.name="1.21.5-debian-11-r0" \ org.opencontainers.image.title="golang" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.21.3" + org.opencontainers.image.version="1.21.5" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages build-essential ca-certificates curl git pkg-config procps unzip -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "golang-1.21.3-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "golang-1.21.5-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN mkdir -p "/go/src" "/go/bin" && chmod -R 777 "/go" -ENV APP_VERSION="1.21.3" \ +ENV APP_VERSION="1.21.5" \ BITNAMI_APP_NAME="golang" \ GOCACHE="/go/.cache" \ GOPATH="/go" \ diff --git a/bitnami/golang/1.21/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/golang/1.21/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 4a1625e95b3ea..578f212f82f34 100644 --- a/bitnami/golang/1.21/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/golang/1.21/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.21.3-0" + "version": "1.21.5-0" } } \ No newline at end of file diff --git a/bitnami/golang/1.21/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/golang/1.21/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/golang/1.21/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/golang/1.21/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/golang/1.21/debian-11/tags-info.yaml b/bitnami/golang/1.21/debian-11/tags-info.yaml index ff0e8f0081135..ea70793495e3c 100644 --- a/bitnami/golang/1.21/debian-11/tags-info.yaml +++ b/bitnami/golang/1.21/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1.21" - 1.21-debian-11 -- 1.21.3 +- 1.21.5 - latest diff --git a/bitnami/golang/README.md b/bitnami/golang/README.md index 641df998ebd20..b336c001d504a 100644 --- a/bitnami/golang/README.md +++ b/bitnami/golang/README.md @@ -1,4 +1,4 @@ -# Golang packaged by Bitnami +# Bitnami package for Golang ## What is Golang? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/google-cloud-sdk/0/debian-11/Dockerfile b/bitnami/google-cloud-sdk/0/debian-11/Dockerfile index fcd87d9485747..9b1a4ef708c88 100644 --- a/bitnami/google-cloud-sdk/0/debian-11/Dockerfile +++ b/bitnami/google-cloud-sdk/0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T22:26:11Z" \ + org.opencontainers.image.created="2023-12-15T00:50:33Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.452.0-debian-11-r0" \ + org.opencontainers.image.ref.name="0.457.0-debian-11-r0" \ org.opencontainers.image.title="google-cloud-sdk" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.452.0" + org.opencontainers.image.version="0.457.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.10.13-7-linux-${OS_ARCH}-debian-11" \ - "google-cloud-sdk-0.452.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.7-0-linux-${OS_ARCH}-debian-11" \ + "google-cloud-sdk-0.457.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -45,7 +45,7 @@ RUN chmod g+rwX /opt/bitnami RUN mkdir /.config /.gsutil && chmod g+rwX /.config /.gsutil RUN mkdir /.local && chmod g+rwX /.local -ENV APP_VERSION="0.452.0" \ +ENV APP_VERSION="0.457.0" \ BITNAMI_APP_NAME="google-cloud-sdk" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/google-cloud-sdk/bin:$PATH" diff --git a/bitnami/google-cloud-sdk/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/google-cloud-sdk/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 5ce055c261120..69daa7743bc60 100644 --- a/bitnami/google-cloud-sdk/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/google-cloud-sdk/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.452.0-0" + "version": "0.457.0-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.10.13-7" + "version": "3.11.7-0" } } \ No newline at end of file diff --git a/bitnami/google-cloud-sdk/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/google-cloud-sdk/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/google-cloud-sdk/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/google-cloud-sdk/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/google-cloud-sdk/0/debian-11/tags-info.yaml b/bitnami/google-cloud-sdk/0/debian-11/tags-info.yaml index 4385b6a329caf..1f99420194301 100644 --- a/bitnami/google-cloud-sdk/0/debian-11/tags-info.yaml +++ b/bitnami/google-cloud-sdk/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.452.0 +- 0.457.0 - latest diff --git a/bitnami/google-cloud-sdk/README.md b/bitnami/google-cloud-sdk/README.md index f62ce3b3faa50..20cd597360e12 100644 --- a/bitnami/google-cloud-sdk/README.md +++ b/bitnami/google-cloud-sdk/README.md @@ -1,4 +1,4 @@ -# Google Cloud SDK packaged by Bitnami +# Bitnami package for Google Cloud SDK ## What is Google Cloud SDK? @@ -18,7 +18,7 @@ docker run --name google-cloud-sdk bitnami/google-cloud-sdk:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/gotrue/1/debian-11/Dockerfile b/bitnami/gotrue/1/debian-11/Dockerfile index 76528b3be2cc5..2e18d4ddea21a 100644 --- a/bitnami/gotrue/1/debian-11/Dockerfile +++ b/bitnami/gotrue/1/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T03:09:43Z" \ + org.opencontainers.image.created="2023-12-06T16:01:26Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.0.1-debian-11-r216" \ + org.opencontainers.image.ref.name="1.0.1-debian-11-r218" \ org.opencontainers.image.title="gotrue" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.0.1" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "gotrue-1.0.1-9-linux-${OS_ARCH}-debian-11" \ - ) && \ + "gotrue-1.0.1-11-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/gotrue/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/gotrue/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 853e54109da22..b31ca4e6e7194 100644 --- a/bitnami/gotrue/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/gotrue/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.1-9" + "version": "1.0.1-11" } } \ No newline at end of file diff --git a/bitnami/gotrue/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/gotrue/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/gotrue/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/gotrue/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/gotrue/README.md b/bitnami/gotrue/README.md index 903736ed134e4..1622a01b4d726 100644 --- a/bitnami/gotrue/README.md +++ b/bitnami/gotrue/README.md @@ -1,4 +1,4 @@ -# GoTrue packaged by Bitnami +# Bitnami package for GoTrue ## What is GoTrue? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/gradle/8/debian-11/Dockerfile b/bitnami/gradle/8/debian-11/Dockerfile index b8bee68950803..71207b76d39b8 100644 --- a/bitnami/gradle/8/debian-11/Dockerfile +++ b/bitnami/gradle/8/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T21:04:12Z" \ + org.opencontainers.image.created="2023-12-02T08:24:28Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.4.0-debian-11-r1" \ + org.opencontainers.image.ref.name="8.5.0-debian-11-r1" \ org.opencontainers.image.title="gradle" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="8.4.0" + org.opencontainers.image.version="8.5.0" ENV HOME="/app" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,28 +21,28 @@ ENV HOME="/app" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "gradle-8.4.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "gradle-8.5.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN mkdir /app && chmod g+rwX /app -ENV APP_VERSION="8.4.0" \ +ENV APP_VERSION="8.5.0" \ BITNAMI_APP_NAME="gradle" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/gradle/bin:$PATH" diff --git a/bitnami/gradle/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/gradle/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 47ac24ffbff54..8688a3b22fa1d 100644 --- a/bitnami/gradle/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/gradle/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.4.0-0" + "version": "8.5.0-0" }, "java": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" } } \ No newline at end of file diff --git a/bitnami/gradle/8/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/gradle/8/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/gradle/8/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/gradle/8/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/gradle/8/debian-11/tags-info.yaml b/bitnami/gradle/8/debian-11/tags-info.yaml index 51bbca3dd5a40..775b8aeb5e75c 100644 --- a/bitnami/gradle/8/debian-11/tags-info.yaml +++ b/bitnami/gradle/8/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "8" - 8-debian-11 -- 8.4.0 +- 8.5.0 - latest diff --git a/bitnami/gradle/README.md b/bitnami/gradle/README.md index ad16d37f75e7b..13cf2de104d9c 100644 --- a/bitnami/gradle/README.md +++ b/bitnami/gradle/README.md @@ -1,4 +1,4 @@ -# Gradle packaged by Bitnami +# Bitnami package for Gradle ## What is Gradle? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/grafana-image-renderer/3/debian-11/Dockerfile b/bitnami/grafana-image-renderer/3/debian-11/Dockerfile index 58621b5a9cfef..c60c8989c877d 100644 --- a/bitnami/grafana-image-renderer/3/debian-11/Dockerfile +++ b/bitnami/grafana-image-renderer/3/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-27T08:04:39Z" \ + org.opencontainers.image.created="2023-12-17T00:34:42Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.8.4-debian-11-r3" \ + org.opencontainers.image.ref.name="3.9.0-debian-11-r2" \ org.opencontainers.image.title="grafana-image-renderer" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="3.8.4" + org.opencontainers.image.version="3.9.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,22 +21,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates chromium curl fonts-freefont-ttf fonts-ipafont-gothic fonts-kacst fonts-thai-tlwg fonts-wqy-zenhei gnupg jq libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 libx11-xcb1 libxcb-dri3-0 libxshmfence1 libxss1 libxtst6 procps wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-8-linux-${OS_ARCH}-debian-11" \ - "node-18.18.2-0-linux-${OS_ARCH}-debian-11" \ - "grafana-image-renderer-3.8.4-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.7-0-linux-${OS_ARCH}-debian-11" \ + "node-18.19.0-0-linux-${OS_ARCH}-debian-11" \ + "grafana-image-renderer-3.9.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -44,7 +44,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="3.8.4" \ +ENV APP_VERSION="3.9.0" \ BITNAMI_APP_NAME="grafana-image-renderer" \ HTTP_HOST="0.0.0.0" \ HTTP_PORT="8080" \ diff --git a/bitnami/grafana-image-renderer/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/grafana-image-renderer/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8c2e87b8680fa..bd61b47ab57cc 100644 --- a/bitnami/grafana-image-renderer/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/grafana-image-renderer/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.8.4-1" + "version": "3.9.0-0" }, "node": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "18.18.2-0" + "version": "18.19.0-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-8" + "version": "3.11.7-0" } } \ No newline at end of file diff --git a/bitnami/grafana-image-renderer/3/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/grafana-image-renderer/3/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/grafana-image-renderer/3/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/grafana-image-renderer/3/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/grafana-image-renderer/3/debian-11/tags-info.yaml b/bitnami/grafana-image-renderer/3/debian-11/tags-info.yaml index 3226af1b1ddd0..684c88aaa0051 100644 --- a/bitnami/grafana-image-renderer/3/debian-11/tags-info.yaml +++ b/bitnami/grafana-image-renderer/3/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "3" - 3-debian-11 -- 3.8.4 +- 3.9.0 - latest diff --git a/bitnami/grafana-image-renderer/README.md b/bitnami/grafana-image-renderer/README.md index 55dd610402460..65654e63c8e35 100644 --- a/bitnami/grafana-image-renderer/README.md +++ b/bitnami/grafana-image-renderer/README.md @@ -1,4 +1,4 @@ -# Grafana Image Renderer packaged by Bitnami +# Bitnami package for Grafana Image Renderer ## What is Grafana Image Renderer? @@ -18,7 +18,7 @@ docker run --name grafana-image-renderer bitnami/grafana-image-renderer:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/grafana-loki/2/debian-11/Dockerfile b/bitnami/grafana-loki/2/debian-11/Dockerfile index 23a2ef9409363..82fa5941f71a0 100644 --- a/bitnami/grafana-loki/2/debian-11/Dockerfile +++ b/bitnami/grafana-loki/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-16T16:48:28Z" \ + org.opencontainers.image.created="2023-12-14T01:51:07Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.9.2-debian-11-r0" \ + org.opencontainers.image.ref.name="2.9.3-debian-11-r0" \ org.opencontainers.image.title="grafana-loki" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.9.2" + org.opencontainers.image.version="2.9.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "grafana-loki-2.9.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "grafana-loki-2.9.3-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -43,7 +43,7 @@ RUN apt-get autoremove --purge -y curl && \ RUN chmod g+rwX /opt/bitnami RUN mkdir -p /bitnami/grafana-loki/data /bitnami/grafana-loki/loki /bitnami/grafana-loki/wal && chmod -R g+rwX /bitnami/grafana-loki && ln -s /bitnami/grafana-loki/loki /loki && ln -s /bitnami/grafana-loki/data /data && ln -s /bitnami/grafana-loki/wal /wal -ENV APP_VERSION="2.9.2" \ +ENV APP_VERSION="2.9.3" \ BITNAMI_APP_NAME="grafana-loki" \ PATH="/opt/bitnami/grafana-loki/bin:$PATH" diff --git a/bitnami/grafana-loki/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/grafana-loki/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 43914b64a54fe..2d7445268ebee 100644 --- a/bitnami/grafana-loki/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/grafana-loki/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.9.2-0" + "version": "2.9.3-0" } } \ No newline at end of file diff --git a/bitnami/grafana-loki/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/grafana-loki/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/grafana-loki/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/grafana-loki/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/grafana-loki/2/debian-11/tags-info.yaml b/bitnami/grafana-loki/2/debian-11/tags-info.yaml index 0a5ea3b1a8061..07fad6e5b8326 100644 --- a/bitnami/grafana-loki/2/debian-11/tags-info.yaml +++ b/bitnami/grafana-loki/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.9.2 +- 2.9.3 - latest diff --git a/bitnami/grafana-loki/README.md b/bitnami/grafana-loki/README.md index 7c24aa1aae600..e14273a5b7561 100644 --- a/bitnami/grafana-loki/README.md +++ b/bitnami/grafana-loki/README.md @@ -1,4 +1,4 @@ -# Grafana Loki packaged by Bitnami +# Bitnami package for Grafana Loki ## What is Grafana Loki? @@ -18,7 +18,7 @@ docker run --name grafana-loki bitnami/grafana-loki:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/grafana-mimir/2/debian-11/Dockerfile b/bitnami/grafana-mimir/2/debian-11/Dockerfile index 37cc9aca76747..4f719fae74f12 100644 --- a/bitnami/grafana-mimir/2/debian-11/Dockerfile +++ b/bitnami/grafana-mimir/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-18T21:56:53Z" \ + org.opencontainers.image.created="2023-12-12T16:41:33Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.10.3-debian-11-r0" \ + org.opencontainers.image.ref.name="2.10.5-debian-11-r0" \ org.opencontainers.image.title="grafana-mimir" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.10.3" + org.opencontainers.image.version="2.10.5" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "grafana-mimir-2.10.3-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "grafana-mimir-2.10.5-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -43,7 +43,7 @@ RUN apt-get autoremove --purge -y curl && \ RUN chmod g+rwX /opt/bitnami RUN mkdir -p /bitnami/grafana-mimir/data /bitnami/grafana-mimir/mimir && chmod -R g+rwX /bitnami/grafana-mimir && ln -s /bitnami/grafana-mimir/mimir /mimir && ln -s /bitnami/grafana-mimir/data /data -ENV APP_VERSION="2.10.3" \ +ENV APP_VERSION="2.10.5" \ BITNAMI_APP_NAME="grafana-mimir" \ PATH="/opt/bitnami/grafana-mimir/bin:$PATH" diff --git a/bitnami/grafana-mimir/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/grafana-mimir/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 5a157e9187614..783a610311c6d 100644 --- a/bitnami/grafana-mimir/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/grafana-mimir/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.10.3-0" + "version": "2.10.5-0" } } \ No newline at end of file diff --git a/bitnami/grafana-mimir/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/grafana-mimir/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/grafana-mimir/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/grafana-mimir/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/grafana-mimir/2/debian-11/tags-info.yaml b/bitnami/grafana-mimir/2/debian-11/tags-info.yaml index f96c293cdc9de..8eebed32b0ecc 100644 --- a/bitnami/grafana-mimir/2/debian-11/tags-info.yaml +++ b/bitnami/grafana-mimir/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.10.3 +- 2.10.5 - latest diff --git a/bitnami/grafana-mimir/README.md b/bitnami/grafana-mimir/README.md index 6f059da997cf5..b50746e85a34a 100644 --- a/bitnami/grafana-mimir/README.md +++ b/bitnami/grafana-mimir/README.md @@ -1,4 +1,4 @@ -# Grafana Mimir packaged by Bitnami +# Bitnami package for Grafana Mimir ## What is Grafana Mimir? @@ -18,7 +18,7 @@ docker run --name grafana-mimir bitnami/grafana-mimir:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/grafana-operator/5/debian-11/Dockerfile b/bitnami/grafana-operator/5/debian-11/Dockerfile index b8450d255610f..c55037891842a 100644 --- a/bitnami/grafana-operator/5/debian-11/Dockerfile +++ b/bitnami/grafana-operator/5/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T03:27:35Z" \ + org.opencontainers.image.created="2023-12-11T15:51:11Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.4.1-debian-11-r24" \ + org.opencontainers.image.ref.name="5.6.0-debian-11-r0" \ org.opencontainers.image.title="grafana-operator" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="5.4.1" + org.opencontainers.image.version="5.6.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "grafana-operator-5.4.1-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "grafana-operator-5.6.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -44,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami RUN ln -sf /opt/bitnami/grafana-operator/bin/grafana-operator /usr/local/bin/grafana-operator RUN mkdir -p /opt/jsonnet && ln -sf /opt/bitnami/grafonnet-lib/grafonnet /opt/jsonnet/grafonnet -ENV APP_VERSION="5.4.1" \ +ENV APP_VERSION="5.6.0" \ BITNAMI_APP_NAME="grafana-operator" \ PATH="/opt/bitnami/grafana-operator/bin:$PATH" diff --git a/bitnami/grafana-operator/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/grafana-operator/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index cf6c22458ead3..7ebfb0faa7ef6 100644 --- a/bitnami/grafana-operator/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/grafana-operator/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "5.4.1-3" + "version": "5.6.0-0" } } \ No newline at end of file diff --git a/bitnami/grafana-operator/5/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/grafana-operator/5/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/grafana-operator/5/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/grafana-operator/5/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/grafana-operator/5/debian-11/tags-info.yaml b/bitnami/grafana-operator/5/debian-11/tags-info.yaml index 312c77117aa8c..85c843e56c574 100644 --- a/bitnami/grafana-operator/5/debian-11/tags-info.yaml +++ b/bitnami/grafana-operator/5/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "5" - 5-debian-11 -- 5.4.1 +- 5.6.0 - latest diff --git a/bitnami/grafana-operator/README.md b/bitnami/grafana-operator/README.md index 5a41d2ff4182f..eda306f0b3b5d 100644 --- a/bitnami/grafana-operator/README.md +++ b/bitnami/grafana-operator/README.md @@ -1,4 +1,4 @@ -# Grafana Operator packaged by Bitnami +# Bitnami package for Grafana Operator ## What is Grafana Operator? @@ -16,7 +16,7 @@ Deploy [Grafana Operator](https://github.com/integr8ly/grafana-operator/tree/mas * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/grafana-tempo-query/2/debian-11/Dockerfile b/bitnami/grafana-tempo-query/2/debian-11/Dockerfile index ca84216e918f4..ea0e500bae7d2 100644 --- a/bitnami/grafana-tempo-query/2/debian-11/Dockerfile +++ b/bitnami/grafana-tempo-query/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T16:47:04Z" \ + org.opencontainers.image.created="2023-12-06T16:15:45Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.2.4-debian-11-r0" \ + org.opencontainers.image.ref.name="2.3.1-debian-11-r1" \ org.opencontainers.image.title="grafana-tempo-query" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.2.4" + org.opencontainers.image.version="2.3.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "grafana-tempo-query-2.2.4-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "grafana-tempo-query-2.3.1-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="2.2.4" \ +ENV APP_VERSION="2.3.1" \ BITNAMI_APP_NAME="grafana-tempo-query" \ GRPC_STORAGE_PLUGIN_BINARY="/opt/bitnami/grafana-tempo-query/bin/tempo-query" \ PATH="/opt/bitnami/grafana-tempo-query/bin:/opt/bitnami/jaeger-query/bin:$PATH" \ diff --git a/bitnami/grafana-tempo-query/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/grafana-tempo-query/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 234bc66032b11..71669368afed4 100644 --- a/bitnami/grafana-tempo-query/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/grafana-tempo-query/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.2.4-0" + "version": "2.3.1-1" } } \ No newline at end of file diff --git a/bitnami/grafana-tempo-query/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/grafana-tempo-query/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/grafana-tempo-query/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/grafana-tempo-query/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/grafana-tempo-query/2/debian-11/tags-info.yaml b/bitnami/grafana-tempo-query/2/debian-11/tags-info.yaml index 16163350e82d1..95be3f4e047f1 100644 --- a/bitnami/grafana-tempo-query/2/debian-11/tags-info.yaml +++ b/bitnami/grafana-tempo-query/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.2.4 +- 2.3.1 - latest diff --git a/bitnami/grafana-tempo-query/README.md b/bitnami/grafana-tempo-query/README.md index fe769a4b5799d..7c4ca8840b572 100644 --- a/bitnami/grafana-tempo-query/README.md +++ b/bitnami/grafana-tempo-query/README.md @@ -1,4 +1,4 @@ -# Grafana Tempo Query packaged by Bitnami +# Bitnami package for Grafana Tempo Query ## What is Grafana Tempo Query? @@ -18,7 +18,7 @@ docker run --name grafana-tempo-query bitnami/grafana-tempo-query:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/grafana-tempo-vulture/2/debian-11/Dockerfile b/bitnami/grafana-tempo-vulture/2/debian-11/Dockerfile index d5b638154c63d..14abcfe74b972 100644 --- a/bitnami/grafana-tempo-vulture/2/debian-11/Dockerfile +++ b/bitnami/grafana-tempo-vulture/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T16:15:12Z" \ + org.opencontainers.image.created="2023-12-06T16:20:46Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.2.4-debian-11-r0" \ + org.opencontainers.image.ref.name="2.3.1-debian-11-r1" \ org.opencontainers.image.title="grafana-tempo-vulture" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.2.4" + org.opencontainers.image.version="2.3.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "grafana-tempo-vulture-2.2.4-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "grafana-tempo-vulture-2.3.1-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="2.2.4" \ +ENV APP_VERSION="2.3.1" \ BITNAMI_APP_NAME="grafana-tempo-vulture" \ PATH="/opt/bitnami/grafana-tempo-vulture/bin:$PATH" diff --git a/bitnami/grafana-tempo-vulture/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/grafana-tempo-vulture/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 707349aacf899..1ae6f71901681 100644 --- a/bitnami/grafana-tempo-vulture/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/grafana-tempo-vulture/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.2.4-0" + "version": "2.3.1-1" } } \ No newline at end of file diff --git a/bitnami/grafana-tempo-vulture/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/grafana-tempo-vulture/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/grafana-tempo-vulture/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/grafana-tempo-vulture/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/grafana-tempo-vulture/2/debian-11/tags-info.yaml b/bitnami/grafana-tempo-vulture/2/debian-11/tags-info.yaml index 16163350e82d1..95be3f4e047f1 100644 --- a/bitnami/grafana-tempo-vulture/2/debian-11/tags-info.yaml +++ b/bitnami/grafana-tempo-vulture/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.2.4 +- 2.3.1 - latest diff --git a/bitnami/grafana-tempo-vulture/README.md b/bitnami/grafana-tempo-vulture/README.md index 2e5b4a75f60b4..3ed2537910e8c 100644 --- a/bitnami/grafana-tempo-vulture/README.md +++ b/bitnami/grafana-tempo-vulture/README.md @@ -1,4 +1,4 @@ -# Grafana Tempo Vulture packaged by Bitnami +# Bitnami package for Grafana Tempo Vulture ## What is Grafana Tempo Vulture? @@ -18,7 +18,7 @@ docker run --name grafana-tempo-vulture bitnami/grafana-tempo-vulture:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/grafana-tempo/2/debian-11/Dockerfile b/bitnami/grafana-tempo/2/debian-11/Dockerfile index 0284c3e0bc345..936c8e27cdb2a 100644 --- a/bitnami/grafana-tempo/2/debian-11/Dockerfile +++ b/bitnami/grafana-tempo/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T16:15:09Z" \ + org.opencontainers.image.created="2023-12-06T16:22:56Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.2.4-debian-11-r0" \ + org.opencontainers.image.ref.name="2.3.1-debian-11-r1" \ org.opencontainers.image.title="grafana-tempo" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.2.4" + org.opencontainers.image.version="2.3.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "grafana-tempo-2.2.4-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "grafana-tempo-2.3.1-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -43,7 +43,7 @@ RUN apt-get autoremove --purge -y curl && \ RUN chmod g+rwX /opt/bitnami RUN mkdir -p /bitnami/grafana-tempo && chmod g+rwX /bitnami/grafana-tempo -ENV APP_VERSION="2.2.4" \ +ENV APP_VERSION="2.3.1" \ BITNAMI_APP_NAME="grafana-tempo" \ PATH="/opt/bitnami/grafana-tempo/bin:$PATH" diff --git a/bitnami/grafana-tempo/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/grafana-tempo/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c1f9e7ecfac82..2a13a6fedeeab 100644 --- a/bitnami/grafana-tempo/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/grafana-tempo/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.2.4-0" + "version": "2.3.1-1" } } \ No newline at end of file diff --git a/bitnami/grafana-tempo/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/grafana-tempo/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/grafana-tempo/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/grafana-tempo/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/grafana-tempo/2/debian-11/tags-info.yaml b/bitnami/grafana-tempo/2/debian-11/tags-info.yaml index 16163350e82d1..95be3f4e047f1 100644 --- a/bitnami/grafana-tempo/2/debian-11/tags-info.yaml +++ b/bitnami/grafana-tempo/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.2.4 +- 2.3.1 - latest diff --git a/bitnami/grafana-tempo/README.md b/bitnami/grafana-tempo/README.md index b679912c8a337..e0fcd372048bc 100644 --- a/bitnami/grafana-tempo/README.md +++ b/bitnami/grafana-tempo/README.md @@ -1,4 +1,4 @@ -# Grafana Tempo packaged by Bitnami +# Bitnami package for Grafana Tempo ## What is Grafana Tempo? @@ -18,7 +18,7 @@ docker run --name grafana-tempo bitnami/grafana-tempo:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/grafana/10/debian-11/Dockerfile b/bitnami/grafana/10/debian-11/Dockerfile index 8e79bf56afaa3..bdcbdb813b4c3 100644 --- a/bitnami/grafana/10/debian-11/Dockerfile +++ b/bitnami/grafana/10/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T18:24:09Z" \ + org.opencontainers.image.created="2023-12-06T16:25:12Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.2.0-debian-11-r0" \ + org.opencontainers.image.ref.name="10.2.2-debian-11-r3" \ org.opencontainers.image.title="grafana" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="10.2.0" + org.opencontainers.image.version="10.2.2" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libfontconfig procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "grafana-10.2.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "grafana-10.2.2-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -43,7 +43,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/grafana/postunpack.sh -ENV APP_VERSION="10.2.0" \ +ENV APP_VERSION="10.2.2" \ BITNAMI_APP_NAME="grafana" \ PATH="/opt/bitnami/grafana/bin:$PATH" diff --git a/bitnami/grafana/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/grafana/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index b03fa8e4ce736..2fb8c4fac4746 100644 --- a/bitnami/grafana/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/grafana/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.2.0-0" + "version": "10.2.2-1" } } \ No newline at end of file diff --git a/bitnami/grafana/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/grafana/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/grafana/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/grafana/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/grafana/10/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/grafana/10/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/grafana/10/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/grafana/10/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/grafana/postunpack.sh b/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/grafana/postunpack.sh index 91ff8596cf186..7493c7cf36c7c 100755 --- a/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/grafana/postunpack.sh +++ b/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/grafana/postunpack.sh @@ -63,7 +63,7 @@ grafana_plugin_list=( ) for plugin in "${grafana_plugin_list[@]}"; do info "Installing ${plugin} plugin" - grafana-cli --pluginsDir "$(grafana_env_var_value PATHS_PLUGINS)" plugins install "$plugin" + grafana cli --pluginsDir "$(grafana_env_var_value PATHS_PLUGINS)" plugins install "$plugin" done # The Grafana Helm chart mounts the data directory at "/opt/bitnami/grafana/data" diff --git a/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/grafana/run.sh b/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/grafana/run.sh index d36a33bd658a7..6860070c21078 100755 --- a/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/grafana/run.sh +++ b/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/grafana/run.sh @@ -16,9 +16,10 @@ set -o pipefail . /opt/bitnami/scripts/libos.sh . /opt/bitnami/scripts/liblog.sh -declare cmd="grafana-server" +declare cmd="grafana" declare -a args=( # Based on https://github.com/grafana/grafana/blob/v8.2.5/packaging/docker/run.sh + "server" "--homepath=${GF_PATHS_HOME}" "--config=${GF_PATHS_CONFIG}" "--pidfile=${GRAFANA_PID_FILE}" diff --git a/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/libgrafana.sh b/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/libgrafana.sh index 8fbbb3e706492..351f00ab85327 100644 --- a/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/libgrafana.sh +++ b/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/libgrafana.sh @@ -223,9 +223,10 @@ EOF # None ######################### grafana_start_bg() { - local cmd="grafana-server" + local cmd="grafana" local -a args=( # Based on https://github.com/grafana/grafana/blob/v8.2.5/packaging/docker/run.sh + "server" "--homepath=${GF_PATHS_HOME}" "--config=${GF_PATHS_CONFIG}" "--packaging=docker" @@ -339,7 +340,7 @@ grafana_install_plugins() { if [[ -n "$plugin_version" ]]; then grafana_plugin_install_args+=("$plugin_version") fi - grafana-cli "${grafana_plugin_install_args[@]}" + grafana cli "${grafana_plugin_install_args[@]}" done } diff --git a/bitnami/grafana/10/debian-11/tags-info.yaml b/bitnami/grafana/10/debian-11/tags-info.yaml index 84fedcfa43dc2..85c94fb11692d 100644 --- a/bitnami/grafana/10/debian-11/tags-info.yaml +++ b/bitnami/grafana/10/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "10" - 10-debian-11 -- 10.2.0 +- 10.2.2 - latest diff --git a/bitnami/grafana/README.md b/bitnami/grafana/README.md index 674226b507a05..abbccab13187e 100644 --- a/bitnami/grafana/README.md +++ b/bitnami/grafana/README.md @@ -1,4 +1,4 @@ -# Grafana packaged by Bitnami +# Bitnami package for Grafana ## What is Grafana? @@ -18,7 +18,7 @@ docker run --name grafana bitnami/grafana:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/haproxy/2/debian-11/Dockerfile b/bitnami/haproxy/2/debian-11/Dockerfile index d07f3569f7125..194ef8a1c40f0 100644 --- a/bitnami/haproxy/2/debian-11/Dockerfile +++ b/bitnami/haproxy/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-13T15:47:44Z" \ + org.opencontainers.image.created="2023-12-15T18:12:06Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.8.3-debian-11-r29" \ + org.opencontainers.image.ref.name="2.9.1-debian-11-r0" \ org.opencontainers.image.title="haproxy" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.8.3" + org.opencontainers.image.version="2.9.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libcrypt1 liblua5.4-0 libssl1.1 lua5.4 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "haproxy-2.8.3-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "haproxy-2.9.1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="2.8.3" \ +ENV APP_VERSION="2.9.1" \ BITNAMI_APP_NAME="haproxy" \ PATH="/opt/bitnami/haproxy-dataplaneapi/bin:/opt/bitnami/haproxy/sbin:/opt/bitnami/lua/bin:$PATH" diff --git a/bitnami/haproxy/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/haproxy/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 7f60345c7a2a7..8cfc9fe89b394 100644 --- a/bitnami/haproxy/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/haproxy/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.8.3-2" + "version": "2.9.1-0" } } \ No newline at end of file diff --git a/bitnami/haproxy/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/haproxy/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/haproxy/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/haproxy/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/haproxy/2/debian-11/tags-info.yaml b/bitnami/haproxy/2/debian-11/tags-info.yaml index 6f6954c495e75..18569d1c7b623 100644 --- a/bitnami/haproxy/2/debian-11/tags-info.yaml +++ b/bitnami/haproxy/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.8.3 +- 2.9.1 - latest diff --git a/bitnami/haproxy/README.md b/bitnami/haproxy/README.md index 5a16dc42b33a8..dad282ed03d29 100644 --- a/bitnami/haproxy/README.md +++ b/bitnami/haproxy/README.md @@ -1,4 +1,4 @@ -# HAProxy packaged by Bitnami +# Bitnami package for HAProxy ## What is HAProxy? @@ -18,7 +18,7 @@ docker run --name haproxy bitnami/haproxy:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile b/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile index 11cd80d5b453d..8bb164b6e3a6e 100644 --- a/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile +++ b/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T03:55:21Z" \ + org.opencontainers.image.created="2023-12-06T16:39:06Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.9.0-debian-11-r27" \ + org.opencontainers.image.ref.name="2.9.1-debian-11-r1" \ org.opencontainers.image.title="harbor-adapter-trivy" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.9.0" + org.opencontainers.image.version="2.9.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "harbor-adapter-trivy-2.9.0-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "harbor-adapter-trivy-2.9.1-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -44,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/harbor-adapter-trivy/postunpack.sh -ENV APP_VERSION="2.9.0" \ +ENV APP_VERSION="2.9.1" \ BITNAMI_APP_NAME="harbor-adapter-trivy" \ PATH="/opt/bitnami/harbor-adapter-trivy/bin:$PATH" diff --git a/bitnami/harbor-adapter-trivy/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/harbor-adapter-trivy/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 67fc7cfbef9c9..74676629aa27d 100644 --- a/bitnami/harbor-adapter-trivy/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/harbor-adapter-trivy/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.9.0-3" + "version": "2.9.1-1" } } \ No newline at end of file diff --git a/bitnami/harbor-adapter-trivy/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/harbor-adapter-trivy/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/harbor-adapter-trivy/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/harbor-adapter-trivy/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/harbor-adapter-trivy/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/harbor-adapter-trivy/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/harbor-adapter-trivy/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/harbor-adapter-trivy/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/harbor-adapter-trivy/2/debian-11/tags-info.yaml b/bitnami/harbor-adapter-trivy/2/debian-11/tags-info.yaml index 6a4080a5f75e2..18569d1c7b623 100644 --- a/bitnami/harbor-adapter-trivy/2/debian-11/tags-info.yaml +++ b/bitnami/harbor-adapter-trivy/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.9.0 +- 2.9.1 - latest diff --git a/bitnami/harbor-adapter-trivy/README.md b/bitnami/harbor-adapter-trivy/README.md index 98efdc795161f..020f61fc5dd04 100644 --- a/bitnami/harbor-adapter-trivy/README.md +++ b/bitnami/harbor-adapter-trivy/README.md @@ -1,4 +1,4 @@ -# Harbor Adapter Trivy packaged by Bitnami +# Bitnami package for Harbor Adapter Trivy ## What is Harbor Adapter Trivy? @@ -22,12 +22,10 @@ docker-compose up * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. -Bitnami containers can be used with [Kubeapps](https://kubeapps.dev/) for deployment and management of Helm Charts in clusters. - Looking to use Harbor Adapter Trivy in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. ## Why use a non-root container? diff --git a/bitnami/harbor-core/2/debian-11/Dockerfile b/bitnami/harbor-core/2/debian-11/Dockerfile index 2b999df7112b1..724aa6e0ebfb5 100644 --- a/bitnami/harbor-core/2/debian-11/Dockerfile +++ b/bitnami/harbor-core/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T06:14:33Z" \ + org.opencontainers.image.created="2023-12-19T09:49:28Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.9.0-debian-11-r25" \ + org.opencontainers.image.ref.name="2.10.0-debian-11-r0" \ org.opencontainers.image.title="harbor-core" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.9.0" + org.opencontainers.image.version="2.10.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,22 +21,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ini-file-1.4.6-2-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "harbor-core-2.9.0-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "ini-file-1.4.6-4-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "harbor-core-2.10.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/harbor-core/postunpack.sh -ENV APP_VERSION="2.9.0" \ +ENV APP_VERSION="2.10.0" \ BITNAMI_APP_NAME="harbor-core" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/harbor-core/bin:$PATH" diff --git a/bitnami/harbor-core/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/harbor-core/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index f64aed67bae28..c0e02392bb772 100644 --- a/bitnami/harbor-core/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/harbor-core/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.9.0-3" + "version": "2.10.0-0" }, "ini-file": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-2" + "version": "1.4.6-4" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" } } \ No newline at end of file diff --git a/bitnami/harbor-core/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/harbor-core/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/harbor-core/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/harbor-core/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/harbor-core/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/harbor-core/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/harbor-core/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/harbor-core/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/harbor-core/2/debian-11/tags-info.yaml b/bitnami/harbor-core/2/debian-11/tags-info.yaml index 6a4080a5f75e2..fa154790da8f0 100644 --- a/bitnami/harbor-core/2/debian-11/tags-info.yaml +++ b/bitnami/harbor-core/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.9.0 +- 2.10.0 - latest diff --git a/bitnami/harbor-core/README.md b/bitnami/harbor-core/README.md index 2d3d3c5a9cd71..10e7dbf12c167 100644 --- a/bitnami/harbor-core/README.md +++ b/bitnami/harbor-core/README.md @@ -1,4 +1,4 @@ -# Harbor Core packaged by Bitnami +# Bitnami package for Harbor Core ## What is Harbor Core? @@ -21,7 +21,8 @@ docker-compose up * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on minideb a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use Harbor Core in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/harbor-exporter/2/debian-11/Dockerfile b/bitnami/harbor-exporter/2/debian-11/Dockerfile index 6fb3fa832d7a8..4a6e4a19959e8 100644 --- a/bitnami/harbor-exporter/2/debian-11/Dockerfile +++ b/bitnami/harbor-exporter/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T04:05:26Z" \ + org.opencontainers.image.created="2023-12-19T09:58:52Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.9.0-debian-11-r24" \ + org.opencontainers.image.ref.name="2.10.0-debian-11-r0" \ org.opencontainers.image.title="harbor-exporter" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.9.0" + org.opencontainers.image.version="2.10.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "harbor-exporter-2.9.0-4-linux-${OS_ARCH}-debian-11" \ - ) && \ + "harbor-exporter-2.10.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -44,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/harbor-exporter/postunpack.sh -ENV APP_VERSION="2.9.0" \ +ENV APP_VERSION="2.10.0" \ BITNAMI_APP_NAME="harbor-exporter" \ PATH="/opt/bitnami/harbor-exporter/bin:$PATH" diff --git a/bitnami/harbor-exporter/2/debian-11/docker-compose.yml b/bitnami/harbor-exporter/2/debian-11/docker-compose.yml index f0da300e499a1..e2e2d6f78315a 100644 --- a/bitnami/harbor-exporter/2/debian-11/docker-compose.yml +++ b/bitnami/harbor-exporter/2/debian-11/docker-compose.yml @@ -12,7 +12,7 @@ services: - registry_data:/storage - ./config/registry/:/etc/registry/:ro postgresql: - image: docker.io/bitnami/postgresql:11 + image: docker.io/bitnami/postgresql:13 container_name: harbor-db environment: - POSTGRESQL_PASSWORD=bitnami diff --git a/bitnami/harbor-exporter/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/harbor-exporter/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 4e98ddd4e47f5..6bf6662f2dbc6 100644 --- a/bitnami/harbor-exporter/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/harbor-exporter/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.9.0-4" + "version": "2.10.0-0" } } \ No newline at end of file diff --git a/bitnami/harbor-exporter/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/harbor-exporter/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/harbor-exporter/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/harbor-exporter/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/harbor-exporter/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/harbor-exporter/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/harbor-exporter/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/harbor-exporter/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/harbor-exporter/2/debian-11/tags-info.yaml b/bitnami/harbor-exporter/2/debian-11/tags-info.yaml index 6a4080a5f75e2..fa154790da8f0 100644 --- a/bitnami/harbor-exporter/2/debian-11/tags-info.yaml +++ b/bitnami/harbor-exporter/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.9.0 +- 2.10.0 - latest diff --git a/bitnami/harbor-exporter/README.md b/bitnami/harbor-exporter/README.md index dc95db5cf58cd..10f3a3579281d 100644 --- a/bitnami/harbor-exporter/README.md +++ b/bitnami/harbor-exporter/README.md @@ -21,7 +21,8 @@ docker-compose up * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on minideb a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use harbor-exporter in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/harbor-exporter/docker-compose.yml b/bitnami/harbor-exporter/docker-compose.yml index f0da300e499a1..e2e2d6f78315a 100644 --- a/bitnami/harbor-exporter/docker-compose.yml +++ b/bitnami/harbor-exporter/docker-compose.yml @@ -12,7 +12,7 @@ services: - registry_data:/storage - ./config/registry/:/etc/registry/:ro postgresql: - image: docker.io/bitnami/postgresql:11 + image: docker.io/bitnami/postgresql:13 container_name: harbor-db environment: - POSTGRESQL_PASSWORD=bitnami diff --git a/bitnami/harbor-jobservice/2/debian-11/Dockerfile b/bitnami/harbor-jobservice/2/debian-11/Dockerfile index 789135b37d4a3..ab374a9d6565d 100644 --- a/bitnami/harbor-jobservice/2/debian-11/Dockerfile +++ b/bitnami/harbor-jobservice/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T06:15:51Z" \ + org.opencontainers.image.created="2023-12-19T09:58:24Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.9.0-debian-11-r27" \ + org.opencontainers.image.ref.name="2.10.0-debian-11-r0" \ org.opencontainers.image.title="harbor-jobservice" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.9.0" + org.opencontainers.image.version="2.10.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "harbor-jobservice-2.9.0-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "yq-4.40.5-0-linux-${OS_ARCH}-debian-11" \ + "harbor-jobservice-2.10.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -44,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/harbor-jobservice/postunpack.sh -ENV APP_VERSION="2.9.0" \ +ENV APP_VERSION="2.10.0" \ BITNAMI_APP_NAME="harbor-jobservice" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/harbor-jobservice/bin:$PATH" diff --git a/bitnami/harbor-jobservice/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/harbor-jobservice/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index e68573cd64197..0a3dc31368f45 100644 --- a/bitnami/harbor-jobservice/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/harbor-jobservice/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.9.0-3" + "version": "2.10.0-0" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.5-0" } } \ No newline at end of file diff --git a/bitnami/harbor-jobservice/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/harbor-jobservice/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/harbor-jobservice/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/harbor-jobservice/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/harbor-jobservice/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/harbor-jobservice/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/harbor-jobservice/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/harbor-jobservice/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/harbor-jobservice/2/debian-11/tags-info.yaml b/bitnami/harbor-jobservice/2/debian-11/tags-info.yaml index 6a4080a5f75e2..fa154790da8f0 100644 --- a/bitnami/harbor-jobservice/2/debian-11/tags-info.yaml +++ b/bitnami/harbor-jobservice/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.9.0 +- 2.10.0 - latest diff --git a/bitnami/harbor-jobservice/README.md b/bitnami/harbor-jobservice/README.md index 6aaafe40e3bf6..8a24a2651b931 100644 --- a/bitnami/harbor-jobservice/README.md +++ b/bitnami/harbor-jobservice/README.md @@ -1,4 +1,4 @@ -# Harbor Job Service packaged by Bitnami +# Bitnami package for Harbor Job Service ## What is Harbor Job Service? @@ -21,7 +21,8 @@ docker-compose up * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on minideb a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use Harbor Job Service in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/harbor-portal/2/debian-11/Dockerfile b/bitnami/harbor-portal/2/debian-11/Dockerfile index a280610bc960e..c7879f87080db 100644 --- a/bitnami/harbor-portal/2/debian-11/Dockerfile +++ b/bitnami/harbor-portal/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T07:56:57Z" \ + org.opencontainers.image.created="2023-12-19T09:54:32Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.9.0-debian-11-r38" \ + org.opencontainers.image.ref.name="2.10.0-debian-11-r0" \ org.opencontainers.image.title="harbor-portal" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.9.0" + org.opencontainers.image.version="2.10.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,22 +21,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libcrypt1 libgeoip1 libpcre3 libssl1.1 openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "nginx-1.25.2-7-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "harbor-2.9.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "nginx-1.25.3-1-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "harbor-2.10.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -49,7 +49,7 @@ RUN ln -sf /dev/stderr /opt/bitnami/nginx/logs/error.log COPY rootfs / RUN /opt/bitnami/scripts/nginx/postunpack.sh RUN /opt/bitnami/scripts/harbor-portal/postunpack.sh -ENV APP_VERSION="2.9.0" \ +ENV APP_VERSION="2.10.0" \ BITNAMI_APP_NAME="harbor-portal" \ NGINX_HTTPS_PORT_NUMBER="" \ NGINX_HTTP_PORT_NUMBER="" \ diff --git a/bitnami/harbor-portal/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/harbor-portal/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index d72c9aad772cf..4e7f68a6ed4a7 100644 --- a/bitnami/harbor-portal/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/harbor-portal/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.9.0-0" + "version": "2.10.0-0" }, "nginx": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.25.2-7" + "version": "1.25.3-1" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" } } \ No newline at end of file diff --git a/bitnami/harbor-portal/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/harbor-portal/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/harbor-portal/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/harbor-portal/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/harbor-portal/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/harbor-portal/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/harbor-portal/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/harbor-portal/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/harbor-portal/2/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf b/bitnami/harbor-portal/2/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf index 6c2b5b1ba288f..aaf0428032c41 100644 --- a/bitnami/harbor-portal/2/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf +++ b/bitnami/harbor-portal/2/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf @@ -33,7 +33,7 @@ http { gzip_proxied any; gzip_types text/plain text/css application/javascript text/xml application/xml+rss; keepalive_timeout 65; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; + ssl_protocols TLSv1.2 TLSv1.3; ssl_ciphers HIGH:!aNULL:!MD5; client_max_body_size 80M; server_tokens off; diff --git a/bitnami/harbor-portal/2/debian-11/tags-info.yaml b/bitnami/harbor-portal/2/debian-11/tags-info.yaml index 6a4080a5f75e2..fa154790da8f0 100644 --- a/bitnami/harbor-portal/2/debian-11/tags-info.yaml +++ b/bitnami/harbor-portal/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.9.0 +- 2.10.0 - latest diff --git a/bitnami/harbor-portal/README.md b/bitnami/harbor-portal/README.md index 550763d290da8..57083a6bb7154 100644 --- a/bitnami/harbor-portal/README.md +++ b/bitnami/harbor-portal/README.md @@ -1,4 +1,4 @@ -# Harbor packaged by Bitnami +# Bitnami package for Harbor ## What is Harbor? @@ -21,7 +21,8 @@ docker-compose up * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on minideb a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use Harbor in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/harbor-registry/2/debian-11/Dockerfile b/bitnami/harbor-registry/2/debian-11/Dockerfile index e085a29422df6..74da0fc01d0e5 100644 --- a/bitnami/harbor-registry/2/debian-11/Dockerfile +++ b/bitnami/harbor-registry/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T06:15:33Z" \ + org.opencontainers.image.created="2023-12-19T09:54:57Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.9.0-debian-11-r37" \ + org.opencontainers.image.ref.name="2.10.0-debian-11-r0" \ org.opencontainers.image.title="harbor-registry" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.9.0" + org.opencontainers.image.version="2.10.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "harbor-registry-2.9.0-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "harbor-registry-2.10.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -44,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/harbor-registry/postunpack.sh -ENV APP_VERSION="2.9.0" \ +ENV APP_VERSION="2.10.0" \ BITNAMI_APP_NAME="harbor-registry" \ PATH="/opt/bitnami/harbor-registry/bin:$PATH" diff --git a/bitnami/harbor-registry/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/harbor-registry/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 089965a8d32f8..2fd7dca4d53fd 100644 --- a/bitnami/harbor-registry/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/harbor-registry/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.9.0-3" + "version": "2.10.0-0" } } \ No newline at end of file diff --git a/bitnami/harbor-registry/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/harbor-registry/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/harbor-registry/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/harbor-registry/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/harbor-registry/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/harbor-registry/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/harbor-registry/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/harbor-registry/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/harbor-registry/2/debian-11/tags-info.yaml b/bitnami/harbor-registry/2/debian-11/tags-info.yaml index 6a4080a5f75e2..fa154790da8f0 100644 --- a/bitnami/harbor-registry/2/debian-11/tags-info.yaml +++ b/bitnami/harbor-registry/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.9.0 +- 2.10.0 - latest diff --git a/bitnami/harbor-registry/README.md b/bitnami/harbor-registry/README.md index b7949d8297210..5e6e1423c00e4 100644 --- a/bitnami/harbor-registry/README.md +++ b/bitnami/harbor-registry/README.md @@ -1,4 +1,4 @@ -# Harbor Registry packaged by Bitnami +# Bitnami package for Harbor Registry ## What is Harbor Registry? @@ -21,7 +21,8 @@ docker-compose up * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on minideb a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use Harbor Registry in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/harbor-registryctl/2/debian-11/Dockerfile b/bitnami/harbor-registryctl/2/debian-11/Dockerfile index 81c3dcec1e6f5..c77502fb1725f 100644 --- a/bitnami/harbor-registryctl/2/debian-11/Dockerfile +++ b/bitnami/harbor-registryctl/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T08:21:33Z" \ + org.opencontainers.image.created="2023-12-19T09:58:47Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.9.0-debian-11-r25" \ + org.opencontainers.image.ref.name="2.10.0-debian-11-r0" \ org.opencontainers.image.title="harbor-registryctl" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.9.0" + org.opencontainers.image.version="2.10.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,22 +21,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "harbor-registry-2.9.0-3-linux-${OS_ARCH}-debian-11" \ - "harbor-registryctl-2.9.0-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "yq-4.40.5-0-linux-${OS_ARCH}-debian-11" \ + "harbor-registry-2.10.0-0-linux-${OS_ARCH}-debian-11" \ + "harbor-registryctl-2.10.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/harbor-registryctl/postunpack.sh -ENV APP_VERSION="2.9.0" \ +ENV APP_VERSION="2.10.0" \ BITNAMI_APP_NAME="harbor-registryctl" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/harbor-registry/bin:/opt/bitnami/harbor-registryctl/bin:$PATH" diff --git a/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 0dec5d1da2cf3..90514fa93c4d6 100644 --- a/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.9.0-3" + "version": "2.10.0-0" }, "harbor-registryctl": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.9.0-3" + "version": "2.10.0-0" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.5-0" } } \ No newline at end of file diff --git a/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/harbor-registryctl/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/harbor-registryctl/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/harbor-registryctl/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/harbor-registryctl/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/harbor-registryctl/2/debian-11/tags-info.yaml b/bitnami/harbor-registryctl/2/debian-11/tags-info.yaml index 6a4080a5f75e2..fa154790da8f0 100644 --- a/bitnami/harbor-registryctl/2/debian-11/tags-info.yaml +++ b/bitnami/harbor-registryctl/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.9.0 +- 2.10.0 - latest diff --git a/bitnami/harbor-registryctl/README.md b/bitnami/harbor-registryctl/README.md index 1bae10392b7f6..f9b222ec06fd9 100644 --- a/bitnami/harbor-registryctl/README.md +++ b/bitnami/harbor-registryctl/README.md @@ -1,4 +1,4 @@ -# Harbor Registryctl packaged by Bitnami +# Bitnami package for Harbor Registryctl ## What is Harbor Registryctl? @@ -21,7 +21,8 @@ docker-compose up * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on minideb a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use Harbor Registryctl in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/influxdb/2/debian-11/Dockerfile b/bitnami/influxdb/2/debian-11/Dockerfile index c51af18f0a337..8a1bae92fc8e2 100644 --- a/bitnami/influxdb/2/debian-11/Dockerfile +++ b/bitnami/influxdb/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-17T19:42:53Z" \ + org.opencontainers.image.created="2023-12-07T16:56:57Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.7.3-debian-11-r0" \ + org.opencontainers.image.ref.name="2.7.4-debian-11-r2" \ org.opencontainers.image.title="influxdb" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.7.3" + org.opencontainers.image.version="2.7.4" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgcc-s1 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "influxdb-2.7.3-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "influxdb-2.7.4-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -44,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/influxdb/postunpack.sh -ENV APP_VERSION="2.7.3" \ +ENV APP_VERSION="2.7.4" \ BITNAMI_APP_NAME="influxdb" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/influxdb/bin:$PATH" diff --git a/bitnami/influxdb/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/influxdb/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 3bd114dc5beeb..6220d70974f22 100644 --- a/bitnami/influxdb/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/influxdb/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.7.3-0" + "version": "2.7.4-1" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" } } \ No newline at end of file diff --git a/bitnami/influxdb/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/influxdb/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/influxdb/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/influxdb/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/influxdb/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/influxdb/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/influxdb/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/influxdb/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/influxdb/2/debian-11/tags-info.yaml b/bitnami/influxdb/2/debian-11/tags-info.yaml index 6e9a1935312e7..49b93e60e2692 100644 --- a/bitnami/influxdb/2/debian-11/tags-info.yaml +++ b/bitnami/influxdb/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.7.3 +- 2.7.4 - latest diff --git a/bitnami/influxdb/README.md b/bitnami/influxdb/README.md index c58ff8692e4b0..2f95cc5ff5fa8 100644 --- a/bitnami/influxdb/README.md +++ b/bitnami/influxdb/README.md @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/jaeger/1/debian-11/Dockerfile b/bitnami/jaeger/1/debian-11/Dockerfile index d02b35a9bb13b..f5572a49683cc 100644 --- a/bitnami/jaeger/1/debian-11/Dockerfile +++ b/bitnami/jaeger/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T04:29:31Z" \ + org.opencontainers.image.created="2023-12-12T12:53:44Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.50.0-debian-11-r1" \ + org.opencontainers.image.ref.name="1.52.0-debian-11-r0" \ org.opencontainers.image.title="jaeger" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.50.0" + org.opencontainers.image.version="1.52.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "jaeger-1.50.0-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "jaeger-1.52.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="1.50.0" \ +ENV APP_VERSION="1.52.0" \ BITNAMI_APP_NAME="jaeger" \ PATH="/opt/bitnami/jaeger/bin:$PATH" diff --git a/bitnami/jaeger/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jaeger/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 88f1416d2c689..eb417f2fcace3 100644 --- a/bitnami/jaeger/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/jaeger/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.50.0-1" + "version": "1.52.0-0" } } \ No newline at end of file diff --git a/bitnami/jaeger/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/jaeger/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/jaeger/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/jaeger/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/jaeger/1/debian-11/tags-info.yaml b/bitnami/jaeger/1/debian-11/tags-info.yaml index 214ec1e9690e0..4f8ba6745e655 100644 --- a/bitnami/jaeger/1/debian-11/tags-info.yaml +++ b/bitnami/jaeger/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.50.0 +- 1.52.0 - latest diff --git a/bitnami/jaeger/README.md b/bitnami/jaeger/README.md index b6d7139455f00..2dddada139853 100644 --- a/bitnami/jaeger/README.md +++ b/bitnami/jaeger/README.md @@ -14,12 +14,12 @@ docker run --name v bitnami/jaeger:latest ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use jaeger in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/jasperreports/8/debian-11/Dockerfile b/bitnami/jasperreports/8/debian-11/Dockerfile index 1e0b9bfeb60d3..45d5cf954eeb7 100644 --- a/bitnami/jasperreports/8/debian-11/Dockerfile +++ b/bitnami/jasperreports/8/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:44:05Z" \ + org.opencontainers.image.created="2023-12-17T11:10:46Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.2.0-debian-11-r96" \ + org.opencontainers.image.ref.name="8.2.0-debian-11-r99" \ org.opencontainers.image.title="jasperreports" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="8.2.0" @@ -22,25 +22,25 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl fontconfig git libaudit1 libbsd0 libcap-ng0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblzma5 libmd0 libncurses6 libnettle8 libp11-kit0 libpam0g libsasl2-2 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 procps xmlstarlet zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-1.8.382-6-6-linux-${OS_ARCH}-debian-11" \ - "tomcat-9.0.81-0-linux-${OS_ARCH}-debian-11" \ - "postgresql-client-11.21.0-1-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.11.5-1-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "jasperreports-8.2.0-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-1.8.392-9-8-linux-${OS_ARCH}-debian-11" \ + "tomcat-9.0.84-0-linux-${OS_ARCH}-debian-11" \ + "postgresql-client-15.5.0-0-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.11.6-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "jasperreports-8.2.0-4-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 9e4fdbeecc6fb..04ff1e6f81cad 100644 --- a/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,36 +3,36 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.0-3" + "version": "8.2.0-4" }, "java": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.8.382-6-6" + "version": "1.8.392-9-8" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.11.5-1" + "version": "10.11.6-0" }, "postgresql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.21.0-1" + "version": "15.5.0-0" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" }, "tomcat": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "9.0.81-0" + "version": "9.0.84-0" } } \ No newline at end of file diff --git a/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/jasperreports/8/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/jasperreports/8/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/jasperreports/8/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/jasperreports/8/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/jasperreports/README.md b/bitnami/jasperreports/README.md index 392e9b18fa2a5..c80e6b19d2b01 100644 --- a/bitnami/jasperreports/README.md +++ b/bitnami/jasperreports/README.md @@ -1,4 +1,4 @@ -# JasperReports packaged by Bitnami +# Bitnami package for JasperReports ## What is JasperReports? @@ -18,12 +18,12 @@ docker-compose up -d ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use JasperReports in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. @@ -134,7 +134,6 @@ docker run -d --name mariadb \ $ docker volume create --name jasperreports_data docker run -d --name jasperreports \ -p 8080:8080 -p 8443:8443 \ - --env ALLOW_EMPTY_PASSWORD=yes \ --env JASPERREPORTS_DATABASE_USER=bn_jasperreports \ --env JASPERREPORTS_DATABASE_PASSWORD=bitnami \ --env JASPERREPORTS_DATABASE_NAME=bitnami_jasperreports \ @@ -207,7 +206,6 @@ docker run -d --name mariadb \ ```console docker run -d --name jasperreports \ -p 8080:8080 -p 8443:8443 \ - --env ALLOW_EMPTY_PASSWORD=yes \ --env JASPERREPORTS_DATABASE_USER=bn_jasperreports \ --env JASPERREPORTS_DATABASE_PASSWORD=bitnami \ --env JASPERREPORTS_DATABASE_NAME=bitnami_jasperreports \ diff --git a/bitnami/java/1.8/debian-11/Dockerfile b/bitnami/java/1.8/debian-11/Dockerfile index ef90d8b6b3e6e..f461e1a5caf11 100644 --- a/bitnami/java/1.8/debian-11/Dockerfile +++ b/bitnami/java/1.8/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-23T19:11:33Z" \ + org.opencontainers.image.created="2023-12-02T07:59:49Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.8.392-9-debian-11-r1" \ + org.opencontainers.image.ref.name="1.8.392-9-debian-11-r7" \ org.opencontainers.image.title="java" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.8.392-9" @@ -21,20 +21,20 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libfontconfig libgcc-s1 libsqlite3-dev libssl-dev locales procps wget -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-1.8.392-9-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-1.8.392-9-8-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 005ede1954433..a736adb4ed3f6 100644 --- a/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.8.392-9-1" + "version": "1.8.392-9-8" } } \ No newline at end of file diff --git a/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/java/1.8/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/java/1.8/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/java/1.8/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/java/1.8/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/java/11/debian-11/Dockerfile b/bitnami/java/11/debian-11/Dockerfile index 464e1f1b51055..19227038b65bd 100644 --- a/bitnami/java/11/debian-11/Dockerfile +++ b/bitnami/java/11/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-23T20:06:58Z" \ + org.opencontainers.image.created="2023-12-02T07:40:48Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="11.0.21-10-debian-11-r1" \ + org.opencontainers.image.ref.name="11.0.21-10-debian-11-r6" \ org.opencontainers.image.title="java" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="11.0.21-10" @@ -21,20 +21,20 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libfontconfig libsqlite3-dev libssl-dev locales procps wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-11.0.21-10-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-11.0.21-10-6-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/java/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/java/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 91bda7b06b416..ed79326cc28bd 100644 --- a/bitnami/java/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/java/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.0.21-10-1" + "version": "11.0.21-10-6" } } \ No newline at end of file diff --git a/bitnami/java/11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/java/11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/java/11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/java/11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/java/11/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/java/11/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/java/11/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/java/11/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/java/17/debian-11/Dockerfile b/bitnami/java/17/debian-11/Dockerfile index 04ad05267049b..36981e3556bc5 100644 --- a/bitnami/java/17/debian-11/Dockerfile +++ b/bitnami/java/17/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-23T20:41:10Z" \ + org.opencontainers.image.created="2023-12-02T09:12:59Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="17.0.9-11-debian-11-r1" \ + org.opencontainers.image.ref.name="17.0.9-11-debian-11-r7" \ org.opencontainers.image.title="java" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="17.0.9-11" @@ -21,20 +21,20 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libfontconfig libsqlite3-dev libssl-dev locales procps wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.9-11-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 2f3adc54c08ce..9bb7592a2e8c4 100644 --- a/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.9-11-1" + "version": "17.0.9-11-6" } } \ No newline at end of file diff --git a/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/java/17/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/java/17/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/java/17/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/java/17/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/java/21/debian-11/Dockerfile b/bitnami/java/21/debian-11/Dockerfile index 22744d67b46af..1af8acfe03287 100644 --- a/bitnami/java/21/debian-11/Dockerfile +++ b/bitnami/java/21/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-23T19:19:37Z" \ + org.opencontainers.image.created="2023-12-02T09:55:08Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="21.0.1-12-debian-11-r0" \ + org.opencontainers.image.ref.name="21.0.1-12-debian-11-r4" \ org.opencontainers.image.title="java" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="21.0.1-12" @@ -21,20 +21,20 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libfontconfig libsqlite3-dev libssl-dev locales procps wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-21.0.1-12-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-21.0.1-12-3-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/java/21/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/java/21/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 47b2ed627ae5b..737d190699894 100644 --- a/bitnami/java/21/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/java/21/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "21.0.1-12-0" + "version": "21.0.1-12-3" } } \ No newline at end of file diff --git a/bitnami/java/21/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/java/21/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/java/21/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/java/21/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/java/21/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/java/21/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/java/21/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/java/21/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/java/README.md b/bitnami/java/README.md index 91650a946b00b..4d6e6bf70759a 100644 --- a/bitnami/java/README.md +++ b/bitnami/java/README.md @@ -1,4 +1,4 @@ -# Java packaged by Bitnami +# Bitnami package for Java ## What is Java? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/jax/0/debian-11/Dockerfile b/bitnami/jax/0/debian-11/Dockerfile index 0e79fcc9cbe48..59a31df197df0 100644 --- a/bitnami/jax/0/debian-11/Dockerfile +++ b/bitnami/jax/0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T17:55:35Z" \ + org.opencontainers.image.created="2023-12-14T23:05:00Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.4.19-debian-11-r2" \ + org.opencontainers.image.ref.name="0.4.23-debian-11-r0" \ org.opencontainers.image.title="jax" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.4.19" + org.opencontainers.image.version="0.4.23" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.12.0-3-linux-${OS_ARCH}-debian-11" \ - "jax-0.4.19-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.12.1-0-linux-${OS_ARCH}-debian-11" \ + "jax-0.4.23-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -45,7 +45,7 @@ RUN useradd -r -u 1001 -g root jax RUN mkdir /.local && chmod g+rwX /.local RUN mkdir /app && chmod g+rwX /app -ENV APP_VERSION="0.4.19" \ +ENV APP_VERSION="0.4.23" \ BITNAMI_APP_NAME="jax" \ PATH="/opt/bitnami/python/bin:$PATH" diff --git a/bitnami/jax/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jax/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index f64af6a4fd7d3..d230ba8844bee 100644 --- a/bitnami/jax/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/jax/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.4.19-2" + "version": "0.4.23-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.12.0-3" + "version": "3.12.1-0" } } \ No newline at end of file diff --git a/bitnami/jax/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/jax/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/jax/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/jax/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/jax/0/debian-11/tags-info.yaml b/bitnami/jax/0/debian-11/tags-info.yaml index 0a52f90825617..61e82250a183c 100644 --- a/bitnami/jax/0/debian-11/tags-info.yaml +++ b/bitnami/jax/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.4.19 +- 0.4.23 - latest diff --git a/bitnami/jax/README.md b/bitnami/jax/README.md index d8c512147df38..a06288ecf43ce 100644 --- a/bitnami/jax/README.md +++ b/bitnami/jax/README.md @@ -1,4 +1,4 @@ -# JAX packaged by Bitnami +# Bitnami package for JAX ## What is JAX? @@ -22,12 +22,12 @@ docker-compose up -d ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use JAX in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. @@ -90,7 +90,7 @@ If your JAX app has a `requirements.txt` defining your app's dependencies, you c ```console docker run -it --name jax -v /path/to/app:/app bitnami/jax \ - sh -c "pip install --file requirements.txt && python script.py" + sh -c "pip install -r requirements.txt && python script.py" ``` **Further Reading:** diff --git a/bitnami/jenkins-agent/0/debian-11/Dockerfile b/bitnami/jenkins-agent/0/debian-11/Dockerfile index 05dfe55fcb024..ea36a42168c8f 100644 --- a/bitnami/jenkins-agent/0/debian-11/Dockerfile +++ b/bitnami/jenkins-agent/0/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-27T04:18:37Z" \ + org.opencontainers.image.created="2023-12-12T06:55:14Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.3192.0-debian-11-r0" \ + org.opencontainers.image.ref.name="0.3198.0-debian-11-r0" \ org.opencontainers.image.title="jenkins-agent" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.3192.0" + org.opencontainers.image.version="0.3198.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,21 +22,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.9-11-1-linux-${OS_ARCH}-debian-11" \ - "jenkins-agent-0.3192.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "jenkins-agent-0.3198.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -46,7 +46,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/jenkins-agent/postunpack.sh -ENV APP_VERSION="0.3192.0" \ +ENV APP_VERSION="0.3198.0" \ BITNAMI_APP_NAME="jenkins-agent" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:$PATH" diff --git a/bitnami/jenkins-agent/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jenkins-agent/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c469ec72fd09d..5c4bf88ab48de 100644 --- a/bitnami/jenkins-agent/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/jenkins-agent/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.9-11-1" + "version": "17.0.9-11-6" }, "jenkins-agent": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.3192.0-0" + "version": "0.3198.0-0" } } \ No newline at end of file diff --git a/bitnami/jenkins-agent/0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/jenkins-agent/0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/jenkins-agent/0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/jenkins-agent/0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/jenkins-agent/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/jenkins-agent/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/jenkins-agent/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/jenkins-agent/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/jenkins-agent/0/debian-11/tags-info.yaml b/bitnami/jenkins-agent/0/debian-11/tags-info.yaml index 407532ed3c877..27509de120a54 100644 --- a/bitnami/jenkins-agent/0/debian-11/tags-info.yaml +++ b/bitnami/jenkins-agent/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.3192.0 +- 0.3198.0 - latest diff --git a/bitnami/jenkins-agent/README.md b/bitnami/jenkins-agent/README.md index 7201317cf942f..9f37403c44836 100644 --- a/bitnami/jenkins-agent/README.md +++ b/bitnami/jenkins-agent/README.md @@ -1,4 +1,4 @@ -# Jenkins Agent packaged by Bitnami +# Bitnami package for Jenkins Agent ## What is Jenkins Agent? @@ -20,7 +20,7 @@ You can find all the available configuration options in the [Environment Variabl * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/jenkins/2/debian-11/Dockerfile b/bitnami/jenkins/2/debian-11/Dockerfile index f7135131d32d4..4a496c0d331d0 100644 --- a/bitnami/jenkins/2/debian-11/Dockerfile +++ b/bitnami/jenkins/2/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-18T21:57:48Z" \ + org.opencontainers.image.created="2023-12-17T11:01:42Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.414.3-debian-11-r0" \ + org.opencontainers.image.ref.name="2.426.2-debian-11-r1" \ org.opencontainers.image.title="jenkins" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.414.3" + org.opencontainers.image.version="2.426.2" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,22 +22,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl fontconfig git jq libfontconfig1 openssh-client procps unzip zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "jenkins-2.414.3-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "jenkins-2.426.2-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -47,7 +47,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/jenkins/postunpack.sh -ENV APP_VERSION="2.414.3" \ +ENV APP_VERSION="2.426.2" \ BITNAMI_APP_NAME="jenkins" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:$PATH" diff --git a/bitnami/jenkins/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jenkins/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index ebdf69f31dec0..cafe3c829ec09 100644 --- a/bitnami/jenkins/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/jenkins/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "jenkins": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.414.3-0" + "version": "2.426.2-1" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" } } \ No newline at end of file diff --git a/bitnami/jenkins/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/jenkins/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/jenkins/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/jenkins/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/jenkins/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/jenkins/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/jenkins/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/jenkins/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/jenkins/2/debian-11/tags-info.yaml b/bitnami/jenkins/2/debian-11/tags-info.yaml index 7b25b7437bef3..e27e38f188bc5 100644 --- a/bitnami/jenkins/2/debian-11/tags-info.yaml +++ b/bitnami/jenkins/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.414.3 +- 2.426.2 - latest diff --git a/bitnami/jenkins/README.md b/bitnami/jenkins/README.md index c875f497c578f..98a88642c34df 100644 --- a/bitnami/jenkins/README.md +++ b/bitnami/jenkins/README.md @@ -1,4 +1,4 @@ -# Jenkins packaged by Bitnami +# Bitnami package for Jenkins ## What is Jenkins? @@ -21,7 +21,7 @@ You can find the default credentials and available configuration options in the * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/jmx-exporter/0/debian-11/Dockerfile b/bitnami/jmx-exporter/0/debian-11/Dockerfile index 6a87fccd110af..d0ab75732a4d3 100644 --- a/bitnami/jmx-exporter/0/debian-11/Dockerfile +++ b/bitnami/jmx-exporter/0/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T12:37:30Z" \ + org.opencontainers.image.created="2023-12-10T18:30:33Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.20.0-debian-11-r0" \ + org.opencontainers.image.ref.name="0.20.0-debian-11-r2" \ org.opencontainers.image.title="jmx-exporter" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="0.20.0" @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.9-11-1-linux-${OS_ARCH}-debian-11" \ - "jmx-exporter-0.20.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "jmx-exporter-0.20.0-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y ca-certificates curl && \ diff --git a/bitnami/jmx-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jmx-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c3bca96a81917..dac18ae426869 100644 --- a/bitnami/jmx-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/jmx-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.9-11-1" + "version": "17.0.9-11-6" }, "jmx-exporter": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.20.0-0" + "version": "0.20.0-1" } } \ No newline at end of file diff --git a/bitnami/jmx-exporter/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/jmx-exporter/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/jmx-exporter/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/jmx-exporter/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/jmx-exporter/README.md b/bitnami/jmx-exporter/README.md index e7f23a404c194..9d75f3c664193 100644 --- a/bitnami/jmx-exporter/README.md +++ b/bitnami/jmx-exporter/README.md @@ -1,4 +1,4 @@ -# JMX Exporter packaged by Bitnami +# Bitnami package for JMX Exporter ## What is JMX Exporter? @@ -18,7 +18,7 @@ docker run --name jmx-exporter bitnami/jmx-exporter:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/joomla/5/debian-11/Dockerfile b/bitnami/joomla/5/debian-11/Dockerfile index 6db1bc2d949ef..781037ca54474 100644 --- a/bitnami/joomla/5/debian-11/Dockerfile +++ b/bitnami/joomla/5/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-23T10:10:01Z" \ + org.opencontainers.image.created="2023-12-02T08:34:52Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.0.0-debian-11-r1" \ + org.opencontainers.image.ref.name="5.0.1-debian-11-r1" \ org.opencontainers.image.title="joomla" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="5.0.0" + org.opencontainers.image.version="5.0.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,25 +21,25 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.1.24-3-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.58-0-linux-${OS_ARCH}-debian-11" \ - "mysql-client-11.1.2-2-linux-${OS_ARCH}-debian-11" \ - "libphp-8.1.24-1-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "joomla-5.0.0-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "php-8.1.26-4-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.58-1-linux-${OS_ARCH}-debian-11" \ + "mysql-client-11.1.3-0-linux-${OS_ARCH}-debian-11" \ + "libphp-8.1.26-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-3-linux-${OS_ARCH}-debian-11" \ + "joomla-5.0.1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -55,7 +55,7 @@ RUN /opt/bitnami/scripts/joomla/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ - APP_VERSION="5.0.0" \ + APP_VERSION="5.0.1" \ BITNAMI_APP_NAME="joomla" \ PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/joomla/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/joomla/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 46e5e9107a980..405c1066e28bb 100644 --- a/bitnami/joomla/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/joomla/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,36 +3,36 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.58-0" + "version": "2.4.58-1" }, "joomla": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "5.0.0-1" + "version": "5.0.1-0" }, "libphp": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.24-1" + "version": "8.1.26-0" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.1.2-2" + "version": "11.1.3-0" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.24-3" + "version": "8.1.26-4" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-3" } } \ No newline at end of file diff --git a/bitnami/joomla/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/joomla/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/joomla/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/joomla/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/joomla/5/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/joomla/5/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/joomla/5/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/joomla/5/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/joomla/5/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/joomla/5/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh index 765d1d8ce1ed5..6a480ad4ddde9 100755 --- a/bitnami/joomla/5/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh +++ b/bitnami/joomla/5/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh @@ -46,6 +46,7 @@ apache_setup_bitnami_config() { local -a modules_to_disable=( "http2_module" "proxy_hcheck_module" + "proxy_html_module" "proxy_http2_module" ) for module in "${modules_to_disable[@]}"; do diff --git a/bitnami/joomla/5/debian-11/tags-info.yaml b/bitnami/joomla/5/debian-11/tags-info.yaml index 7021c9a43b706..e38dba2773528 100644 --- a/bitnami/joomla/5/debian-11/tags-info.yaml +++ b/bitnami/joomla/5/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "5" - 5-debian-11 -- 5.0.0 +- 5.0.1 - latest diff --git a/bitnami/joomla/README.md b/bitnami/joomla/README.md index f927120b92270..18f3428770e9b 100644 --- a/bitnami/joomla/README.md +++ b/bitnami/joomla/README.md @@ -1,4 +1,4 @@ -# Joomla! packaged by Bitnami +# Bitnami package for Joomla! ## What is Joomla!? @@ -23,7 +23,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/jruby/9.4/debian-11/Dockerfile b/bitnami/jruby/9.4/debian-11/Dockerfile index 84dd65dafd8c8..2c2994b6f1927 100644 --- a/bitnami/jruby/9.4/debian-11/Dockerfile +++ b/bitnami/jruby/9.4/debian-11/Dockerfile @@ -7,36 +7,36 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T09:21:19Z" \ + org.opencontainers.image.created="2023-12-18T18:47:04Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="9.4.3-0-debian-11-r110" \ + org.opencontainers.image.ref.name="9.4.5-0-debian-11-r0" \ org.opencontainers.image.title="jruby" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="9.4.3-0" + org.opencontainers.image.version="9.4.5-0" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages build-essential ca-certificates curl git libbrotli1 libbz2-1.0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libncursesw6 libnettle8 libnghttp2-14 libnsl2 libp11-kit0 libpsl5 libreadline8 librtmp1 libsasl2-2 libsqlite3-0 libsqlite3-dev libssh2-1 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 pkg-config procps sqlite3 unzip wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "node-16.20.2-1-linux-${OS_ARCH}-debian-11" \ - "java-17.0.9-11-1-linux-${OS_ARCH}-debian-11" \ - "jruby-9.4.3-0-10-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.7-2-linux-${OS_ARCH}-debian-11" \ + "node-18.19.0-0-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "jruby-9.4.5-0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ sed -i 's/^PASS_MIN_DAYS.*/PASS_MIN_DAYS 0/' /etc/login.defs && \ sed -i 's/sha512/sha512 minlen=8/' /etc/pam.d/common-password -ENV APP_VERSION="9.4.3-0" \ +ENV APP_VERSION="9.4.5-0" \ BITNAMI_APP_NAME="jruby" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/node/bin:/opt/bitnami/java/bin:/opt/bitnami/jruby/bin:$PATH" diff --git a/bitnami/jruby/9.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jruby/9.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index f4be7c8105707..20cec06ce8909 100644 --- a/bitnami/jruby/9.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/jruby/9.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,24 +3,24 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.9-11-1" + "version": "17.0.9-11-6" }, "jruby": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "9.4.3-0-10" + "version": "9.4.5-0-0" }, "node": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.20.2-1" + "version": "18.19.0-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.7-2" } } \ No newline at end of file diff --git a/bitnami/jruby/9.4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/jruby/9.4/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/jruby/9.4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/jruby/9.4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/jruby/9.4/debian-11/tags-info.yaml b/bitnami/jruby/9.4/debian-11/tags-info.yaml index b0e4b6a1d2d47..6d5c214347b76 100644 --- a/bitnami/jruby/9.4/debian-11/tags-info.yaml +++ b/bitnami/jruby/9.4/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "9.4" - 9.4-debian-11 -- 9.4.3-0 +- 9.4.5-0 - latest diff --git a/bitnami/jruby/README.md b/bitnami/jruby/README.md index 847491a3e5d6c..019ed7fa04717 100644 --- a/bitnami/jruby/README.md +++ b/bitnami/jruby/README.md @@ -1,4 +1,4 @@ -# JRuby packaged by Bitnami +# Bitnami package for JRuby ## What is JRuby? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/jsonnet/0/debian-11/Dockerfile b/bitnami/jsonnet/0/debian-11/Dockerfile index e36fa3fb458f1..c04ded5e5cefb 100644 --- a/bitnami/jsonnet/0/debian-11/Dockerfile +++ b/bitnami/jsonnet/0/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-10T01:25:44Z" \ + org.opencontainers.image.created="2023-12-15T17:03:07Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.20.0-debian-11-r102" \ + org.opencontainers.image.ref.name="0.20.0-debian-11-r104" \ org.opencontainers.image.title="jsonnet" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="0.20.0" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgcc-s1 libstdc++6 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ "jsonnet-0.20.0-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y ca-certificates curl && \ diff --git a/bitnami/jsonnet/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/jsonnet/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/jsonnet/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/jsonnet/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/jsonnet/README.md b/bitnami/jsonnet/README.md index 85eefea3034ff..c1b8e5e8a810c 100644 --- a/bitnami/jsonnet/README.md +++ b/bitnami/jsonnet/README.md @@ -1,4 +1,4 @@ -# Jsonnet packaged by Bitnami +# Bitnami package for Jsonnet ## What is Jsonnet? @@ -18,7 +18,7 @@ docker run --name jsonnet bitnami/jsonnet:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/jupyter-base-notebook/4/debian-11/Dockerfile b/bitnami/jupyter-base-notebook/4/debian-11/Dockerfile index e4d3cef63a8f8..d9fd7d875a962 100644 --- a/bitnami/jupyter-base-notebook/4/debian-11/Dockerfile +++ b/bitnami/jupyter-base-notebook/4/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T16:17:08Z" \ + org.opencontainers.image.created="2023-12-02T08:26:18Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.0.2-debian-11-r56" \ + org.opencontainers.image.ref.name="4.0.2-debian-11-r68" \ org.opencontainers.image.title="jupyter-base-notebook" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.0.2" @@ -21,21 +21,21 @@ ENV HOME="/opt/bitnami/jupyterhub-singleuser/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbrotli1 libbz2-1.0 libcom-err2 libcrypt1 libcurl4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblz4-1 liblzma5 libncursesw6 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 libreadline8 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libxml2 libzstd1 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "miniconda-23.9.0-0-linux-${OS_ARCH}-debian-11" \ - "jupyter-base-notebook-4.0.2-6-linux-${OS_ARCH}-debian-11" \ - ) && \ + "miniconda-23.10.0-0-linux-${OS_ARCH}-debian-11" \ + "jupyter-base-notebook-4.0.2-17-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/jupyter-base-notebook/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jupyter-base-notebook/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 59380ed7b1b5c..7834a517d5dcd 100644 --- a/bitnami/jupyter-base-notebook/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/jupyter-base-notebook/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.0.2-6" + "version": "4.0.2-17" }, "miniconda": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "23.9.0-0" + "version": "23.10.0-0" } } \ No newline at end of file diff --git a/bitnami/jupyter-base-notebook/4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/jupyter-base-notebook/4/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/jupyter-base-notebook/4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/jupyter-base-notebook/4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/jupyter-base-notebook/README.md b/bitnami/jupyter-base-notebook/README.md index 1baa6dccf9a8a..c81eb6f4448d9 100644 --- a/bitnami/jupyter-base-notebook/README.md +++ b/bitnami/jupyter-base-notebook/README.md @@ -1,4 +1,4 @@ -# Jupyter Base Notebook packaged by Bitnami +# Bitnami package for Jupyter Base Notebook ## What is Jupyter Base Notebook? @@ -18,7 +18,7 @@ docker run --name jupyter-base-notebook bitnami/jupyter-base-notebook:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/jupyterhub/4/debian-11/Dockerfile b/bitnami/jupyterhub/4/debian-11/Dockerfile index 261930c9cbe14..300ab2f3a254d 100644 --- a/bitnami/jupyterhub/4/debian-11/Dockerfile +++ b/bitnami/jupyterhub/4/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T16:33:55Z" \ + org.opencontainers.image.created="2023-12-02T08:59:40Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.0.2-debian-11-r56" \ + org.opencontainers.image.ref.name="4.0.2-debian-11-r67" \ org.opencontainers.image.title="jupyterhub" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.0.2" @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbrotli1 libbz2-1.0 libcom-err2 libcrypt1 libcurl4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblz4-1 liblzma5 libncursesw6 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 libreadline8 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libxml2 libzstd1 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "miniconda-23.9.0-0-linux-${OS_ARCH}-debian-11" \ - "jupyterhub-4.0.2-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "miniconda-23.10.0-0-linux-${OS_ARCH}-debian-11" \ + "jupyterhub-4.0.2-13-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/jupyterhub/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jupyterhub/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 0b49de00863a5..5b7e08c87ffa7 100644 --- a/bitnami/jupyterhub/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/jupyterhub/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.0.2-2" + "version": "4.0.2-13" }, "miniconda": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "23.9.0-0" + "version": "23.10.0-0" } } \ No newline at end of file diff --git a/bitnami/jupyterhub/4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/jupyterhub/4/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/jupyterhub/4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/jupyterhub/4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/jupyterhub/README.md b/bitnami/jupyterhub/README.md index 980644a8fec0a..aa23d77d7cbf5 100644 --- a/bitnami/jupyterhub/README.md +++ b/bitnami/jupyterhub/README.md @@ -1,4 +1,4 @@ -# JupyterHub packaged by Bitnami +# Bitnami package for JupyterHub ## What is JupyterHub? @@ -16,7 +16,7 @@ This image is meant to run in a Kubernetes cluster. * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/jwt-cli/6/debian-11/Dockerfile b/bitnami/jwt-cli/6/debian-11/Dockerfile index 4ddb5ddec1adc..8e33eade1b53a 100644 --- a/bitnami/jwt-cli/6/debian-11/Dockerfile +++ b/bitnami/jwt-cli/6/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T16:38:24Z" \ + org.opencontainers.image.created="2023-12-01T11:24:57Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.0.0-debian-11-r21" \ + org.opencontainers.image.ref.name="6.0.0-debian-11-r23" \ org.opencontainers.image.title="jwt-cli" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="6.0.0" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgcc-s1 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "jwt-cli-6.0.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "jwt-cli-6.0.0-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/jwt-cli/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jwt-cli/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 3dad86e4e3e03..d3588e8c01165 100644 --- a/bitnami/jwt-cli/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/jwt-cli/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "6.0.0-0" + "version": "6.0.0-1" } } \ No newline at end of file diff --git a/bitnami/jwt-cli/6/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/jwt-cli/6/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/jwt-cli/6/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/jwt-cli/6/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/jwt-cli/README.md b/bitnami/jwt-cli/README.md index e1cf0ddc612a5..43f4a5661e811 100644 --- a/bitnami/jwt-cli/README.md +++ b/bitnami/jwt-cli/README.md @@ -1,4 +1,4 @@ -# JWT CLI packaged by Bitnami +# Bitnami package for JWT CLI ## What is JWT CLI? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/kafka-exporter/1/debian-11/Dockerfile b/bitnami/kafka-exporter/1/debian-11/Dockerfile index 0cd199ad8d18b..ec5e4fd37fe81 100644 --- a/bitnami/kafka-exporter/1/debian-11/Dockerfile +++ b/bitnami/kafka-exporter/1/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T04:37:16Z" \ + org.opencontainers.image.created="2023-12-07T12:50:39Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.7.0-debian-11-r132" \ + org.opencontainers.image.ref.name="1.7.0-debian-11-r134" \ org.opencontainers.image.title="kafka-exporter" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.7.0" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "kafka-exporter-1.7.0-6-linux-${OS_ARCH}-debian-11" \ - ) && \ + "kafka-exporter-1.7.0-8-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/kafka-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kafka-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 50f0706fc544d..26d39a940eea4 100644 --- a/bitnami/kafka-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kafka-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.7.0-6" + "version": "1.7.0-8" } } \ No newline at end of file diff --git a/bitnami/kafka-exporter/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kafka-exporter/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kafka-exporter/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kafka-exporter/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kafka-exporter/README.md b/bitnami/kafka-exporter/README.md index abcca783cd185..a0b83d0dbaa36 100644 --- a/bitnami/kafka-exporter/README.md +++ b/bitnami/kafka-exporter/README.md @@ -1,4 +1,4 @@ -# Kafka Exporter packaged by Bitnami +# Bitnami package for Kafka Exporter ## What is Kafka Exporter? @@ -18,7 +18,7 @@ docker run --name kafka-exporter bitnami/kafka-exporter:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/kafka/3.2/debian-11/Dockerfile b/bitnami/kafka/3.2/debian-11/Dockerfile index 12742ca97c612..351ac122d8fba 100644 --- a/bitnami/kafka/3.2/debian-11/Dockerfile +++ b/bitnami/kafka/3.2/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T20:04:26Z" \ + org.opencontainers.image.created="2023-12-02T07:54:28Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.2.3-debian-11-r226" \ + org.opencontainers.image.ref.name="3.2.3-debian-11-r228" \ org.opencontainers.image.title="kafka" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.2.3" @@ -22,23 +22,23 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-3-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-3-linux-${OS_ARCH}-debian-11" \ "kafka-3.2.3-12-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/kafka/3.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kafka/3.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 02a0d9844f4be..afa7362fd0a19 100644 --- a/bitnami/kafka/3.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kafka/3.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "kafka": { "arch": "amd64", @@ -15,12 +15,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-3" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-3" } } \ No newline at end of file diff --git a/bitnami/kafka/3.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/kafka/3.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/kafka/3.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/kafka/3.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/kafka/3.2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kafka/3.2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kafka/3.2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kafka/3.2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kafka/3.3/debian-11/Dockerfile b/bitnami/kafka/3.3/debian-11/Dockerfile index ad993033670eb..4e055dda6a7d0 100644 --- a/bitnami/kafka/3.3/debian-11/Dockerfile +++ b/bitnami/kafka/3.3/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T22:14:22Z" \ + org.opencontainers.image.created="2023-12-02T07:48:05Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.3.2-debian-11-r240" \ + org.opencontainers.image.ref.name="3.3.2-debian-11-r242" \ org.opencontainers.image.title="kafka" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.3.2" @@ -22,23 +22,23 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-3-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-3-linux-${OS_ARCH}-debian-11" \ "kafka-3.3.2-9-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/kafka/3.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kafka/3.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 828876c0bdf2c..cc37deb669a35 100644 --- a/bitnami/kafka/3.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kafka/3.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "kafka": { "arch": "amd64", @@ -15,12 +15,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-3" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-3" } } \ No newline at end of file diff --git a/bitnami/kafka/3.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/kafka/3.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/kafka/3.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/kafka/3.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/kafka/3.3/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kafka/3.3/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kafka/3.3/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kafka/3.3/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kafka/3.4/debian-11/Dockerfile b/bitnami/kafka/3.4/debian-11/Dockerfile index 7a6706c8617ef..058b5f2bdf63b 100644 --- a/bitnami/kafka/3.4/debian-11/Dockerfile +++ b/bitnami/kafka/3.4/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T20:55:51Z" \ + org.opencontainers.image.created="2023-12-02T07:46:54Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.4.1-debian-11-r114" \ + org.opencontainers.image.ref.name="3.4.1-debian-11-r116" \ org.opencontainers.image.title="kafka" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.4.1" @@ -22,23 +22,23 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "kafka-3.4.1-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "wait-for-port-1.0.7-3-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-3-linux-${OS_ARCH}-debian-11" \ + "kafka-3.4.1-3-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/kafka/3.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kafka/3.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 5ceafb06bf35d..612e5c1c235aa 100644 --- a/bitnami/kafka/3.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kafka/3.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,24 +3,24 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "kafka": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.4.1-2" + "version": "3.4.1-3" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-3" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-3" } } \ No newline at end of file diff --git a/bitnami/kafka/3.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/kafka/3.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/kafka/3.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/kafka/3.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/kafka/3.4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kafka/3.4/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kafka/3.4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kafka/3.4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kafka/3.5/debian-11/Dockerfile b/bitnami/kafka/3.5/debian-11/Dockerfile index 063f7056f17a5..c727c4053db46 100644 --- a/bitnami/kafka/3.5/debian-11/Dockerfile +++ b/bitnami/kafka/3.5/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T20:23:57Z" \ + org.opencontainers.image.created="2023-12-12T11:13:12Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.5.1-debian-11-r72" \ + org.opencontainers.image.ref.name="3.5.2-debian-11-r0" \ org.opencontainers.image.title="kafka" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="3.5.1" + org.opencontainers.image.version="3.5.2" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,23 +22,23 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "kafka-3.5.1-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "kafka-3.5.2-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -50,7 +50,7 @@ RUN ln -s /opt/bitnami/scripts/kafka/run.sh /run.sh COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/kafka/postunpack.sh -ENV APP_VERSION="3.5.1" \ +ENV APP_VERSION="3.5.2" \ BITNAMI_APP_NAME="kafka" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:/opt/bitnami/kafka/bin:$PATH" diff --git a/bitnami/kafka/3.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kafka/3.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 92f45e2a9692c..673109e044291 100644 --- a/bitnami/kafka/3.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kafka/3.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,24 +3,24 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "kafka": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.5.1-2" + "version": "3.5.2-0" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" } } \ No newline at end of file diff --git a/bitnami/kafka/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/kafka/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/kafka/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/kafka/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/kafka/3.5/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kafka/3.5/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kafka/3.5/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kafka/3.5/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kafka/3.5/debian-11/tags-info.yaml b/bitnami/kafka/3.5/debian-11/tags-info.yaml index 39f6cb0115ca0..c30f182e75d72 100644 --- a/bitnami/kafka/3.5/debian-11/tags-info.yaml +++ b/bitnami/kafka/3.5/debian-11/tags-info.yaml @@ -1,5 +1,4 @@ rolling-tags: - "3.5" - 3.5-debian-11 -- 3.5.1 -- latest +- 3.5.2 diff --git a/bitnami/kafka/3.6/debian-11/Dockerfile b/bitnami/kafka/3.6/debian-11/Dockerfile index c2878da2bedbc..200fd8a8853ff 100644 --- a/bitnami/kafka/3.6/debian-11/Dockerfile +++ b/bitnami/kafka/3.6/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-16T16:30:05Z" \ + org.opencontainers.image.created="2023-12-09T09:52:54Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.6.0-debian-11-r0" \ + org.opencontainers.image.ref.name="3.6.1-debian-11-r0" \ org.opencontainers.image.title="kafka" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="3.6.0" + org.opencontainers.image.version="3.6.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,23 +22,23 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "kafka-3.6.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "kafka-3.6.1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -50,7 +50,7 @@ RUN ln -s /opt/bitnami/scripts/kafka/run.sh /run.sh COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/kafka/postunpack.sh -ENV APP_VERSION="3.6.0" \ +ENV APP_VERSION="3.6.1" \ BITNAMI_APP_NAME="kafka" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:/opt/bitnami/kafka/bin:$PATH" diff --git a/bitnami/kafka/3.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kafka/3.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 1129f091b7095..cecc8a5d4ebf9 100644 --- a/bitnami/kafka/3.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kafka/3.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,24 +3,24 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "kafka": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.6.0-0" + "version": "3.6.1-0" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" } } \ No newline at end of file diff --git a/bitnami/kafka/3.6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/kafka/3.6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/kafka/3.6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/kafka/3.6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/kafka/3.6/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kafka/3.6/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kafka/3.6/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kafka/3.6/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kafka/3.6/debian-11/tags-info.yaml b/bitnami/kafka/3.6/debian-11/tags-info.yaml index 986d2339022fe..3ec1994d566da 100644 --- a/bitnami/kafka/3.6/debian-11/tags-info.yaml +++ b/bitnami/kafka/3.6/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "3.6" - 3.6-debian-11 -- 3.6.0 +- 3.6.1 - latest diff --git a/bitnami/kafka/README.md b/bitnami/kafka/README.md index aeedff718dcf4..6ca5e4bc1a7d5 100644 --- a/bitnami/kafka/README.md +++ b/bitnami/kafka/README.md @@ -1,4 +1,4 @@ -# Apache Kafka packaged by Bitnami +# Bitnami package for Apache Kafka ## What is Apache Kafka? @@ -23,7 +23,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. @@ -206,7 +206,9 @@ The configuration can easily be setup with the Bitnami Apache Kafka Docker image * `KAFKA_CONTROLLER_PASSWORD`: Apache Kafka controllers communication password. Default: **bitnami**. * `KAFKA_CFG_PROCESS_ROLES`: Node roles when running in KRaft mode. No defaults. * `KAFKA_CFG_NODE_ID`: Unique node id, required when running in KRaft mode. No defaults. +* `KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP`: Maps each listener with a Apache Kafka security protocol. If node is set with `controller` role, this setting is required in order to assign a security protocol for the `CONTROLLER LISTENER`. E.g.: `PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT`. No defaults. * `KAFKA_CFG_CONTROLLER_QUORUM_VOTERS`: Map of id/endpoint information for the set of controller quorum voters in a comma-separated list of {id}@{host}:{port} entries. No defaults. +* `KAFKA_CFG_CONTROLLER_LISTENER_NAMES`: Comma-separated list of the names of the listeners used by the controller. This is required if running in KRaft mode. No defaults. * `KAFKA_KRAFT_CLUSTER_ID`: Kafka cluster ID when using Kafka Raft (KRaft). No defaults. Additionally, any environment variable beginning with `KAFKA_CFG_` will be mapped to its corresponding Apache Kafka key. For example, use `KAFKA_CFG_BACKGROUND_THREADS` in order to set `background.threads` or `KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE` in order to configure `auto.create.topics.enable`. @@ -474,7 +476,7 @@ KRaft mode can be enabled by providing the following values: * `KAFKA_CFG_PROCESS_ROLES`: Comma-separated list of Kafka KRaft roles. Allowed values: `controller,broker`, `controller`, `broker`. * `KAFKA_CFG_NODE_ID`: Unique id for the Kafka node. * `KAFKA_CFG_LISTENERS`: List of Kafka listeners. If node is set with `controller` role, the listener `CONTROLLER` must be included. -* `KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP`: Maps each listener with a Apache Kafka security protocol. If node is set with `controller` role, this setting is in order to assign a security protocol for the `CONTROLLER LISTENER`. E.g.: `PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT`. +* `KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP`: Maps each listener with a Apache Kafka security protocol. If node is set with `controller` role, this setting is required in order to assign a security protocol for the `CONTROLLER LISTENER`. E.g.: `PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT`. In order to configure controllers communications without authentication, you should provide the environment variables below: diff --git a/bitnami/kaniko/1/debian-11/Dockerfile b/bitnami/kaniko/1/debian-11/Dockerfile index 14b8f5dab5a6b..76f97d2b071c2 100644 --- a/bitnami/kaniko/1/debian-11/Dockerfile +++ b/bitnami/kaniko/1/debian-11/Dockerfile @@ -9,21 +9,21 @@ ENV HOME="/root" \ OS_ARCH="${TARGETARCH:-amd64}" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "kaniko-1.17.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "kaniko-1.19.1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done @@ -40,19 +40,19 @@ ENV HOME="/root" \ LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="scratch" \ - org.opencontainers.image.created="2023-10-18T21:58:57Z" \ + org.opencontainers.image.created="2023-12-18T06:48:20Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.17.0-debian-11-r0" \ + org.opencontainers.image.ref.name="1.19.1-debian-11-r0" \ org.opencontainers.image.title="kaniko" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.17.0" + org.opencontainers.image.version="1.19.1" COPY prebuildfs / COPY rootfs / COPY --from=builder /out / -ENV APP_VERSION="1.17.0" \ +ENV APP_VERSION="1.19.1" \ BITNAMI_APP_NAME="kaniko" \ DOCKER_CONFIG="/kaniko/.docker" \ DOCKER_CREDENTIAL_GCR_CONFIG="/kaniko/.config/gcloud/docker_credential_gcr_config.json" \ diff --git a/bitnami/kaniko/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kaniko/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 86d96dfecc857..7d2b6259ee953 100644 --- a/bitnami/kaniko/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kaniko/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.17.0-0" + "version": "1.19.1-0" } } \ No newline at end of file diff --git a/bitnami/kaniko/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kaniko/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kaniko/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kaniko/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kaniko/1/debian-11/tags-info.yaml b/bitnami/kaniko/1/debian-11/tags-info.yaml index 577f9b5c0199d..19e9a08cdc732 100644 --- a/bitnami/kaniko/1/debian-11/tags-info.yaml +++ b/bitnami/kaniko/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.17.0 +- 1.19.1 - latest diff --git a/bitnami/kaniko/README.md b/bitnami/kaniko/README.md index f91d92edbbcb8..059a9fe119c93 100644 --- a/bitnami/kaniko/README.md +++ b/bitnami/kaniko/README.md @@ -1,4 +1,4 @@ -# Kaniko packaged by Bitnami +# Bitnami package for Kaniko ## What is Kaniko? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/kapacitor/1/debian-11/Dockerfile b/bitnami/kapacitor/1/debian-11/Dockerfile index 45a02bd32577d..aa21469cff858 100644 --- a/bitnami/kapacitor/1/debian-11/Dockerfile +++ b/bitnami/kapacitor/1/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-20T20:08:46Z" \ + org.opencontainers.image.created="2023-12-07T01:52:10Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.7.1-debian-11-r0" \ + org.opencontainers.image.ref.name="1.7.1-debian-11-r3" \ org.opencontainers.image.title="kapacitor" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.7.1" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "kapacitor-1.7.1-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "kapacitor-1.7.1-3-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/kapacitor/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kapacitor/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index b50d462693a74..bafc954e4d96b 100644 --- a/bitnami/kapacitor/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kapacitor/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.7.1-0" + "version": "1.7.1-3" } } \ No newline at end of file diff --git a/bitnami/kapacitor/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kapacitor/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kapacitor/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kapacitor/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kapacitor/README.md b/bitnami/kapacitor/README.md index c324e611f7042..7b639e9433049 100644 --- a/bitnami/kapacitor/README.md +++ b/bitnami/kapacitor/README.md @@ -1,4 +1,4 @@ -# Kapacitor ™ packaged by Bitnami +# Bitnami package for Kapacitor ™ ## What is Kapacitor ™? @@ -17,8 +17,8 @@ docker run --name kapacitor bitnami/kapacitor:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading linux distribution. -* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DTC)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use Kapacitor ™ in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/keycloak-config-cli/5/debian-11/Dockerfile b/bitnami/keycloak-config-cli/5/debian-11/Dockerfile index 285e172dd7376..c3621173a2ac3 100644 --- a/bitnami/keycloak-config-cli/5/debian-11/Dockerfile +++ b/bitnami/keycloak-config-cli/5/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-13T08:01:52Z" \ + org.opencontainers.image.created="2023-12-15T16:27:31Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.9.0-debian-11-r0" \ + org.opencontainers.image.ref.name="5.9.0-debian-11-r2" \ org.opencontainers.image.title="keycloak-config-cli" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="5.9.0" @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ "keycloak-config-cli-5.9.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/keycloak-config-cli/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/keycloak-config-cli/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index e7b350c7f85b8..caf27a74f388f 100644 --- a/bitnami/keycloak-config-cli/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/keycloak-config-cli/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "keycloak-config-cli": { "arch": "amd64", diff --git a/bitnami/keycloak-config-cli/5/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/keycloak-config-cli/5/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/keycloak-config-cli/5/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/keycloak-config-cli/5/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/keycloak-config-cli/README.md b/bitnami/keycloak-config-cli/README.md index 6f40e446b40de..a53db4f6d8c12 100644 --- a/bitnami/keycloak-config-cli/README.md +++ b/bitnami/keycloak-config-cli/README.md @@ -1,4 +1,4 @@ -# Keycloak Config CLI packaged by Bitnami +# Bitnami package for Keycloak Config CLI ## What is Keycloak Config CLI? @@ -18,7 +18,7 @@ docker run --rm --name keycloak-config-cli bitnami/keycloak-config-cli:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/keycloak/22/debian-11/Dockerfile b/bitnami/keycloak/22/debian-11/Dockerfile index 3c6045de2efb8..2093efd6718e7 100644 --- a/bitnami/keycloak/22/debian-11/Dockerfile +++ b/bitnami/keycloak/22/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T13:50:10Z" \ + org.opencontainers.image.created="2023-12-07T09:33:57Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="22.0.5-debian-11-r0" \ + org.opencontainers.image.ref.name="22.0.5-debian-11-r4" \ org.opencontainers.image.title="keycloak" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="22.0.5" @@ -22,22 +22,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl krb5-user libaio1 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "java-17.0.9-11-1-linux-${OS_ARCH}-debian-11" \ - "keycloak-22.0.5-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "keycloak-22.0.5-3-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/keycloak/22/debian-11/docker-compose.yml b/bitnami/keycloak/22/debian-11/docker-compose.yml index 689dc6676c96c..6052825a72163 100644 --- a/bitnami/keycloak/22/debian-11/docker-compose.yml +++ b/bitnami/keycloak/22/debian-11/docker-compose.yml @@ -4,7 +4,7 @@ version: '2' services: postgresql: - image: docker.io/bitnami/postgresql:11 + image: docker.io/bitnami/postgresql:15 environment: # ALLOW_EMPTY_PASSWORD is recommended only for development. - ALLOW_EMPTY_PASSWORD=yes diff --git a/bitnami/keycloak/22/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/keycloak/22/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 25be7b00f06f9..f29d2779bdaa2 100644 --- a/bitnami/keycloak/22/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/keycloak/22/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.9-11-1" + "version": "17.0.9-11-6" }, "keycloak": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "22.0.5-0" + "version": "22.0.5-3" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" } } \ No newline at end of file diff --git a/bitnami/keycloak/22/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/keycloak/22/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/keycloak/22/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/keycloak/22/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/keycloak/22/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/keycloak/22/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/keycloak/22/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/keycloak/22/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/keycloak/README.md b/bitnami/keycloak/README.md index 796e6a0c91d43..d85261c129864 100644 --- a/bitnami/keycloak/README.md +++ b/bitnami/keycloak/README.md @@ -1,4 +1,4 @@ -# Keycloak packaged by Bitnami +# Bitnami package for Keycloak ## What is Keycloak? @@ -27,7 +27,7 @@ docker-compose up * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/keycloak/docker-compose.yml b/bitnami/keycloak/docker-compose.yml index 689dc6676c96c..6052825a72163 100644 --- a/bitnami/keycloak/docker-compose.yml +++ b/bitnami/keycloak/docker-compose.yml @@ -4,7 +4,7 @@ version: '2' services: postgresql: - image: docker.io/bitnami/postgresql:11 + image: docker.io/bitnami/postgresql:15 environment: # ALLOW_EMPTY_PASSWORD is recommended only for development. - ALLOW_EMPTY_PASSWORD=yes diff --git a/bitnami/kiam/4/debian-11/Dockerfile b/bitnami/kiam/4/debian-11/Dockerfile index f5bd5a43d8657..4ca41fa146bb9 100644 --- a/bitnami/kiam/4/debian-11/Dockerfile +++ b/bitnami/kiam/4/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T04:55:49Z" \ + org.opencontainers.image.created="2023-12-07T07:34:06Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.2.0-debian-11-r421" \ + org.opencontainers.image.ref.name="4.2.0-debian-11-r423" \ org.opencontainers.image.title="kiam" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.2.0" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl iptables procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "kiam-4.2.0-167-linux-${OS_ARCH}-debian-11" \ - ) && \ + "kiam-4.2.0-169-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/kiam/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kiam/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 1148be6c1cf48..04ababbe102e1 100644 --- a/bitnami/kiam/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kiam/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.2.0-167" + "version": "4.2.0-169" } } \ No newline at end of file diff --git a/bitnami/kiam/4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kiam/4/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kiam/4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kiam/4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kiam/README.md b/bitnami/kiam/README.md index b0e53b894982c..4866b101705e3 100644 --- a/bitnami/kiam/README.md +++ b/bitnami/kiam/README.md @@ -1,4 +1,4 @@ -# Kiam packaged by Bitnami +# Bitnami package for Kiam ## What is Kiam? @@ -21,7 +21,7 @@ docker run --name Kiam bitnami/kiam:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/kibana/7/debian-11/Dockerfile b/bitnami/kibana/7/debian-11/Dockerfile index a879d8d8f7b23..d6359037a0b1d 100644 --- a/bitnami/kibana/7/debian-11/Dockerfile +++ b/bitnami/kibana/7/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:03:44Z" \ + org.opencontainers.image.created="2023-12-19T08:37:41Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.17.14-debian-11-r1" \ + org.opencontainers.image.ref.name="7.17.16-debian-11-r1" \ org.opencontainers.image.title="kibana" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.17.14" + org.opencontainers.image.version="7.17.16" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,21 +22,21 @@ ENV HOME="/" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/kibana/bin:$PATH" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libexpat1 libgcc-s1 libnss3 libstdc++6 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "kibana-7.17.14-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "yq-4.40.5-0-linux-${OS_ARCH}-debian-11" \ + "kibana-7.17.16-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -45,7 +45,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/kibana/postunpack.sh -ENV APP_VERSION="7.17.14" \ +ENV APP_VERSION="7.17.16" \ BITNAMI_APP_NAME="kibana" EXPOSE 5601 diff --git a/bitnami/kibana/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kibana/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 81aab587cb127..c600689aff2e1 100644 --- a/bitnami/kibana/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kibana/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.17.14-0" + "version": "7.17.16-1" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.5-0" } } \ No newline at end of file diff --git a/bitnami/kibana/7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/kibana/7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/kibana/7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/kibana/7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/kibana/7/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kibana/7/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kibana/7/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kibana/7/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kibana/7/debian-11/rootfs/opt/bitnami/scripts/kibana-env.sh b/bitnami/kibana/7/debian-11/rootfs/opt/bitnami/scripts/kibana-env.sh index a14a4c8ab3b00..b77ffd7e476ac 100644 --- a/bitnami/kibana/7/debian-11/rootfs/opt/bitnami/scripts/kibana-env.sh +++ b/bitnami/kibana/7/debian-11/rootfs/opt/bitnami/scripts/kibana-env.sh @@ -50,6 +50,11 @@ kibana_env_vars=( KIBANA_DISABLE_STRICT_CSP KIBANA_CREATE_USER KIBANA_ELASTICSEARCH_PASSWORD + KIBANA_SERVER_PUBLICBASEURL + KIBANA_XPACK_SECURITY_ENCRYPTIONKEY + KIBANA_XPACK_REPORTING_ENCRYPTIONKEY + KIBANA_NEWSFEED_ENABLED + KIBANA_ELASTICSEARCH_REQUESTTIMEOUT ELASTICSEARCH_URL KIBANA_ELASTICSEARCH_PORT_NUMBER KIBANA_ELASTICSEARCH_PORT @@ -164,5 +169,10 @@ export SERVER_DB_CA_CERT_LOCATION="$KIBANA_ELASTICSEARCH_CA_CERT_LOCATION" export KIBANA_DISABLE_STRICT_CSP="${KIBANA_DISABLE_STRICT_CSP:-no}" export KIBANA_CREATE_USER="${KIBANA_CREATE_USER:-false}" export KIBANA_ELASTICSEARCH_PASSWORD="${KIBANA_ELASTICSEARCH_PASSWORD:-}" +export KIBANA_SERVER_PUBLICBASEURL="${KIBANA_SERVER_PUBLICBASEURL:-}" +export KIBANA_XPACK_SECURITY_ENCRYPTIONKEY="${KIBANA_XPACK_SECURITY_ENCRYPTIONKEY:-}" +export KIBANA_XPACK_REPORTING_ENCRYPTIONKEY="${KIBANA_XPACK_REPORTING_ENCRYPTIONKEY:-}" +export KIBANA_NEWSFEED_ENABLED="${KIBANA_NEWSFEED_ENABLED:-true}" +export KIBANA_ELASTICSEARCH_REQUESTTIMEOUT="${KIBANA_ELASTICSEARCH_REQUESTTIMEOUT:-30000}" # Custom environment variables may be defined below diff --git a/bitnami/kibana/7/debian-11/rootfs/opt/bitnami/scripts/libkibana.sh b/bitnami/kibana/7/debian-11/rootfs/opt/bitnami/scripts/libkibana.sh index 0cf4f25b9f162..09485fa4f7398 100644 --- a/bitnami/kibana/7/debian-11/rootfs/opt/bitnami/scripts/libkibana.sh +++ b/bitnami/kibana/7/debian-11/rootfs/opt/bitnami/scripts/libkibana.sh @@ -210,9 +210,26 @@ kibana_initialize() { exit 1 fi fi - # Override configuration - if [[ "$SERVER_FLAVOR" = "kibana" ]] && is_boolean_yes "$KIBANA_DISABLE_STRICT_CSP"; then - kibana_conf_set "csp.strict" "false" "bool" + # Kibana override configuration + if [[ "$SERVER_FLAVOR" = "kibana" ]]; then + if is_boolean_yes "$KIBANA_DISABLE_STRICT_CSP"; then + kibana_conf_set "csp.strict" "false" "bool" + fi + if ! is_empty_value "$KIBANA_SERVER_PUBLICBASEURL"; then + kibana_conf_set "server.publicBaseUrl" "$KIBANA_SERVER_PUBLICBASEURL" + fi + if ! is_empty_value "$KIBANA_XPACK_SECURITY_ENCRYPTIONKEY"; then + kibana_conf_set "xpack.security.encryptionKey" "$KIBANA_XPACK_SECURITY_ENCRYPTIONKEY" + fi + if ! is_empty_value "$KIBANA_XPACK_REPORTING_ENCRYPTIONKEY"; then + kibana_conf_set "xpack.reporting.encryptionKey" "$KIBANA_XPACK_REPORTING_ENCRYPTIONKEY" + fi + if ! is_boolean_yes "$KIBANA_NEWSFEED_ENABLED"; then + kibana_conf_set "newsfeed.enabled" "false" "bool" + fi + if [[ "$KIBANA_ELASTICSEARCH_REQUESTTIMEOUT" != "30000" ]]; then + kibana_conf_set "elasticsearch.requestTimeout" "$KIBANA_ELASTICSEARCH_REQUESTTIMEOUT" + fi fi # Configure Elasticsearch/Opensearch authentication diff --git a/bitnami/kibana/7/debian-11/tags-info.yaml b/bitnami/kibana/7/debian-11/tags-info.yaml index 948df5889c5b3..5d72cb9860503 100644 --- a/bitnami/kibana/7/debian-11/tags-info.yaml +++ b/bitnami/kibana/7/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "7" - 7-debian-11 -- 7.17.14 +- 7.17.16 diff --git a/bitnami/kibana/8/debian-11/Dockerfile b/bitnami/kibana/8/debian-11/Dockerfile index 710a2f83cd8e4..063c88e2466d6 100644 --- a/bitnami/kibana/8/debian-11/Dockerfile +++ b/bitnami/kibana/8/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-17T15:26:38Z" \ + org.opencontainers.image.created="2023-12-19T09:16:11Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.10.4-debian-11-r0" \ + org.opencontainers.image.ref.name="8.11.3-debian-11-r1" \ org.opencontainers.image.title="kibana" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="8.10.4" + org.opencontainers.image.version="8.11.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,21 +22,21 @@ ENV HOME="/" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/kibana/bin:$PATH" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libexpat1 libgcc-s1 libnss3 libstdc++6 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "kibana-8.10.4-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "yq-4.40.5-0-linux-${OS_ARCH}-debian-11" \ + "kibana-8.11.3-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -45,7 +45,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/kibana/postunpack.sh -ENV APP_VERSION="8.10.4" \ +ENV APP_VERSION="8.11.3" \ BITNAMI_APP_NAME="kibana" EXPOSE 5601 diff --git a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 1e160f1fee865..087a7e6b3ea5c 100644 --- a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.10.4-0" + "version": "8.11.3-1" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.5-0" } } \ No newline at end of file diff --git a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/kibana/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/kibana/8/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kibana/8/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kibana/8/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kibana/8/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana-env.sh b/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana-env.sh index a14a4c8ab3b00..b77ffd7e476ac 100644 --- a/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana-env.sh +++ b/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/kibana-env.sh @@ -50,6 +50,11 @@ kibana_env_vars=( KIBANA_DISABLE_STRICT_CSP KIBANA_CREATE_USER KIBANA_ELASTICSEARCH_PASSWORD + KIBANA_SERVER_PUBLICBASEURL + KIBANA_XPACK_SECURITY_ENCRYPTIONKEY + KIBANA_XPACK_REPORTING_ENCRYPTIONKEY + KIBANA_NEWSFEED_ENABLED + KIBANA_ELASTICSEARCH_REQUESTTIMEOUT ELASTICSEARCH_URL KIBANA_ELASTICSEARCH_PORT_NUMBER KIBANA_ELASTICSEARCH_PORT @@ -164,5 +169,10 @@ export SERVER_DB_CA_CERT_LOCATION="$KIBANA_ELASTICSEARCH_CA_CERT_LOCATION" export KIBANA_DISABLE_STRICT_CSP="${KIBANA_DISABLE_STRICT_CSP:-no}" export KIBANA_CREATE_USER="${KIBANA_CREATE_USER:-false}" export KIBANA_ELASTICSEARCH_PASSWORD="${KIBANA_ELASTICSEARCH_PASSWORD:-}" +export KIBANA_SERVER_PUBLICBASEURL="${KIBANA_SERVER_PUBLICBASEURL:-}" +export KIBANA_XPACK_SECURITY_ENCRYPTIONKEY="${KIBANA_XPACK_SECURITY_ENCRYPTIONKEY:-}" +export KIBANA_XPACK_REPORTING_ENCRYPTIONKEY="${KIBANA_XPACK_REPORTING_ENCRYPTIONKEY:-}" +export KIBANA_NEWSFEED_ENABLED="${KIBANA_NEWSFEED_ENABLED:-true}" +export KIBANA_ELASTICSEARCH_REQUESTTIMEOUT="${KIBANA_ELASTICSEARCH_REQUESTTIMEOUT:-30000}" # Custom environment variables may be defined below diff --git a/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/libkibana.sh b/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/libkibana.sh index 0cf4f25b9f162..09485fa4f7398 100644 --- a/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/libkibana.sh +++ b/bitnami/kibana/8/debian-11/rootfs/opt/bitnami/scripts/libkibana.sh @@ -210,9 +210,26 @@ kibana_initialize() { exit 1 fi fi - # Override configuration - if [[ "$SERVER_FLAVOR" = "kibana" ]] && is_boolean_yes "$KIBANA_DISABLE_STRICT_CSP"; then - kibana_conf_set "csp.strict" "false" "bool" + # Kibana override configuration + if [[ "$SERVER_FLAVOR" = "kibana" ]]; then + if is_boolean_yes "$KIBANA_DISABLE_STRICT_CSP"; then + kibana_conf_set "csp.strict" "false" "bool" + fi + if ! is_empty_value "$KIBANA_SERVER_PUBLICBASEURL"; then + kibana_conf_set "server.publicBaseUrl" "$KIBANA_SERVER_PUBLICBASEURL" + fi + if ! is_empty_value "$KIBANA_XPACK_SECURITY_ENCRYPTIONKEY"; then + kibana_conf_set "xpack.security.encryptionKey" "$KIBANA_XPACK_SECURITY_ENCRYPTIONKEY" + fi + if ! is_empty_value "$KIBANA_XPACK_REPORTING_ENCRYPTIONKEY"; then + kibana_conf_set "xpack.reporting.encryptionKey" "$KIBANA_XPACK_REPORTING_ENCRYPTIONKEY" + fi + if ! is_boolean_yes "$KIBANA_NEWSFEED_ENABLED"; then + kibana_conf_set "newsfeed.enabled" "false" "bool" + fi + if [[ "$KIBANA_ELASTICSEARCH_REQUESTTIMEOUT" != "30000" ]]; then + kibana_conf_set "elasticsearch.requestTimeout" "$KIBANA_ELASTICSEARCH_REQUESTTIMEOUT" + fi fi # Configure Elasticsearch/Opensearch authentication diff --git a/bitnami/kibana/8/debian-11/tags-info.yaml b/bitnami/kibana/8/debian-11/tags-info.yaml index ecbea73631d79..ccb5c9eb732e3 100644 --- a/bitnami/kibana/8/debian-11/tags-info.yaml +++ b/bitnami/kibana/8/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "8" - 8-debian-11 -- 8.10.4 +- 8.11.3 - latest diff --git a/bitnami/kibana/README.md b/bitnami/kibana/README.md index 56a20da6b7b6c..004ac354297bb 100644 --- a/bitnami/kibana/README.md +++ b/bitnami/kibana/README.md @@ -1,4 +1,4 @@ -# Kibana packaged by Bitnami +# Bitnami package for Kibana ## What is Kibana? @@ -21,7 +21,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/kong-ingress-controller/2/debian-11/Dockerfile b/bitnami/kong-ingress-controller/2/debian-11/Dockerfile index cc9687d8b12eb..cd00afefa19cb 100644 --- a/bitnami/kong-ingress-controller/2/debian-11/Dockerfile +++ b/bitnami/kong-ingress-controller/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T05:02:16Z" \ + org.opencontainers.image.created="2023-12-07T08:24:15Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.12.0-debian-11-r10" \ + org.opencontainers.image.ref.name="2.12.2-debian-11-r1" \ org.opencontainers.image.title="kong-ingress-controller" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.12.0" + org.opencontainers.image.version="2.12.2" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "kong-ingress-controller-2.12.0-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "kong-ingress-controller-2.12.2-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -43,7 +43,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="2.12.0" \ +ENV APP_VERSION="2.12.2" \ BITNAMI_APP_NAME="kong-ingress-controller" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/kong-ingress-controller/bin:$PATH" diff --git a/bitnami/kong-ingress-controller/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kong-ingress-controller/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 49fa8185414d5..e8c67f52fb33a 100644 --- a/bitnami/kong-ingress-controller/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kong-ingress-controller/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.12.0-3" + "version": "2.12.2-1" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" } } \ No newline at end of file diff --git a/bitnami/kong-ingress-controller/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kong-ingress-controller/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kong-ingress-controller/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kong-ingress-controller/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kong-ingress-controller/2/debian-11/tags-info.yaml b/bitnami/kong-ingress-controller/2/debian-11/tags-info.yaml index 6ce15ed1a2449..4871c07396384 100644 --- a/bitnami/kong-ingress-controller/2/debian-11/tags-info.yaml +++ b/bitnami/kong-ingress-controller/2/debian-11/tags-info.yaml @@ -1,5 +1,4 @@ rolling-tags: - "2" - 2-debian-11 -- 2.12.0 -- latest +- 2.12.2 diff --git a/bitnami/kong-ingress-controller/3/debian-11/Dockerfile b/bitnami/kong-ingress-controller/3/debian-11/Dockerfile new file mode 100644 index 0000000000000..de157a6ae5690 --- /dev/null +++ b/bitnami/kong-ingress-controller/3/debian-11/Dockerfile @@ -0,0 +1,52 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +FROM docker.io/bitnami/minideb:bullseye + +ARG TARGETARCH + +LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-12-06T21:07:25Z" \ + org.opencontainers.image.description="Application packaged by VMware, Inc" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.ref.name="3.0.1-debian-11-r1" \ + org.opencontainers.image.title="kong-ingress-controller" \ + org.opencontainers.image.vendor="VMware, Inc." \ + org.opencontainers.image.version="3.0.1" + +ENV HOME="/" \ + OS_ARCH="${TARGETARCH:-amd64}" \ + OS_FLAVOUR="debian-11" \ + OS_NAME="linux" + +COPY prebuildfs / +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] +# Install required system packages and dependencies +RUN install_packages ca-certificates curl procps +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ + COMPONENTS=( \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "kong-ingress-controller-3.0.1-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ + for COMPONENT in "${COMPONENTS[@]}"; do \ + if [ ! -f "${COMPONENT}.tar.gz" ]; then \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ + rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ + done +RUN apt-get autoremove --purge -y curl && \ + apt-get update && apt-get upgrade -y && \ + apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives +RUN chmod g+rwX /opt/bitnami + +ENV APP_VERSION="3.0.1" \ + BITNAMI_APP_NAME="kong-ingress-controller" \ + PATH="/opt/bitnami/common/bin:/opt/bitnami/kong-ingress-controller/bin:$PATH" + +USER 1001 +ENTRYPOINT [ "kong-ingress-controller" ] +CMD [ "--help" ] diff --git a/bitnami/kong-ingress-controller/3/debian-11/docker-compose.yml b/bitnami/kong-ingress-controller/3/debian-11/docker-compose.yml new file mode 100644 index 0000000000000..349e7c19ad07f --- /dev/null +++ b/bitnami/kong-ingress-controller/3/debian-11/docker-compose.yml @@ -0,0 +1,7 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +version: '2' +services: + kong-ingress-controller: + image: docker.io/bitnami/kong-ingress-controller:3 diff --git a/bitnami/kong-ingress-controller/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kong-ingress-controller/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json new file mode 100644 index 0000000000000..835c803ee47cb --- /dev/null +++ b/bitnami/kong-ingress-controller/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -0,0 +1,14 @@ +{ + "kong-ingress-controller": { + "arch": "amd64", + "distro": "debian-11", + "type": "NAMI", + "version": "3.0.1-1" + }, + "wait-for-port": { + "arch": "amd64", + "distro": "debian-11", + "type": "NAMI", + "version": "1.0.7-4" + } +} \ No newline at end of file diff --git a/bitnami/percona-xtrabackup/8/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/kong-ingress-controller/3/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt similarity index 100% rename from bitnami/percona-xtrabackup/8/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt rename to bitnami/kong-ingress-controller/3/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt diff --git a/bitnami/percona-xtrabackup/8/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/kong-ingress-controller/3/debian-11/prebuildfs/usr/sbin/install_packages similarity index 100% rename from bitnami/percona-xtrabackup/8/debian-11/prebuildfs/usr/sbin/install_packages rename to bitnami/kong-ingress-controller/3/debian-11/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/kong-ingress-controller/3/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kong-ingress-controller/3/debian-11/prebuildfs/usr/sbin/run-script new file mode 100755 index 0000000000000..b7a5bf1e50bff --- /dev/null +++ b/bitnami/kong-ingress-controller/3/debian-11/prebuildfs/usr/sbin/run-script @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -u + +if [ $# -eq 0 ]; then + >&2 echo "No arguments provided" + exit 1 +fi + +script=$1 +exit_code="${2:-96}" +fail_if_not_present="${3:-y}" + +if test -f "$script"; then + sh $script + + if [ $? -ne 0 ]; then + exit $((exit_code)) + fi +elif [ "$fail_if_not_present" = "y" ]; then + >&2 echo "script not found: $script" + exit 127 +fi diff --git a/bitnami/kong-ingress-controller/3/debian-11/tags-info.yaml b/bitnami/kong-ingress-controller/3/debian-11/tags-info.yaml new file mode 100644 index 0000000000000..725d565b266ae --- /dev/null +++ b/bitnami/kong-ingress-controller/3/debian-11/tags-info.yaml @@ -0,0 +1,5 @@ +rolling-tags: +- "3" +- 3-debian-11 +- 3.0.1 +- latest diff --git a/bitnami/kong-ingress-controller/README.md b/bitnami/kong-ingress-controller/README.md index 2f6fac200b086..1588cd569ad2c 100644 --- a/bitnami/kong-ingress-controller/README.md +++ b/bitnami/kong-ingress-controller/README.md @@ -1,4 +1,4 @@ -# Kong Ingress Controller packaged by Bitnami +# Bitnami package for Kong Ingress Controller ## What is Kong Ingress Controller? @@ -18,7 +18,7 @@ docker run --name kong-ingress-controller bitnami/kong-ingress-controller:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/kong-ingress-controller/docker-compose.yml b/bitnami/kong-ingress-controller/docker-compose.yml index 86223671a93c7..349e7c19ad07f 100644 --- a/bitnami/kong-ingress-controller/docker-compose.yml +++ b/bitnami/kong-ingress-controller/docker-compose.yml @@ -4,4 +4,4 @@ version: '2' services: kong-ingress-controller: - image: docker.io/bitnami/kong-ingress-controller:2 + image: docker.io/bitnami/kong-ingress-controller:3 diff --git a/bitnami/ksql/7.1/debian-11/Dockerfile b/bitnami/ksql/7.1/debian-11/Dockerfile index b92088d906141..7b3a6e463e8f1 100644 --- a/bitnami/ksql/7.1/debian-11/Dockerfile +++ b/bitnami/ksql/7.1/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T09:41:42Z" \ + org.opencontainers.image.created="2023-12-07T12:20:17Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.1.9-debian-11-r3" \ + org.opencontainers.image.ref.name="7.1.10-debian-11-r1" \ org.opencontainers.image.title="ksql" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.1.9" + org.opencontainers.image.version="7.1.10" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,21 +22,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl netcat-openbsd procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-11.0.20-8-5-linux-${OS_ARCH}-debian-11" \ - "ksql-7.1.9-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-11.0.21-10-6-linux-${OS_ARCH}-debian-11" \ + "ksql-7.1.10-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -47,7 +47,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/ksql/postunpack.sh -ENV APP_VERSION="7.1.9" \ +ENV APP_VERSION="7.1.10" \ BITNAMI_APP_NAME="ksql" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:/opt/bitnami/ksql/bin:$PATH" diff --git a/bitnami/ksql/7.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/ksql/7.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 90aa1d47a7bbb..02b9f96733231 100644 --- a/bitnami/ksql/7.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/ksql/7.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.0.20-8-5" + "version": "11.0.21-10-6" }, "ksql": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.1.9-0" + "version": "7.1.10-0" } } \ No newline at end of file diff --git a/bitnami/ksql/7.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/ksql/7.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/ksql/7.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/ksql/7.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/ksql/7.1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/ksql/7.1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/ksql/7.1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/ksql/7.1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/ksql/7.1/debian-11/tags-info.yaml b/bitnami/ksql/7.1/debian-11/tags-info.yaml index c951656683a36..2bc4fc24bdcb9 100644 --- a/bitnami/ksql/7.1/debian-11/tags-info.yaml +++ b/bitnami/ksql/7.1/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "7.1" - 7.1-debian-11 -- 7.1.9 +- 7.1.10 diff --git a/bitnami/ksql/7.2/debian-11/Dockerfile b/bitnami/ksql/7.2/debian-11/Dockerfile index fb164812036ce..6f786a4745809 100644 --- a/bitnami/ksql/7.2/debian-11/Dockerfile +++ b/bitnami/ksql/7.2/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T09:42:12Z" \ + org.opencontainers.image.created="2023-12-07T12:54:41Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.2.7-debian-11-r3" \ + org.opencontainers.image.ref.name="7.2.8-debian-11-r1" \ org.opencontainers.image.title="ksql" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.2.7" + org.opencontainers.image.version="7.2.8" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,21 +22,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl netcat-openbsd procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-11.0.20-8-5-linux-${OS_ARCH}-debian-11" \ - "ksql-7.2.7-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-11.0.21-10-6-linux-${OS_ARCH}-debian-11" \ + "ksql-7.2.8-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -47,7 +47,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/ksql/postunpack.sh -ENV APP_VERSION="7.2.7" \ +ENV APP_VERSION="7.2.8" \ BITNAMI_APP_NAME="ksql" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:/opt/bitnami/ksql/bin:$PATH" diff --git a/bitnami/ksql/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/ksql/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index e7c56c327bc7b..32f6d8ca8e671 100644 --- a/bitnami/ksql/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/ksql/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.0.20-8-5" + "version": "11.0.21-10-6" }, "ksql": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.2.7-0" + "version": "7.2.8-0" } } \ No newline at end of file diff --git a/bitnami/ksql/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/ksql/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/ksql/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/ksql/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/ksql/7.2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/ksql/7.2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/ksql/7.2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/ksql/7.2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/ksql/7.2/debian-11/tags-info.yaml b/bitnami/ksql/7.2/debian-11/tags-info.yaml index f3a82e32d2b9d..3cb75c00a4f84 100644 --- a/bitnami/ksql/7.2/debian-11/tags-info.yaml +++ b/bitnami/ksql/7.2/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "7.2" - 7.2-debian-11 -- 7.2.7 +- 7.2.8 diff --git a/bitnami/ksql/7.3/debian-11/Dockerfile b/bitnami/ksql/7.3/debian-11/Dockerfile index c484a2eadb54e..c72b9f28be31c 100644 --- a/bitnami/ksql/7.3/debian-11/Dockerfile +++ b/bitnami/ksql/7.3/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T09:43:22Z" \ + org.opencontainers.image.created="2023-12-01T14:29:04Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.3.3-debian-11-r162" \ + org.opencontainers.image.ref.name="7.3.6-debian-11-r0" \ org.opencontainers.image.title="ksql" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.3.3" + org.opencontainers.image.version="7.3.6" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,21 +22,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl netcat-openbsd procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "ksql-7.3.3-4-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "ksql-7.3.6-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -47,7 +47,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/ksql/postunpack.sh -ENV APP_VERSION="7.3.3" \ +ENV APP_VERSION="7.3.6" \ BITNAMI_APP_NAME="ksql" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:/opt/bitnami/ksql/bin:$PATH" diff --git a/bitnami/ksql/7.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/ksql/7.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 60fb3c33db977..1eadc7d33a824 100644 --- a/bitnami/ksql/7.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/ksql/7.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "ksql": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.3.3-4" + "version": "7.3.6-0" } } \ No newline at end of file diff --git a/bitnami/ksql/7.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/ksql/7.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/ksql/7.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/ksql/7.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/ksql/7.3/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/ksql/7.3/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/ksql/7.3/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/ksql/7.3/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/ksql/7.3/debian-11/tags-info.yaml b/bitnami/ksql/7.3/debian-11/tags-info.yaml index 7098049a16b4d..92708e16d0cbb 100644 --- a/bitnami/ksql/7.3/debian-11/tags-info.yaml +++ b/bitnami/ksql/7.3/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "7.3" - 7.3-debian-11 -- 7.3.3 +- 7.3.6 diff --git a/bitnami/ksql/7.4/debian-11/Dockerfile b/bitnami/ksql/7.4/debian-11/Dockerfile index 01b1d7196d5a7..6c3e708ab901a 100644 --- a/bitnami/ksql/7.4/debian-11/Dockerfile +++ b/bitnami/ksql/7.4/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T05:16:34Z" \ + org.opencontainers.image.created="2023-12-01T14:09:46Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.4.1-debian-11-r69" \ + org.opencontainers.image.ref.name="7.4.3-debian-11-r0" \ org.opencontainers.image.title="ksql" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.4.1" + org.opencontainers.image.version="7.4.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,21 +22,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl netcat-openbsd procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "ksql-7.4.1-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "ksql-7.4.3-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -47,7 +47,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/ksql/postunpack.sh -ENV APP_VERSION="7.4.1" \ +ENV APP_VERSION="7.4.3" \ BITNAMI_APP_NAME="ksql" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:/opt/bitnami/ksql/bin:$PATH" diff --git a/bitnami/ksql/7.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/ksql/7.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index eef45777cc2b9..b6f4a4cded00a 100644 --- a/bitnami/ksql/7.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/ksql/7.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "ksql": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.4.1-2" + "version": "7.4.3-0" } } \ No newline at end of file diff --git a/bitnami/ksql/7.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/ksql/7.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/ksql/7.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/ksql/7.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/ksql/7.4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/ksql/7.4/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/ksql/7.4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/ksql/7.4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/ksql/7.4/debian-11/tags-info.yaml b/bitnami/ksql/7.4/debian-11/tags-info.yaml index fed873c575f48..de6d988feceb4 100644 --- a/bitnami/ksql/7.4/debian-11/tags-info.yaml +++ b/bitnami/ksql/7.4/debian-11/tags-info.yaml @@ -1,5 +1,4 @@ rolling-tags: - "7.4" - 7.4-debian-11 -- 7.4.1 -- latest +- 7.4.3 diff --git a/bitnami/ksql/7.5/debian-11/Dockerfile b/bitnami/ksql/7.5/debian-11/Dockerfile index 8f15c04d10ec0..5d50fc78f8539 100644 --- a/bitnami/ksql/7.5/debian-11/Dockerfile +++ b/bitnami/ksql/7.5/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-13T09:06:52Z" \ + org.opencontainers.image.created="2023-12-09T07:53:19Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.5.1-debian-11-r1" \ + org.opencontainers.image.ref.name="7.5.2-debian-11-r1" \ org.opencontainers.image.title="ksql" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.5.1" + org.opencontainers.image.version="7.5.2" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,21 +22,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl netcat-openbsd procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "ksql-7.5.1-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "ksql-7.5.2-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -47,7 +47,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/ksql/postunpack.sh -ENV APP_VERSION="7.5.1" \ +ENV APP_VERSION="7.5.2" \ BITNAMI_APP_NAME="ksql" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:/opt/bitnami/ksql/bin:$PATH" diff --git a/bitnami/ksql/7.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/ksql/7.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index eee1350f88980..755a6656e723b 100644 --- a/bitnami/ksql/7.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/ksql/7.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "ksql": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.5.1-0" + "version": "7.5.2-0" } } \ No newline at end of file diff --git a/bitnami/ksql/7.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/ksql/7.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/ksql/7.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/ksql/7.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/ksql/7.5/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/ksql/7.5/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/ksql/7.5/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/ksql/7.5/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/ksql/7.5/debian-11/tags-info.yaml b/bitnami/ksql/7.5/debian-11/tags-info.yaml index db4a18fcfd6b6..f3b17a067bed8 100644 --- a/bitnami/ksql/7.5/debian-11/tags-info.yaml +++ b/bitnami/ksql/7.5/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "7.5" - 7.5-debian-11 -- 7.5.1 +- 7.5.2 - latest diff --git a/bitnami/ksql/README.md b/bitnami/ksql/README.md index c10098e5b2fbc..1b73906773b14 100644 --- a/bitnami/ksql/README.md +++ b/bitnami/ksql/README.md @@ -17,7 +17,7 @@ docker run --name ksql bitnami/ksql:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/kube-rbac-proxy/0/debian-11/Dockerfile b/bitnami/kube-rbac-proxy/0/debian-11/Dockerfile index 83ad97e105ada..ab12770d97e95 100644 --- a/bitnami/kube-rbac-proxy/0/debian-11/Dockerfile +++ b/bitnami/kube-rbac-proxy/0/debian-11/Dockerfile @@ -8,21 +8,21 @@ ARG TARGETARCH ENV OS_ARCH="${TARGETARCH:-amd64}" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "kube-rbac-proxy-0.15.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "kube-rbac-proxy-0.15.0-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done @@ -36,10 +36,10 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="scratch" \ - org.opencontainers.image.created="2023-10-20T13:34:38Z" \ + org.opencontainers.image.created="2023-12-07T12:54:30Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.15.0-debian-11-r0" \ + org.opencontainers.image.ref.name="0.15.0-debian-11-r2" \ org.opencontainers.image.title="kube-rbac-proxy" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="0.15.0" diff --git a/bitnami/kube-rbac-proxy/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kube-rbac-proxy/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 0a930fe44deca..8a516b0b41b54 100644 --- a/bitnami/kube-rbac-proxy/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kube-rbac-proxy/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.15.0-0" + "version": "0.15.0-2" } } \ No newline at end of file diff --git a/bitnami/kube-rbac-proxy/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kube-rbac-proxy/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kube-rbac-proxy/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kube-rbac-proxy/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kube-rbac-proxy/README.md b/bitnami/kube-rbac-proxy/README.md index ea2ffd7c464b7..a4088013924be 100644 --- a/bitnami/kube-rbac-proxy/README.md +++ b/bitnami/kube-rbac-proxy/README.md @@ -1,4 +1,4 @@ -# Kube RBAC Proxy packaged by Bitnami +# Bitnami package for Kube RBAC Proxy ## What is Kube RBAC Proxy? @@ -15,12 +15,12 @@ docker run --name Kube RBAC Proxy bitnami/kube-rbac-proxy:latest ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use Kube RBAC Proxy in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/kube-state-metrics/2/debian-11/Dockerfile b/bitnami/kube-state-metrics/2/debian-11/Dockerfile index f08c5db93c161..5dd0b01c4ad77 100644 --- a/bitnami/kube-state-metrics/2/debian-11/Dockerfile +++ b/bitnami/kube-state-metrics/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T05:26:22Z" \ + org.opencontainers.image.created="2023-12-06T21:15:14Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.10.0-debian-11-r34" \ + org.opencontainers.image.ref.name="2.10.1-debian-11-r1" \ org.opencontainers.image.title="kube-state-metrics" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.10.0" + org.opencontainers.image.version="2.10.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "kube-state-metrics-2.10.0-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "kube-state-metrics-2.10.1-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="2.10.0" \ +ENV APP_VERSION="2.10.1" \ BITNAMI_APP_NAME="kube-state-metrics" \ PATH="/opt/bitnami/kube-state-metrics/bin:$PATH" diff --git a/bitnami/kube-state-metrics/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kube-state-metrics/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 6757a4aac3002..b783c5f459402 100644 --- a/bitnami/kube-state-metrics/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kube-state-metrics/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.10.0-3" + "version": "2.10.1-1" } } \ No newline at end of file diff --git a/bitnami/kube-state-metrics/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kube-state-metrics/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kube-state-metrics/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kube-state-metrics/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kube-state-metrics/2/debian-11/tags-info.yaml b/bitnami/kube-state-metrics/2/debian-11/tags-info.yaml index fa154790da8f0..ebbf92d52aae9 100644 --- a/bitnami/kube-state-metrics/2/debian-11/tags-info.yaml +++ b/bitnami/kube-state-metrics/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.10.0 +- 2.10.1 - latest diff --git a/bitnami/kube-state-metrics/README.md b/bitnami/kube-state-metrics/README.md index f09d136c0b57d..8485aa6671f06 100644 --- a/bitnami/kube-state-metrics/README.md +++ b/bitnami/kube-state-metrics/README.md @@ -1,4 +1,4 @@ -# Kube State Metrics packaged by Bitnami +# Bitnami package for Kube State Metrics ## What is Kube State Metrics? @@ -16,7 +16,7 @@ Deploy Kube-state-metrics on your [Kubernetes cluster](https://github.com/kubern * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/kubeapps-apis/2/debian-11/Dockerfile b/bitnami/kubeapps-apis/2/debian-11/Dockerfile index d353955d4d1a0..c961621eb2d3f 100644 --- a/bitnami/kubeapps-apis/2/debian-11/Dockerfile +++ b/bitnami/kubeapps-apis/2/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-26T12:43:28Z" \ + org.opencontainers.image.created="2023-12-07T12:50:48Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.9.0-debian-11-r12" \ + org.opencontainers.image.ref.name="2.9.0-debian-11-r14" \ org.opencontainers.image.title="kubeapps-apis" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.9.0" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "kubeapps-apis-2.9.0-5-linux-${OS_ARCH}-debian-11" \ - ) && \ + "kubeapps-apis-2.9.0-7-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/kubeapps-apis/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kubeapps-apis/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8f973de797e46..a62e81e1cf22b 100644 --- a/bitnami/kubeapps-apis/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kubeapps-apis/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.9.0-5" + "version": "2.9.0-7" } } \ No newline at end of file diff --git a/bitnami/kubeapps-apis/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kubeapps-apis/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kubeapps-apis/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kubeapps-apis/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kubeapps-apis/README.md b/bitnami/kubeapps-apis/README.md index 49ee70cf33385..6d8c9dab19cf7 100644 --- a/bitnami/kubeapps-apis/README.md +++ b/bitnami/kubeapps-apis/README.md @@ -1,4 +1,4 @@ -# Kubeapps APIs packaged by Bitnami +# Bitnami package for Kubeapps APIs ## What is Kubeapps APIs? @@ -17,6 +17,9 @@ docker run --name kubeapps-apis bitnami/kubeapps-apis:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use Kubeapps APIs in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/kubeapps-apprepository-controller/2/debian-11/Dockerfile b/bitnami/kubeapps-apprepository-controller/2/debian-11/Dockerfile index 6415444704f85..980db4008b646 100644 --- a/bitnami/kubeapps-apprepository-controller/2/debian-11/Dockerfile +++ b/bitnami/kubeapps-apprepository-controller/2/debian-11/Dockerfile @@ -8,21 +8,21 @@ ARG TARGETARCH ENV OS_ARCH="${TARGETARCH:-amd64}" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "kubeapps-apprepository-controller-2.9.0-4-linux-${OS_ARCH}-debian-11" \ - ) && \ + "kubeapps-apprepository-controller-2.9.0-6-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done @@ -36,10 +36,10 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="scratch" \ - org.opencontainers.image.created="2023-10-26T12:04:21Z" \ + org.opencontainers.image.created="2023-12-06T21:20:30Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.9.0-debian-11-r11" \ + org.opencontainers.image.ref.name="2.9.0-debian-11-r13" \ org.opencontainers.image.title="kubeapps-apprepository-controller" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.9.0" diff --git a/bitnami/kubeapps-apprepository-controller/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kubeapps-apprepository-controller/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 857618acca3fc..a92d2d0559f51 100644 --- a/bitnami/kubeapps-apprepository-controller/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kubeapps-apprepository-controller/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.9.0-4" + "version": "2.9.0-6" } } \ No newline at end of file diff --git a/bitnami/kubeapps-apprepository-controller/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kubeapps-apprepository-controller/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kubeapps-apprepository-controller/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kubeapps-apprepository-controller/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kubeapps-apprepository-controller/README.md b/bitnami/kubeapps-apprepository-controller/README.md index 9b56b78e01533..faf3ae8f089ce 100644 --- a/bitnami/kubeapps-apprepository-controller/README.md +++ b/bitnami/kubeapps-apprepository-controller/README.md @@ -17,6 +17,9 @@ docker run --name kubeapps-apprepository-controller bitnami/kubeapps-appreposito * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use Kubeapps AppRepository Controller in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/kubeapps-asset-syncer/2/debian-11/Dockerfile b/bitnami/kubeapps-asset-syncer/2/debian-11/Dockerfile index 2612a24c6df31..aa9cd3f92c917 100644 --- a/bitnami/kubeapps-asset-syncer/2/debian-11/Dockerfile +++ b/bitnami/kubeapps-asset-syncer/2/debian-11/Dockerfile @@ -8,21 +8,21 @@ ARG TARGETARCH ENV OS_ARCH="${TARGETARCH:-amd64}" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "kubeapps-asset-syncer-2.9.0-5-linux-${OS_ARCH}-debian-11" \ - ) && \ + "kubeapps-asset-syncer-2.9.0-7-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done @@ -36,10 +36,10 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="scratch" \ - org.opencontainers.image.created="2023-10-26T13:11:43Z" \ + org.opencontainers.image.created="2023-12-07T12:51:46Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.9.0-debian-11-r12" \ + org.opencontainers.image.ref.name="2.9.0-debian-11-r14" \ org.opencontainers.image.title="kubeapps-asset-syncer" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.9.0" diff --git a/bitnami/kubeapps-asset-syncer/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kubeapps-asset-syncer/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index f2ab9b600b0e8..511a926e7f86b 100644 --- a/bitnami/kubeapps-asset-syncer/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kubeapps-asset-syncer/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.9.0-5" + "version": "2.9.0-7" } } \ No newline at end of file diff --git a/bitnami/kubeapps-asset-syncer/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kubeapps-asset-syncer/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kubeapps-asset-syncer/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kubeapps-asset-syncer/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kubeapps-asset-syncer/README.md b/bitnami/kubeapps-asset-syncer/README.md index ce52990ddd680..7e58d1750b89a 100644 --- a/bitnami/kubeapps-asset-syncer/README.md +++ b/bitnami/kubeapps-asset-syncer/README.md @@ -1,4 +1,4 @@ -# Kubeapps Asset Syncer packaged by Bitnami +# Bitnami package for Kubeapps Asset Syncer ## What is Kubeapps Asset Syncer? @@ -17,6 +17,9 @@ docker run --name kubeapps-asset-syncer bitnami/kubeapps-asset-syncer:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use Kubeapps Asset Syncer in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/kubeapps-dashboard/2/debian-11/Dockerfile b/bitnami/kubeapps-dashboard/2/debian-11/Dockerfile index b8655d8cd54ca..b61c262683059 100644 --- a/bitnami/kubeapps-dashboard/2/debian-11/Dockerfile +++ b/bitnami/kubeapps-dashboard/2/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-26T13:50:32Z" \ + org.opencontainers.image.created="2023-12-02T07:24:17Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.9.0-debian-11-r16" \ + org.opencontainers.image.ref.name="2.9.0-debian-11-r18" \ org.opencontainers.image.title="kubeapps-dashboard" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.9.0" @@ -20,22 +20,22 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libcrypt1 libgeoip1 libpcre3 libssl1.1 openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "nginx-1.25.3-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ + "nginx-1.25.3-1-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-3-linux-${OS_ARCH}-debian-11" \ "kubeapps-2.9.0-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/kubeapps-dashboard/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kubeapps-dashboard/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index f52cefa2572af..f1e035d065b84 100644 --- a/bitnami/kubeapps-dashboard/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kubeapps-dashboard/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,12 +9,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.25.3-0" + "version": "1.25.3-1" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-3" } } \ No newline at end of file diff --git a/bitnami/kubeapps-dashboard/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/kubeapps-dashboard/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/kubeapps-dashboard/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/kubeapps-dashboard/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/kubeapps-dashboard/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kubeapps-dashboard/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kubeapps-dashboard/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kubeapps-dashboard/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kubeapps-dashboard/2/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf b/bitnami/kubeapps-dashboard/2/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf index 6c2b5b1ba288f..aaf0428032c41 100644 --- a/bitnami/kubeapps-dashboard/2/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf +++ b/bitnami/kubeapps-dashboard/2/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf @@ -33,7 +33,7 @@ http { gzip_proxied any; gzip_types text/plain text/css application/javascript text/xml application/xml+rss; keepalive_timeout 65; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; + ssl_protocols TLSv1.2 TLSv1.3; ssl_ciphers HIGH:!aNULL:!MD5; client_max_body_size 80M; server_tokens off; diff --git a/bitnami/kubeapps-dashboard/README.md b/bitnami/kubeapps-dashboard/README.md index c4a32b5ee4181..d8d885cd7efb0 100644 --- a/bitnami/kubeapps-dashboard/README.md +++ b/bitnami/kubeapps-dashboard/README.md @@ -1,4 +1,4 @@ -# Kubeapps packaged by Bitnami +# Bitnami package for Kubeapps ## What is Kubeapps? @@ -17,7 +17,7 @@ docker run --name kubeapps-dashboard bitnami/kubeapps-dashboard:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/kubeapps-oci-catalog/2/debian-11/Dockerfile b/bitnami/kubeapps-oci-catalog/2/debian-11/Dockerfile index 5ea758c949a55..a1fd50d4ad0eb 100644 --- a/bitnami/kubeapps-oci-catalog/2/debian-11/Dockerfile +++ b/bitnami/kubeapps-oci-catalog/2/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-26T13:38:39Z" \ + org.opencontainers.image.created="2023-11-25T14:03:25Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.9.0-debian-11-r6" \ + org.opencontainers.image.ref.name="2.9.0-debian-11-r7" \ org.opencontainers.image.title="kubeapps-oci-catalog" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.9.0" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgcc-s1 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ "kubeapps-oci-catalog-2.9.0-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/kubeapps-oci-catalog/README.md b/bitnami/kubeapps-oci-catalog/README.md index b7899babe4b6e..4fa3577fb95cf 100644 --- a/bitnami/kubeapps-oci-catalog/README.md +++ b/bitnami/kubeapps-oci-catalog/README.md @@ -1,4 +1,4 @@ -# Kubeapps OCI Catalog Service packaged by Bitnami +# Bitnami package for Kubeapps OCI Catalog Service ## What is Kubeapps OCI Catalog Service? diff --git a/bitnami/kubeapps-pinniped-proxy/2/debian-11/Dockerfile b/bitnami/kubeapps-pinniped-proxy/2/debian-11/Dockerfile index 60f72884f1daf..0c323c6de158c 100644 --- a/bitnami/kubeapps-pinniped-proxy/2/debian-11/Dockerfile +++ b/bitnami/kubeapps-pinniped-proxy/2/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-26T13:47:47Z" \ + org.opencontainers.image.created="2023-11-25T14:08:52Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.9.0-debian-11-r10" \ + org.opencontainers.image.ref.name="2.9.0-debian-11-r11" \ org.opencontainers.image.title="kubeapps-pinniped-proxy" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.9.0" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgcc-s1 libssl1.1 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ "kubeapps-pinniped-proxy-2.9.0-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/kubeapps-pinniped-proxy/README.md b/bitnami/kubeapps-pinniped-proxy/README.md index a4da167f5f1ee..21e7bfdb6b117 100644 --- a/bitnami/kubeapps-pinniped-proxy/README.md +++ b/bitnami/kubeapps-pinniped-proxy/README.md @@ -1,4 +1,4 @@ -# Kubeapps Pinniped Proxy packaged by Bitnami +# Bitnami package for Kubeapps Pinniped Proxy ## What is Kubeapps Pinniped Proxy? diff --git a/bitnami/kubectl/1.26/debian-11/Dockerfile b/bitnami/kubectl/1.26/debian-11/Dockerfile index 664364a0a70e9..c1655d0efd70f 100644 --- a/bitnami/kubectl/1.26/debian-11/Dockerfile +++ b/bitnami/kubectl/1.26/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-18T22:02:25Z" \ + org.opencontainers.image.created="2023-12-06T21:22:29Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.26.10-debian-11-r0" \ + org.opencontainers.image.ref.name="1.26.11-debian-11-r2" \ org.opencontainers.image.title="kubectl" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.26.10" + org.opencontainers.image.version="1.26.11" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl git jq procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "kubectl-1.26.10-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "kubectl-1.26.11-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -43,7 +43,7 @@ RUN apt-get autoremove --purge -y curl && \ RUN chmod g+rwX /opt/bitnami RUN mkdir /.kube && chmod g+rwX /.kube -ENV APP_VERSION="1.26.10" \ +ENV APP_VERSION="1.26.11" \ BITNAMI_APP_NAME="kubectl" \ PATH="/opt/bitnami/kubectl/bin:$PATH" diff --git a/bitnami/kubectl/1.26/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kubectl/1.26/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 150cd64d0854c..b30a40382b934 100644 --- a/bitnami/kubectl/1.26/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kubectl/1.26/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.26.10-0" + "version": "1.26.11-1" } } \ No newline at end of file diff --git a/bitnami/kubectl/1.26/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kubectl/1.26/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kubectl/1.26/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kubectl/1.26/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kubectl/1.26/debian-11/tags-info.yaml b/bitnami/kubectl/1.26/debian-11/tags-info.yaml index 2e84e8da7b2cd..384674ca7ac11 100644 --- a/bitnami/kubectl/1.26/debian-11/tags-info.yaml +++ b/bitnami/kubectl/1.26/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "1.26" - 1.26-debian-11 -- 1.26.10 +- 1.26.11 diff --git a/bitnami/kubectl/1.27/debian-11/Dockerfile b/bitnami/kubectl/1.27/debian-11/Dockerfile index c48223d194b5a..02db21061efd8 100644 --- a/bitnami/kubectl/1.27/debian-11/Dockerfile +++ b/bitnami/kubectl/1.27/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-19T00:38:06Z" \ + org.opencontainers.image.created="2023-12-06T21:08:57Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.27.7-debian-11-r0" \ + org.opencontainers.image.ref.name="1.27.8-debian-11-r2" \ org.opencontainers.image.title="kubectl" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.27.7" + org.opencontainers.image.version="1.27.8" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl git jq procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "kubectl-1.27.7-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "kubectl-1.27.8-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -43,7 +43,7 @@ RUN apt-get autoremove --purge -y curl && \ RUN chmod g+rwX /opt/bitnami RUN mkdir /.kube && chmod g+rwX /.kube -ENV APP_VERSION="1.27.7" \ +ENV APP_VERSION="1.27.8" \ BITNAMI_APP_NAME="kubectl" \ PATH="/opt/bitnami/kubectl/bin:$PATH" diff --git a/bitnami/kubectl/1.27/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kubectl/1.27/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index a1a5851952131..f7b22da39537c 100644 --- a/bitnami/kubectl/1.27/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kubectl/1.27/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.27.7-0" + "version": "1.27.8-1" } } \ No newline at end of file diff --git a/bitnami/kubectl/1.27/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kubectl/1.27/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kubectl/1.27/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kubectl/1.27/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kubectl/1.27/debian-11/tags-info.yaml b/bitnami/kubectl/1.27/debian-11/tags-info.yaml index 9cdea48359c40..1b5fef35c1df5 100644 --- a/bitnami/kubectl/1.27/debian-11/tags-info.yaml +++ b/bitnami/kubectl/1.27/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "1.27" - 1.27-debian-11 -- 1.27.7 +- 1.27.8 diff --git a/bitnami/kubectl/1.28/debian-11/Dockerfile b/bitnami/kubectl/1.28/debian-11/Dockerfile index 4ee1d1d6b69a9..42c5d2d05f2c0 100644 --- a/bitnami/kubectl/1.28/debian-11/Dockerfile +++ b/bitnami/kubectl/1.28/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-18T22:58:02Z" \ + org.opencontainers.image.created="2023-12-06T21:23:07Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.28.3-debian-11-r0" \ + org.opencontainers.image.ref.name="1.28.4-debian-11-r2" \ org.opencontainers.image.title="kubectl" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.28.3" + org.opencontainers.image.version="1.28.4" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl git jq procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "kubectl-1.28.3-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "kubectl-1.28.4-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -43,7 +43,7 @@ RUN apt-get autoremove --purge -y curl && \ RUN chmod g+rwX /opt/bitnami RUN mkdir /.kube && chmod g+rwX /.kube -ENV APP_VERSION="1.28.3" \ +ENV APP_VERSION="1.28.4" \ BITNAMI_APP_NAME="kubectl" \ PATH="/opt/bitnami/kubectl/bin:$PATH" diff --git a/bitnami/kubectl/1.28/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kubectl/1.28/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 7cdbea0e2a995..7a1f074542dc0 100644 --- a/bitnami/kubectl/1.28/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kubectl/1.28/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.28.3-0" + "version": "1.28.4-1" } } \ No newline at end of file diff --git a/bitnami/kubectl/1.28/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kubectl/1.28/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kubectl/1.28/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kubectl/1.28/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kubectl/1.28/debian-11/tags-info.yaml b/bitnami/kubectl/1.28/debian-11/tags-info.yaml index 24fc065ded4c1..95af7f399b5d0 100644 --- a/bitnami/kubectl/1.28/debian-11/tags-info.yaml +++ b/bitnami/kubectl/1.28/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1.28" - 1.28-debian-11 -- 1.28.3 +- 1.28.4 - latest diff --git a/bitnami/kubectl/README.md b/bitnami/kubectl/README.md index 1260b073e7c71..8ef31e920eeef 100644 --- a/bitnami/kubectl/README.md +++ b/bitnami/kubectl/README.md @@ -1,4 +1,4 @@ -# Kubectl packaged by Bitnami +# Bitnami package for Kubectl ## What is Kubectl? @@ -18,7 +18,7 @@ docker run --name kubectl bitnami/kubectl:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/kuberay-apiserver/1/debian-11/Dockerfile b/bitnami/kuberay-apiserver/1/debian-11/Dockerfile new file mode 100644 index 0000000000000..fe79b9a46d5d4 --- /dev/null +++ b/bitnami/kuberay-apiserver/1/debian-11/Dockerfile @@ -0,0 +1,50 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +FROM docker.io/bitnami/minideb:bullseye + +ARG TARGETARCH + +LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-12-18T14:41:26Z" \ + org.opencontainers.image.description="Application packaged by VMware, Inc" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.ref.name="1.0.0-debian-11-r1" \ + org.opencontainers.image.title="kuberay-apiserver" \ + org.opencontainers.image.vendor="VMware, Inc." \ + org.opencontainers.image.version="1.0.0" + +ENV HOME="/" \ + OS_ARCH="${TARGETARCH:-amd64}" \ + OS_FLAVOUR="debian-11" \ + OS_NAME="linux" + +COPY prebuildfs / +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] +# Install required system packages and dependencies +RUN install_packages ca-certificates curl procps +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ + COMPONENTS=( \ + "kuberay-apiserver-1.0.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ + for COMPONENT in "${COMPONENTS[@]}"; do \ + if [ ! -f "${COMPONENT}.tar.gz" ]; then \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ + rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ + done +RUN apt-get autoremove --purge -y curl && \ + apt-get update && apt-get upgrade -y && \ + apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives +RUN useradd -r -u 1001 -g root kuberay-apiserver + +ENV APP_VERSION="1.0.0" \ + BITNAMI_APP_NAME="kuberay-apiserver" \ + PATH="/opt/bitnami/kuberay-apiserver/bin:$PATH" + +USER 1001 +ENTRYPOINT [ "/opt/bitnami/kuberay-apiserver/bin/kuberay-apiserver" ] diff --git a/bitnami/kuberay-apiserver/1/debian-11/docker-compose.yml b/bitnami/kuberay-apiserver/1/debian-11/docker-compose.yml new file mode 100644 index 0000000000000..72250512a545d --- /dev/null +++ b/bitnami/kuberay-apiserver/1/debian-11/docker-compose.yml @@ -0,0 +1,8 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +version: '2' + +services: + kuberay-apiserver: + image: docker.io/bitnami/kuberay-apiserver:1 diff --git a/bitnami/kuberay-apiserver/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kuberay-apiserver/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json new file mode 100644 index 0000000000000..7cf7ebe251460 --- /dev/null +++ b/bitnami/kuberay-apiserver/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -0,0 +1,8 @@ +{ + "kuberay-apiserver": { + "arch": "amd64", + "distro": "debian-11", + "type": "NAMI", + "version": "1.0.0-0" + } +} \ No newline at end of file diff --git a/bitnami/php-fpm/8.0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/kuberay-apiserver/1/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt similarity index 100% rename from bitnami/php-fpm/8.0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt rename to bitnami/kuberay-apiserver/1/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt diff --git a/bitnami/php-fpm/8.0/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/kuberay-apiserver/1/debian-11/prebuildfs/usr/sbin/install_packages similarity index 100% rename from bitnami/php-fpm/8.0/debian-11/prebuildfs/usr/sbin/install_packages rename to bitnami/kuberay-apiserver/1/debian-11/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/kuberay-apiserver/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kuberay-apiserver/1/debian-11/prebuildfs/usr/sbin/run-script new file mode 100755 index 0000000000000..b7a5bf1e50bff --- /dev/null +++ b/bitnami/kuberay-apiserver/1/debian-11/prebuildfs/usr/sbin/run-script @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -u + +if [ $# -eq 0 ]; then + >&2 echo "No arguments provided" + exit 1 +fi + +script=$1 +exit_code="${2:-96}" +fail_if_not_present="${3:-y}" + +if test -f "$script"; then + sh $script + + if [ $? -ne 0 ]; then + exit $((exit_code)) + fi +elif [ "$fail_if_not_present" = "y" ]; then + >&2 echo "script not found: $script" + exit 127 +fi diff --git a/bitnami/mxnet/1/debian-11/tags-info.yaml b/bitnami/kuberay-apiserver/1/debian-11/tags-info.yaml similarity index 84% rename from bitnami/mxnet/1/debian-11/tags-info.yaml rename to bitnami/kuberay-apiserver/1/debian-11/tags-info.yaml index dacc81393faa4..bb856c8a7b9bd 100644 --- a/bitnami/mxnet/1/debian-11/tags-info.yaml +++ b/bitnami/kuberay-apiserver/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.9.1 +- 1.0.0 - latest diff --git a/bitnami/kuberay-apiserver/README.md b/bitnami/kuberay-apiserver/README.md new file mode 100644 index 0000000000000..bfeb016887d22 --- /dev/null +++ b/bitnami/kuberay-apiserver/README.md @@ -0,0 +1,138 @@ +# KubeRay API Server packaged by Bitnami + +## What is KubeRay API Server? + +> APIServer is a component of KubeRay. KubeRay is a Kubernetes operator for deploying and management of Ray applications on Kubernetes using CustomResourceDefinitions. + +[Overview of KubeRay API Server](https://ray.io) +Trademarks: This software listing is packaged by Bitnami. The respective trademarks mentioned in the offering are owned by the respective companies, and use of them does not imply any affiliation or endorsement. + +## TL;DR + +```console +docker run -it --name kuberay-apiserver bitnami/kuberay-apiserver +``` + +### Docker Compose + +```console +curl -sSL https://raw.githubusercontent.com/bitnami/containers/main/bitnami/kuberay-apiserver/docker-compose.yml > docker-compose.yml +docker-compose up -d +``` + +## Why use Bitnami Images? + +- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +- With Bitnami images the latest bug fixes and features are available as soon as possible. +- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +- Bitnami container images are released on a regular basis with the latest distribution packages available. + +Looking to use KubeRay API Server in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. + +## Supported tags and respective `Dockerfile` links + +Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). + +You can see the equivalence between the different tags by taking a look at the `tags-info.yaml` file present in the branch folder, i.e `bitnami/ASSET/BRANCH/DISTRO/tags-info.yaml`. + +Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers). + +## Get this image + +The recommended way to get the Bitnami KubeRay API Server Docker Image is to pull the prebuilt image from the [Docker Hub Registry](https://hub.docker.com/r/bitnami/kuberay-apiserver). + +```console +docker pull bitnami/kuberay-apiserver:latest +``` + +To use a specific version, you can pull a versioned tag. You can view the [list of available versions](https://hub.docker.com/r/bitnami/kuberay-apiserver/tags/) in the Docker Hub Registry. + +```console +docker pull bitnami/kuberay-apiserver:[TAG] +``` + +If you wish, you can also build the image yourself by cloning the repository, changing to the directory containing the Dockerfile and executing the `docker build` command. Remember to replace the `APP`, `VERSION` and `OPERATING-SYSTEM` path placeholders in the example command below with the correct values. + +```console +git clone https://github.com/bitnami/containers.git +cd bitnami/APP/VERSION/OPERATING-SYSTEM +docker build -t bitnami/APP:latest . +``` + +## Maintenance + +### Upgrade this image + +Bitnami provides up-to-date versions of KubeRay API Server, including security patches, soon after they are made upstream. We recommend that you follow these steps to upgrade your container. + +#### Step 1: Get the updated image + +```console +docker pull bitnami/kuberay-apiserver:latest +``` + +or if you're using Docker Compose, update the value of the image property to `bitnami/kuberay-apiserver:latest`. + +#### Step 2: Remove the currently running container + +```console +docker rm -v kuberay-apiserver +``` + +or using Docker Compose: + +```console +docker-compose rm -v kuberay-apiserver +``` + +#### Step 3: Run the new image + +Re-create your container from the new image. + +```console +docker run --name kuberay-apiserver bitnami/kuberay-apiserver:latest +``` + +or using Docker Compose: + +```console +docker-compose up kuberay-apiserver +``` + +## Configuration + +### Running commands + +To run commands inside this container you can use `docker run`, for example to execute `apiserver --help` you can follow the example below: + +```console +docker run --rm --name kuberay-apiserver bitnami/kuberay-apiserver:latest --help +``` + +Check the [official KubeRay API Server documentation](https://ray.io) for more information about how to use KubeRay API Server. + +## Contributing + +We'd love for you to contribute to this Docker image. You can request new features by creating an [issue](https://github.com/bitnami/containers/issues) or submitting a [pull request](https://github.com/bitnami/containers/pulls) with your contribution. + +## Issues + +If you encountered a problem running this container, you can file an [issue](https://github.com/bitnami/containers/issues/new/choose). For us to provide better support, be sure to fill the issue template. + +## License + +Copyright © 2023 VMware, Inc. + +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 + + + +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. diff --git a/bitnami/kuberay-apiserver/docker-compose.yml b/bitnami/kuberay-apiserver/docker-compose.yml new file mode 100644 index 0000000000000..72250512a545d --- /dev/null +++ b/bitnami/kuberay-apiserver/docker-compose.yml @@ -0,0 +1,8 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +version: '2' + +services: + kuberay-apiserver: + image: docker.io/bitnami/kuberay-apiserver:1 diff --git a/bitnami/kuberay-operator/1/debian-11/Dockerfile b/bitnami/kuberay-operator/1/debian-11/Dockerfile new file mode 100644 index 0000000000000..d857314c6a715 --- /dev/null +++ b/bitnami/kuberay-operator/1/debian-11/Dockerfile @@ -0,0 +1,50 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +FROM docker.io/bitnami/minideb:bullseye + +ARG TARGETARCH + +LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-12-18T14:41:21Z" \ + org.opencontainers.image.description="Application packaged by VMware, Inc" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.ref.name="1.0.0-debian-11-r1" \ + org.opencontainers.image.title="kuberay" \ + org.opencontainers.image.vendor="VMware, Inc." \ + org.opencontainers.image.version="1.0.0" + +ENV HOME="/" \ + OS_ARCH="${TARGETARCH:-amd64}" \ + OS_FLAVOUR="debian-11" \ + OS_NAME="linux" + +COPY prebuildfs / +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] +# Install required system packages and dependencies +RUN install_packages ca-certificates curl procps +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ + COMPONENTS=( \ + "kuberay-1.0.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ + for COMPONENT in "${COMPONENTS[@]}"; do \ + if [ ! -f "${COMPONENT}.tar.gz" ]; then \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ + rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ + done +RUN apt-get autoremove --purge -y curl && \ + apt-get update && apt-get upgrade -y && \ + apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives +RUN useradd -r -u 1001 -g root kuberay + +ENV APP_VERSION="1.0.0" \ + BITNAMI_APP_NAME="kuberay" \ + PATH="/opt/bitnami/kuberay/bin:$PATH" + +USER 1001 +ENTRYPOINT [ "/opt/bitnami/kuberay/bin/manager" ] diff --git a/bitnami/kuberay-operator/1/debian-11/docker-compose.yml b/bitnami/kuberay-operator/1/debian-11/docker-compose.yml new file mode 100644 index 0000000000000..6d7684801df11 --- /dev/null +++ b/bitnami/kuberay-operator/1/debian-11/docker-compose.yml @@ -0,0 +1,8 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +version: '2' + +services: + kuberay-operator: + image: docker.io/bitnami/kuberay-operator:1 diff --git a/bitnami/kuberay-operator/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kuberay-operator/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json new file mode 100644 index 0000000000000..e0eda82c257f1 --- /dev/null +++ b/bitnami/kuberay-operator/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -0,0 +1,8 @@ +{ + "kuberay": { + "arch": "amd64", + "distro": "debian-11", + "type": "NAMI", + "version": "1.0.0-0" + } +} \ No newline at end of file diff --git a/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/kuberay-operator/1/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt similarity index 100% rename from bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt rename to bitnami/kuberay-operator/1/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt diff --git a/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/kuberay-operator/1/debian-11/prebuildfs/usr/sbin/install_packages similarity index 100% rename from bitnami/postgresql-repmgr/11/debian-11/prebuildfs/usr/sbin/install_packages rename to bitnami/kuberay-operator/1/debian-11/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/kuberay-operator/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kuberay-operator/1/debian-11/prebuildfs/usr/sbin/run-script new file mode 100755 index 0000000000000..b7a5bf1e50bff --- /dev/null +++ b/bitnami/kuberay-operator/1/debian-11/prebuildfs/usr/sbin/run-script @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -u + +if [ $# -eq 0 ]; then + >&2 echo "No arguments provided" + exit 1 +fi + +script=$1 +exit_code="${2:-96}" +fail_if_not_present="${3:-y}" + +if test -f "$script"; then + sh $script + + if [ $? -ne 0 ]; then + exit $((exit_code)) + fi +elif [ "$fail_if_not_present" = "y" ]; then + >&2 echo "script not found: $script" + exit 127 +fi diff --git a/bitnami/kuberay-operator/1/debian-11/tags-info.yaml b/bitnami/kuberay-operator/1/debian-11/tags-info.yaml new file mode 100644 index 0000000000000..bb856c8a7b9bd --- /dev/null +++ b/bitnami/kuberay-operator/1/debian-11/tags-info.yaml @@ -0,0 +1,5 @@ +rolling-tags: +- "1" +- 1-debian-11 +- 1.0.0 +- latest diff --git a/bitnami/kuberay-operator/README.md b/bitnami/kuberay-operator/README.md new file mode 100644 index 0000000000000..bb0c75286df04 --- /dev/null +++ b/bitnami/kuberay-operator/README.md @@ -0,0 +1,138 @@ +# Bitnami package for KubeRay + +## What is KubeRay? + +> KubeRay is a Kubernetes operator for deploying and management of Ray applications on Kubernetes using CustomResourceDefinitions. + +[Overview of KubeRay](https://ray.io) +Trademarks: This software listing is packaged by Bitnami. The respective trademarks mentioned in the offering are owned by the respective companies, and use of them does not imply any affiliation or endorsement. + +## TL;DR + +```console +docker run -it --name kuberay-operator bitnami/kuberay-operator +``` + +### Docker Compose + +```console +curl -sSL https://raw.githubusercontent.com/bitnami/containers/main/bitnami/kuberay-operator/docker-compose.yml > docker-compose.yml +docker-compose up -d +``` + +## Why use Bitnami Images? + +- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +- With Bitnami images the latest bug fixes and features are available as soon as possible. +- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +- Bitnami container images are released on a regular basis with the latest distribution packages available. + +Looking to use KubeRay in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. + +## Supported tags and respective `Dockerfile` links + +Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). + +You can see the equivalence between the different tags by taking a look at the `tags-info.yaml` file present in the branch folder, i.e `bitnami/ASSET/BRANCH/DISTRO/tags-info.yaml`. + +Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers). + +## Get this image + +The recommended way to get the Bitnami KubeRay Docker Image is to pull the prebuilt image from the [Docker Hub Registry](https://hub.docker.com/r/bitnami/kuberay-operator). + +```console +docker pull bitnami/kuberay-operator:latest +``` + +To use a specific version, you can pull a versioned tag. You can view the [list of available versions](https://hub.docker.com/r/bitnami/kuberay-operator/tags/) in the Docker Hub Registry. + +```console +docker pull bitnami/kuberay-operator:[TAG] +``` + +If you wish, you can also build the image yourself by cloning the repository, changing to the directory containing the Dockerfile and executing the `docker build` command. Remember to replace the `APP`, `VERSION` and `OPERATING-SYSTEM` path placeholders in the example command below with the correct values. + +```console +git clone https://github.com/bitnami/containers.git +cd bitnami/APP/VERSION/OPERATING-SYSTEM +docker build -t bitnami/APP:latest . +``` + +## Maintenance + +### Upgrade this image + +Bitnami provides up-to-date versions of KubeRay, including security patches, soon after they are made upstream. We recommend that you follow these steps to upgrade your container. + +#### Step 1: Get the updated image + +```console +docker pull bitnami/kuberay-operator:latest +``` + +or if you're using Docker Compose, update the value of the image property to `bitnami/kuberay-operator:latest`. + +#### Step 2: Remove the currently running container + +```console +docker rm -v kuberay-operator +``` + +or using Docker Compose: + +```console +docker-compose rm -v kuberay-operator +``` + +#### Step 3: Run the new image + +Re-create your container from the new image. + +```console +docker run --name kuberay-operator bitnami/kuberay-operator:latest +``` + +or using Docker Compose: + +```console +docker-compose up kuberay-operator +``` + +## Configuration + +### Running commands + +To run commands inside this container you can use `docker run`, for example to execute `operator --help` you can follow the example below: + +```console +docker run --rm --name kuberay-operator bitnami/kuberay-operator:latest --help +``` + +Check the [official KubeRay documentation](https://ray.io) for more information about how to use KubeRay. + +## Contributing + +We'd love for you to contribute to this Docker image. You can request new features by creating an [issue](https://github.com/bitnami/containers/issues) or submitting a [pull request](https://github.com/bitnami/containers/pulls) with your contribution. + +## Issues + +If you encountered a problem running this container, you can file an [issue](https://github.com/bitnami/containers/issues/new/choose). For us to provide better support, be sure to fill the issue template. + +## License + +Copyright © 2023 VMware, Inc. + +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 + + + +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. diff --git a/bitnami/kuberay-operator/docker-compose.yml b/bitnami/kuberay-operator/docker-compose.yml new file mode 100644 index 0000000000000..6d7684801df11 --- /dev/null +++ b/bitnami/kuberay-operator/docker-compose.yml @@ -0,0 +1,8 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +version: '2' + +services: + kuberay-operator: + image: docker.io/bitnami/kuberay-operator:1 diff --git a/bitnami/kubernetes-event-exporter/1/debian-11/Dockerfile b/bitnami/kubernetes-event-exporter/1/debian-11/Dockerfile index eb2dfbf195758..29b07f2ce8837 100644 --- a/bitnami/kubernetes-event-exporter/1/debian-11/Dockerfile +++ b/bitnami/kubernetes-event-exporter/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T13:34:26Z" \ + org.opencontainers.image.created="2023-12-06T21:11:54Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.5.0-debian-11-r0" \ + org.opencontainers.image.ref.name="1.6.1-debian-11-r1" \ org.opencontainers.image.title="kubernetes-event-exporter" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.5.0" + org.opencontainers.image.version="1.6.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "kubernetes-event-exporter-1.5.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "kubernetes-event-exporter-1.6.1-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="1.5.0" \ +ENV APP_VERSION="1.6.1" \ BITNAMI_APP_NAME="kubernetes-event-exporter" \ PATH="/opt/bitnami/kubernetes-event-exporter/bin:$PATH" diff --git a/bitnami/kubernetes-event-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kubernetes-event-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 204686d14f499..614d8042500eb 100644 --- a/bitnami/kubernetes-event-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kubernetes-event-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.5.0-0" + "version": "1.6.1-1" } } \ No newline at end of file diff --git a/bitnami/kubernetes-event-exporter/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kubernetes-event-exporter/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/kubernetes-event-exporter/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kubernetes-event-exporter/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/kubernetes-event-exporter/1/debian-11/tags-info.yaml b/bitnami/kubernetes-event-exporter/1/debian-11/tags-info.yaml index daf8be3ed907f..817e36b64569d 100644 --- a/bitnami/kubernetes-event-exporter/1/debian-11/tags-info.yaml +++ b/bitnami/kubernetes-event-exporter/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.5.0 +- 1.6.1 - latest diff --git a/bitnami/kubernetes-event-exporter/README.md b/bitnami/kubernetes-event-exporter/README.md index 2fdd94364e75c..0fff513bcb4ad 100644 --- a/bitnami/kubernetes-event-exporter/README.md +++ b/bitnami/kubernetes-event-exporter/README.md @@ -1,4 +1,4 @@ -# Kubernetes Event Exporter packaged by Bitnami +# Bitnami package for Kubernetes Event Exporter ## What is Kubernetes Event Exporter? @@ -25,6 +25,9 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use Kubernetes Event Exporter in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/laravel/10/debian-11/Dockerfile b/bitnami/laravel/10/debian-11/Dockerfile index 36cf8ccfdacee..e7731f6e476b5 100644 --- a/bitnami/laravel/10/debian-11/Dockerfile +++ b/bitnami/laravel/10/debian-11/Dockerfile @@ -7,37 +7,37 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T08:24:34Z" \ + org.opencontainers.image.created="2023-12-07T08:39:06Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.2.6-debian-11-r48" \ + org.opencontainers.image.ref.name="10.2.10-debian-11-r0" \ org.opencontainers.image.title="laravel" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="10.2.6" + org.opencontainers.image.version="10.2.10" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbrotli1 libbsd0 libbz2-1.0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncursesw6 libnettle8 libnghttp2-14 libnsl2 libonig5 libp11-kit0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libtirpc3 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps sqlite3 sudo zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "php-8.2.11-3-linux-${OS_ARCH}-debian-11" \ - "node-18.18.2-0-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "laravel-10.2.6-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.7-0-linux-${OS_ARCH}-debian-11" \ + "php-8.2.13-8-linux-${OS_ARCH}-debian-11" \ + "node-18.19.0-0-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "laravel-10.2.10-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -47,7 +47,7 @@ RUN /build/bitnami-user.sh COPY rootfs / RUN /opt/bitnami/scripts/laravel/postunpack.sh RUN /opt/bitnami/scripts/php/postunpack.sh -ENV APP_VERSION="10.2.6" \ +ENV APP_VERSION="10.2.10" \ BITNAMI_APP_NAME="laravel" \ NODE_PATH="/opt/bitnami/node/lib/node_modules" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/node/bin:/opt/bitnami/common/bin:$PATH" \ diff --git a/bitnami/laravel/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/laravel/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 9441bb7054520..3fc486913efab 100644 --- a/bitnami/laravel/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/laravel/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,30 +3,30 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.2.6-2" + "version": "10.2.10-0" }, "node": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "18.18.2-0" + "version": "18.19.0-0" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.11-3" + "version": "8.2.13-8" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.7-0" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" } } \ No newline at end of file diff --git a/bitnami/laravel/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/laravel/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/laravel/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/laravel/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/laravel/10/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/laravel/10/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/laravel/10/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/laravel/10/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/laravel/10/debian-11/tags-info.yaml b/bitnami/laravel/10/debian-11/tags-info.yaml index da2125dad9461..e393d6c180410 100644 --- a/bitnami/laravel/10/debian-11/tags-info.yaml +++ b/bitnami/laravel/10/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "10" - 10-debian-11 -- 10.2.6 +- 10.2.10 - latest diff --git a/bitnami/laravel/9/debian-11/Dockerfile b/bitnami/laravel/9/debian-11/Dockerfile index 99caddfa4d1b3..7369f3804b1c8 100644 --- a/bitnami/laravel/9/debian-11/Dockerfile +++ b/bitnami/laravel/9/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T08:24:51Z" \ + org.opencontainers.image.created="2023-12-02T07:24:10Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="9.5.2-debian-11-r125" \ + org.opencontainers.image.ref.name="9.5.2-debian-11-r129" \ org.opencontainers.image.title="laravel" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="9.5.2" @@ -20,24 +20,24 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbrotli1 libbsd0 libbz2-1.0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncursesw6 libnettle8 libnghttp2-14 libnsl2 libonig5 libp11-kit0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libtirpc3 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps sqlite3 sudo zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "php-8.2.11-3-linux-${OS_ARCH}-debian-11" \ - "node-18.18.2-0-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "laravel-9.5.2-11-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.6-11-linux-${OS_ARCH}-debian-11" \ + "php-8.2.13-6-linux-${OS_ARCH}-debian-11" \ + "node-18.19.0-0-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-3-linux-${OS_ARCH}-debian-11" \ + "laravel-9.5.2-12-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/laravel/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/laravel/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 7486a5fb31708..4f28b8fa5da24 100644 --- a/bitnami/laravel/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/laravel/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,30 +3,30 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "9.5.2-11" + "version": "9.5.2-12" }, "node": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "18.18.2-0" + "version": "18.19.0-0" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.11-3" + "version": "8.2.13-6" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.6-11" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-3" } } \ No newline at end of file diff --git a/bitnami/laravel/9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/laravel/9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/laravel/9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/laravel/9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/laravel/9/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/laravel/9/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/laravel/9/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/laravel/9/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/laravel/README.md b/bitnami/laravel/README.md index 0c5dcd5c5e0d9..f145d0149c2f6 100644 --- a/bitnami/laravel/README.md +++ b/bitnami/laravel/README.md @@ -1,4 +1,4 @@ -# Laravel packaged by Bitnami +# Bitnami package for Laravel ## What is Laravel? @@ -24,7 +24,7 @@ docker-compose up * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/logstash/7/debian-11/Dockerfile b/bitnami/logstash/7/debian-11/Dockerfile index 747f80f75c76c..7b9cd1a4d0c91 100644 --- a/bitnami/logstash/7/debian-11/Dockerfile +++ b/bitnami/logstash/7/debian-11/Dockerfile @@ -9,13 +9,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-10T17:10:20Z" \ + org.opencontainers.image.created="2023-12-13T23:35:09Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.17.14-debian-11-r0" \ + org.opencontainers.image.ref.name="7.17.16-debian-11-r0" \ org.opencontainers.image.title="logstash" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.17.14" + org.opencontainers.image.version="7.17.16" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -23,22 +23,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "yq-4.35.2-2-linux-${OS_ARCH}-debian-11" \ - "logstash-7.17.14-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "yq-4.40.5-0-linux-${OS_ARCH}-debian-11" \ + "logstash-7.17.16-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -49,7 +49,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/logstash/postunpack.sh -ENV APP_VERSION="7.17.14" \ +ENV APP_VERSION="7.17.16" \ BITNAMI_APP_NAME="logstash" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:/opt/bitnami/logstash/bin:$PATH" diff --git a/bitnami/logstash/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/logstash/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index a63475db824b8..e71bb2aaad71e 100644 --- a/bitnami/logstash/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/logstash/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "logstash": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.17.14-0" + "version": "7.17.16-0" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-2" + "version": "4.40.5-0" } } \ No newline at end of file diff --git a/bitnami/logstash/7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/logstash/7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/logstash/7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/logstash/7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/logstash/7/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/logstash/7/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/logstash/7/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/logstash/7/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/logstash/7/debian-11/tags-info.yaml b/bitnami/logstash/7/debian-11/tags-info.yaml index 948df5889c5b3..5d72cb9860503 100644 --- a/bitnami/logstash/7/debian-11/tags-info.yaml +++ b/bitnami/logstash/7/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "7" - 7-debian-11 -- 7.17.14 +- 7.17.16 diff --git a/bitnami/logstash/8/debian-11/Dockerfile b/bitnami/logstash/8/debian-11/Dockerfile index cc4facb1cd604..5606b47c8122f 100644 --- a/bitnami/logstash/8/debian-11/Dockerfile +++ b/bitnami/logstash/8/debian-11/Dockerfile @@ -9,13 +9,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-17T15:10:46Z" \ + org.opencontainers.image.created="2023-12-13T09:53:54Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.10.4-debian-11-r0" \ + org.opencontainers.image.ref.name="8.11.3-debian-11-r0" \ org.opencontainers.image.title="logstash" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="8.10.4" + org.opencontainers.image.version="8.11.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -23,22 +23,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "logstash-8.10.4-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "yq-4.40.5-0-linux-${OS_ARCH}-debian-11" \ + "logstash-8.11.3-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -49,7 +49,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/logstash/postunpack.sh -ENV APP_VERSION="8.10.4" \ +ENV APP_VERSION="8.11.3" \ BITNAMI_APP_NAME="logstash" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:/opt/bitnami/logstash/bin:$PATH" diff --git a/bitnami/logstash/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/logstash/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 1108b0c452f21..5fa3459385d04 100644 --- a/bitnami/logstash/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/logstash/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "logstash": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.10.4-0" + "version": "8.11.3-0" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.5-0" } } \ No newline at end of file diff --git a/bitnami/logstash/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/logstash/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/logstash/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/logstash/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/logstash/8/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/logstash/8/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/logstash/8/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/logstash/8/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/logstash/8/debian-11/tags-info.yaml b/bitnami/logstash/8/debian-11/tags-info.yaml index ecbea73631d79..ccb5c9eb732e3 100644 --- a/bitnami/logstash/8/debian-11/tags-info.yaml +++ b/bitnami/logstash/8/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "8" - 8-debian-11 -- 8.10.4 +- 8.11.3 - latest diff --git a/bitnami/logstash/README.md b/bitnami/logstash/README.md index c6f4e2df06003..511f5d61943dd 100644 --- a/bitnami/logstash/README.md +++ b/bitnami/logstash/README.md @@ -1,4 +1,4 @@ -# Logstash packaged by Bitnami +# Bitnami package for Logstash ## What is Logstash? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/magento/2/debian-11/Dockerfile b/bitnami/magento/2/debian-11/Dockerfile index 2386e0b785c7a..d4d99037699ef 100644 --- a/bitnami/magento/2/debian-11/Dockerfile +++ b/bitnami/magento/2/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:08:20Z" \ + org.opencontainers.image.created="2023-12-02T07:33:34Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.4.6-debian-11-r114" \ + org.opencontainers.image.ref.name="2.4.6-debian-11-r117" \ org.opencontainers.image.title="magento" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.4.6" @@ -20,26 +20,26 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates cron curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.2.11-3-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.57-12-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.6.15-1-linux-${OS_ARCH}-debian-11" \ - "libphp-8.2.11-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ + "php-8.2.13-6-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.58-1-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-3-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.6.16-0-linux-${OS_ARCH}-debian-11" \ + "libphp-8.2.13-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-3-linux-${OS_ARCH}-debian-11" \ "magento-2.4.6-8-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index d7cb4cb2000f2..2beae5543bf16 100644 --- a/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,13 +3,13 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.57-12" + "version": "2.4.58-1" }, "libphp": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.11-0" + "version": "8.2.13-0" }, "magento": { "arch": "amd64", @@ -21,24 +21,24 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.6.15-1" + "version": "10.6.16-0" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.11-3" + "version": "8.2.13-6" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-3" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-3" } } \ No newline at end of file diff --git a/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/magento/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/magento/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/magento/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/magento/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/magento/2/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/magento/2/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh index 765d1d8ce1ed5..6a480ad4ddde9 100755 --- a/bitnami/magento/2/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh +++ b/bitnami/magento/2/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh @@ -46,6 +46,7 @@ apache_setup_bitnami_config() { local -a modules_to_disable=( "http2_module" "proxy_hcheck_module" + "proxy_html_module" "proxy_http2_module" ) for module in "${modules_to_disable[@]}"; do diff --git a/bitnami/magento/README.md b/bitnami/magento/README.md index 0a64bcba78536..c6b0dfd47e25d 100644 --- a/bitnami/magento/README.md +++ b/bitnami/magento/README.md @@ -1,4 +1,4 @@ -# Magento packaged by Bitnami +# Bitnami package for Magento ## What is Magento? @@ -21,7 +21,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/mariadb-galera/10.10/debian-11/Dockerfile b/bitnami/mariadb-galera/10.10/debian-11/Dockerfile index f4534b67020c9..fc94680c260ec 100644 --- a/bitnami/mariadb-galera/10.10/debian-11/Dockerfile +++ b/bitnami/mariadb-galera/10.10/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T16:44:12Z" \ + org.opencontainers.image.created="2023-12-14T19:02:45Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.10.6-debian-11-r45" \ + org.opencontainers.image.ref.name="10.10.7-debian-11-r1" \ org.opencontainers.image.title="mariadb-galera" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="10.10.6" + org.opencontainers.image.version="10.10.7" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl iproute2 ldap-utils libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu67 libldap-common liblzma5 libncurses6 libpam-ldapd libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 nslcd procps psmisc rsync socat zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ini-file-1.4.6-1-linux-${OS_ARCH}-debian-11" \ - "mariadb-galera-10.10.6-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "ini-file-1.4.6-4-linux-${OS_ARCH}-debian-11" \ + "mariadb-galera-10.10.7-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN mkdir /docker-entrypoint-initdb.d COPY rootfs / RUN /opt/bitnami/scripts/mariadb-galera/postunpack.sh -ENV APP_VERSION="10.10.6" \ +ENV APP_VERSION="10.10.7" \ BITNAMI_APP_NAME="mariadb-galera" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/common/sbin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH" diff --git a/bitnami/mariadb-galera/10.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb-galera/10.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c6e751e6cca93..55a9d0c8e6b08 100644 --- a/bitnami/mariadb-galera/10.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb-galera/10.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-1" + "version": "1.4.6-4" }, "mariadb-galera": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.10.6-2" + "version": "10.10.7-0" } } \ No newline at end of file diff --git a/bitnami/mariadb-galera/10.10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mariadb-galera/10.10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mariadb-galera/10.10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mariadb-galera/10.10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mariadb-galera/10.10/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mariadb-galera/10.10/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mariadb-galera/10.10/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mariadb-galera/10.10/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mariadb-galera/10.10/debian-11/tags-info.yaml b/bitnami/mariadb-galera/10.10/debian-11/tags-info.yaml index 94011851f36d5..c3850504e6987 100644 --- a/bitnami/mariadb-galera/10.10/debian-11/tags-info.yaml +++ b/bitnami/mariadb-galera/10.10/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "10.10" - 10.10-debian-11 -- 10.10.6 +- 10.10.7 diff --git a/bitnami/mariadb-galera/10.11/debian-11/Dockerfile b/bitnami/mariadb-galera/10.11/debian-11/Dockerfile index 405f925dbe160..90217e31e4851 100644 --- a/bitnami/mariadb-galera/10.11/debian-11/Dockerfile +++ b/bitnami/mariadb-galera/10.11/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T16:44:40Z" \ + org.opencontainers.image.created="2023-12-14T17:22:47Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.11.5-debian-11-r45" \ + org.opencontainers.image.ref.name="10.11.6-debian-11-r1" \ org.opencontainers.image.title="mariadb-galera" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="10.11.5" + org.opencontainers.image.version="10.11.6" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl iproute2 ldap-utils libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu67 libldap-common liblzma5 libncurses6 libpam-ldapd libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 nslcd procps psmisc rsync socat zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ini-file-1.4.6-1-linux-${OS_ARCH}-debian-11" \ - "mariadb-galera-10.11.5-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "ini-file-1.4.6-4-linux-${OS_ARCH}-debian-11" \ + "mariadb-galera-10.11.6-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN mkdir /docker-entrypoint-initdb.d COPY rootfs / RUN /opt/bitnami/scripts/mariadb-galera/postunpack.sh -ENV APP_VERSION="10.11.5" \ +ENV APP_VERSION="10.11.6" \ BITNAMI_APP_NAME="mariadb-galera" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/common/sbin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH" diff --git a/bitnami/mariadb-galera/10.11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb-galera/10.11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 1f4a089d46176..ddaf89e9b7915 100644 --- a/bitnami/mariadb-galera/10.11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb-galera/10.11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-1" + "version": "1.4.6-4" }, "mariadb-galera": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.11.5-3" + "version": "10.11.6-0" } } \ No newline at end of file diff --git a/bitnami/mariadb-galera/10.11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mariadb-galera/10.11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mariadb-galera/10.11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mariadb-galera/10.11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mariadb-galera/10.11/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mariadb-galera/10.11/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mariadb-galera/10.11/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mariadb-galera/10.11/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mariadb-galera/10.11/debian-11/tags-info.yaml b/bitnami/mariadb-galera/10.11/debian-11/tags-info.yaml index f7ad0cad5859a..2889c40f2b036 100644 --- a/bitnami/mariadb-galera/10.11/debian-11/tags-info.yaml +++ b/bitnami/mariadb-galera/10.11/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "10.11" - 10.11-debian-11 -- 10.11.5 +- 10.11.6 diff --git a/bitnami/mariadb-galera/10.4/debian-11/Dockerfile b/bitnami/mariadb-galera/10.4/debian-11/Dockerfile index ad54ede63a3bb..a272d5d4d7663 100644 --- a/bitnami/mariadb-galera/10.4/debian-11/Dockerfile +++ b/bitnami/mariadb-galera/10.4/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T16:44:21Z" \ + org.opencontainers.image.created="2023-12-13T23:19:10Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.4.31-debian-11-r45" \ + org.opencontainers.image.ref.name="10.4.32-debian-11-r1" \ org.opencontainers.image.title="mariadb-galera" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="10.4.31" + org.opencontainers.image.version="10.4.32" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl iproute2 ldap-utils libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu67 libjemalloc2 libldap-common liblzma5 libncurses6 libpam-ldapd libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 nslcd procps psmisc rsync socat zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ini-file-1.4.6-1-linux-${OS_ARCH}-debian-11" \ - "mariadb-galera-10.4.31-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "ini-file-1.4.6-4-linux-${OS_ARCH}-debian-11" \ + "mariadb-galera-10.4.32-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN mkdir /docker-entrypoint-initdb.d COPY rootfs / RUN /opt/bitnami/scripts/mariadb-galera/postunpack.sh -ENV APP_VERSION="10.4.31" \ +ENV APP_VERSION="10.4.32" \ BITNAMI_APP_NAME="mariadb-galera" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/common/sbin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH" diff --git a/bitnami/mariadb-galera/10.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb-galera/10.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index d43870f1fe56a..cf8b81ee86bac 100644 --- a/bitnami/mariadb-galera/10.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb-galera/10.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-1" + "version": "1.4.6-4" }, "mariadb-galera": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.4.31-2" + "version": "10.4.32-0" } } \ No newline at end of file diff --git a/bitnami/mariadb-galera/10.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mariadb-galera/10.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mariadb-galera/10.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mariadb-galera/10.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mariadb-galera/10.4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mariadb-galera/10.4/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mariadb-galera/10.4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mariadb-galera/10.4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mariadb-galera/10.4/debian-11/tags-info.yaml b/bitnami/mariadb-galera/10.4/debian-11/tags-info.yaml index 8feb641f13de1..f44b63f9d4e42 100644 --- a/bitnami/mariadb-galera/10.4/debian-11/tags-info.yaml +++ b/bitnami/mariadb-galera/10.4/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "10.4" - 10.4-debian-11 -- 10.4.31 +- 10.4.32 diff --git a/bitnami/mariadb-galera/10.5/debian-11/Dockerfile b/bitnami/mariadb-galera/10.5/debian-11/Dockerfile index e1571ea2d13d5..b3544b11d9514 100644 --- a/bitnami/mariadb-galera/10.5/debian-11/Dockerfile +++ b/bitnami/mariadb-galera/10.5/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T16:55:18Z" \ + org.opencontainers.image.created="2023-12-14T00:00:23Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.5.22-debian-11-r45" \ + org.opencontainers.image.ref.name="10.5.23-debian-11-r1" \ org.opencontainers.image.title="mariadb-galera" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="10.5.22" + org.opencontainers.image.version="10.5.23" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl iproute2 ldap-utils libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu67 libldap-common liblzma5 libncurses6 libpam-ldapd libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 nslcd procps psmisc rsync socat zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ini-file-1.4.6-1-linux-${OS_ARCH}-debian-11" \ - "mariadb-galera-10.5.22-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "ini-file-1.4.6-4-linux-${OS_ARCH}-debian-11" \ + "mariadb-galera-10.5.23-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN mkdir /docker-entrypoint-initdb.d COPY rootfs / RUN /opt/bitnami/scripts/mariadb-galera/postunpack.sh -ENV APP_VERSION="10.5.22" \ +ENV APP_VERSION="10.5.23" \ BITNAMI_APP_NAME="mariadb-galera" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/common/sbin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH" diff --git a/bitnami/mariadb-galera/10.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb-galera/10.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 19cbf43b05e29..cb25c248acec6 100644 --- a/bitnami/mariadb-galera/10.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb-galera/10.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-1" + "version": "1.4.6-4" }, "mariadb-galera": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.5.22-2" + "version": "10.5.23-0" } } \ No newline at end of file diff --git a/bitnami/mariadb-galera/10.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mariadb-galera/10.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mariadb-galera/10.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mariadb-galera/10.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mariadb-galera/10.5/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mariadb-galera/10.5/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mariadb-galera/10.5/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mariadb-galera/10.5/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mariadb-galera/10.5/debian-11/tags-info.yaml b/bitnami/mariadb-galera/10.5/debian-11/tags-info.yaml index 8d6dea3a23bba..20930484f8f03 100644 --- a/bitnami/mariadb-galera/10.5/debian-11/tags-info.yaml +++ b/bitnami/mariadb-galera/10.5/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "10.5" - 10.5-debian-11 -- 10.5.22 +- 10.5.23 diff --git a/bitnami/mariadb-galera/10.6/debian-11/Dockerfile b/bitnami/mariadb-galera/10.6/debian-11/Dockerfile index 6dca6b1bb5a1a..70d98173a99e6 100644 --- a/bitnami/mariadb-galera/10.6/debian-11/Dockerfile +++ b/bitnami/mariadb-galera/10.6/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T16:55:55Z" \ + org.opencontainers.image.created="2023-12-13T23:59:36Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.6.15-debian-11-r45" \ + org.opencontainers.image.ref.name="10.6.16-debian-11-r1" \ org.opencontainers.image.title="mariadb-galera" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="10.6.15" + org.opencontainers.image.version="10.6.16" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl iproute2 ldap-utils libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu67 libldap-common liblzma5 libncurses6 libpam-ldapd libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 nslcd procps psmisc rsync socat zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ini-file-1.4.6-1-linux-${OS_ARCH}-debian-11" \ - "mariadb-galera-10.6.15-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "ini-file-1.4.6-4-linux-${OS_ARCH}-debian-11" \ + "mariadb-galera-10.6.16-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN mkdir /docker-entrypoint-initdb.d COPY rootfs / RUN /opt/bitnami/scripts/mariadb-galera/postunpack.sh -ENV APP_VERSION="10.6.15" \ +ENV APP_VERSION="10.6.16" \ BITNAMI_APP_NAME="mariadb-galera" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/common/sbin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH" diff --git a/bitnami/mariadb-galera/10.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb-galera/10.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 0c488d5d46572..9176112d3d997 100644 --- a/bitnami/mariadb-galera/10.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb-galera/10.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-1" + "version": "1.4.6-4" }, "mariadb-galera": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.6.15-2" + "version": "10.6.16-0" } } \ No newline at end of file diff --git a/bitnami/mariadb-galera/10.6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mariadb-galera/10.6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mariadb-galera/10.6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mariadb-galera/10.6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mariadb-galera/10.6/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mariadb-galera/10.6/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mariadb-galera/10.6/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mariadb-galera/10.6/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mariadb-galera/10.6/debian-11/tags-info.yaml b/bitnami/mariadb-galera/10.6/debian-11/tags-info.yaml index d1dc68c85a8a1..c123bd2782486 100644 --- a/bitnami/mariadb-galera/10.6/debian-11/tags-info.yaml +++ b/bitnami/mariadb-galera/10.6/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "10.6" - 10.6-debian-11 -- 10.6.15 +- 10.6.16 diff --git a/bitnami/mariadb-galera/11.0/debian-11/Dockerfile b/bitnami/mariadb-galera/11.0/debian-11/Dockerfile index efc7f96e4dcab..a4fc94e05b0de 100644 --- a/bitnami/mariadb-galera/11.0/debian-11/Dockerfile +++ b/bitnami/mariadb-galera/11.0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T17:00:47Z" \ + org.opencontainers.image.created="2023-12-14T18:09:55Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="11.0.3-debian-11-r50" \ + org.opencontainers.image.ref.name="11.0.4-debian-11-r1" \ org.opencontainers.image.title="mariadb-galera" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="11.0.3" + org.opencontainers.image.version="11.0.4" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl iproute2 ldap-utils libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu67 libldap-common liblzma5 libncurses6 libpam-ldapd libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 nslcd procps psmisc rsync socat zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ini-file-1.4.6-1-linux-${OS_ARCH}-debian-11" \ - "mariadb-galera-11.0.3-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "ini-file-1.4.6-4-linux-${OS_ARCH}-debian-11" \ + "mariadb-galera-11.0.4-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN mkdir /docker-entrypoint-initdb.d COPY rootfs / RUN /opt/bitnami/scripts/mariadb-galera/postunpack.sh -ENV APP_VERSION="11.0.3" \ +ENV APP_VERSION="11.0.4" \ BITNAMI_APP_NAME="mariadb-galera" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/common/sbin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH" diff --git a/bitnami/mariadb-galera/11.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb-galera/11.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index e8d8af5a3d8de..870693756aa36 100644 --- a/bitnami/mariadb-galera/11.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb-galera/11.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-1" + "version": "1.4.6-4" }, "mariadb-galera": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.0.3-2" + "version": "11.0.4-0" } } \ No newline at end of file diff --git a/bitnami/mariadb-galera/11.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mariadb-galera/11.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mariadb-galera/11.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mariadb-galera/11.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mariadb-galera/11.0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mariadb-galera/11.0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mariadb-galera/11.0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mariadb-galera/11.0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mariadb-galera/11.0/debian-11/tags-info.yaml b/bitnami/mariadb-galera/11.0/debian-11/tags-info.yaml index 552c9b4e116b0..e2d3847fda090 100644 --- a/bitnami/mariadb-galera/11.0/debian-11/tags-info.yaml +++ b/bitnami/mariadb-galera/11.0/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "11.0" - 11.0-debian-11 -- 11.0.3 +- 11.0.4 diff --git a/bitnami/mariadb-galera/11.1/debian-11/Dockerfile b/bitnami/mariadb-galera/11.1/debian-11/Dockerfile index 747fc6fc3b5cc..8f776fadf1fc3 100644 --- a/bitnami/mariadb-galera/11.1/debian-11/Dockerfile +++ b/bitnami/mariadb-galera/11.1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-20T20:10:33Z" \ + org.opencontainers.image.created="2023-12-15T01:39:16Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="11.1.2-debian-11-r2" \ + org.opencontainers.image.ref.name="11.1.3-debian-11-r1" \ org.opencontainers.image.title="mariadb-galera" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="11.1.2" + org.opencontainers.image.version="11.1.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl iproute2 ldap-utils libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu67 libldap-common liblzma5 libncurses6 libpam-ldapd libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 nslcd procps psmisc rsync socat zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ini-file-1.4.6-2-linux-${OS_ARCH}-debian-11" \ - "mariadb-galera-11.1.2-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "ini-file-1.4.6-4-linux-${OS_ARCH}-debian-11" \ + "mariadb-galera-11.1.3-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN mkdir /docker-entrypoint-initdb.d COPY rootfs / RUN /opt/bitnami/scripts/mariadb-galera/postunpack.sh -ENV APP_VERSION="11.1.2" \ +ENV APP_VERSION="11.1.3" \ BITNAMI_APP_NAME="mariadb-galera" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/common/sbin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH" diff --git a/bitnami/mariadb-galera/11.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb-galera/11.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index af0110987e872..590336db67868 100644 --- a/bitnami/mariadb-galera/11.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb-galera/11.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-2" + "version": "1.4.6-4" }, "mariadb-galera": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.1.2-2" + "version": "11.1.3-0" } } \ No newline at end of file diff --git a/bitnami/mariadb-galera/11.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mariadb-galera/11.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mariadb-galera/11.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mariadb-galera/11.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mariadb-galera/11.1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mariadb-galera/11.1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mariadb-galera/11.1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mariadb-galera/11.1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mariadb-galera/11.1/debian-11/tags-info.yaml b/bitnami/mariadb-galera/11.1/debian-11/tags-info.yaml index 261dfa85973e0..d2033f81afe7e 100644 --- a/bitnami/mariadb-galera/11.1/debian-11/tags-info.yaml +++ b/bitnami/mariadb-galera/11.1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "11.1" - 11.1-debian-11 -- 11.1.2 +- 11.1.3 - latest diff --git a/bitnami/mariadb-galera/README.md b/bitnami/mariadb-galera/README.md index c820a7497db41..6aa4d9e7734c8 100644 --- a/bitnami/mariadb-galera/README.md +++ b/bitnami/mariadb-galera/README.md @@ -1,4 +1,4 @@ -# MariaDB Galera packaged by Bitnami +# Bitnami package for MariaDB Galera ## What is MariaDB Galera? @@ -29,7 +29,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/mariadb/10.10/debian-11/Dockerfile b/bitnami/mariadb/10.10/debian-11/Dockerfile index b7932d8af90c5..1e9465787e8d6 100644 --- a/bitnami/mariadb/10.10/debian-11/Dockerfile +++ b/bitnami/mariadb/10.10/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T17:04:03Z" \ + org.opencontainers.image.created="2023-12-18T18:46:26Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.10.6-debian-11-r46" \ + org.opencontainers.image.ref.name="10.10.7-debian-11-r2" \ org.opencontainers.image.title="mariadb" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="10.10.6" + org.opencontainers.image.version="10.10.7" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu67 liblzma5 libncurses6 libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 procps psmisc zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ini-file-1.4.6-1-linux-${OS_ARCH}-debian-11" \ - "mariadb-10.10.6-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "ini-file-1.4.6-4-linux-${OS_ARCH}-debian-11" \ + "mariadb-10.10.7-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN mkdir /docker-entrypoint-initdb.d COPY rootfs / RUN /opt/bitnami/scripts/mariadb/postunpack.sh -ENV APP_VERSION="10.10.6" \ +ENV APP_VERSION="10.10.7" \ BITNAMI_APP_NAME="mariadb" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/common/sbin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH" diff --git a/bitnami/mariadb/10.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb/10.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index f88740cd67db0..9084f6745a451 100644 --- a/bitnami/mariadb/10.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb/10.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-1" + "version": "1.4.6-4" }, "mariadb": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.10.6-1" + "version": "10.10.7-1" } } \ No newline at end of file diff --git a/bitnami/mariadb/10.10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mariadb/10.10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mariadb/10.10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mariadb/10.10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mariadb/10.10/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mariadb/10.10/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mariadb/10.10/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mariadb/10.10/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mariadb/10.10/debian-11/tags-info.yaml b/bitnami/mariadb/10.10/debian-11/tags-info.yaml index 94011851f36d5..c3850504e6987 100644 --- a/bitnami/mariadb/10.10/debian-11/tags-info.yaml +++ b/bitnami/mariadb/10.10/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "10.10" - 10.10-debian-11 -- 10.10.6 +- 10.10.7 diff --git a/bitnami/mariadb/10.11/debian-11/Dockerfile b/bitnami/mariadb/10.11/debian-11/Dockerfile index 0590310d4d61f..be67074c28a0c 100644 --- a/bitnami/mariadb/10.11/debian-11/Dockerfile +++ b/bitnami/mariadb/10.11/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T17:05:27Z" \ + org.opencontainers.image.created="2023-12-18T19:23:49Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.11.5-debian-11-r49" \ + org.opencontainers.image.ref.name="10.11.6-debian-11-r2" \ org.opencontainers.image.title="mariadb" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="10.11.5" + org.opencontainers.image.version="10.11.6" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu67 liblzma5 libncurses6 libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 procps psmisc zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ini-file-1.4.6-1-linux-${OS_ARCH}-debian-11" \ - "mariadb-10.11.5-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "ini-file-1.4.6-4-linux-${OS_ARCH}-debian-11" \ + "mariadb-10.11.6-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN mkdir /docker-entrypoint-initdb.d COPY rootfs / RUN /opt/bitnami/scripts/mariadb/postunpack.sh -ENV APP_VERSION="10.11.5" \ +ENV APP_VERSION="10.11.6" \ BITNAMI_APP_NAME="mariadb" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/common/sbin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH" diff --git a/bitnami/mariadb/10.11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb/10.11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index e1fa453906524..2714fb298bfa3 100644 --- a/bitnami/mariadb/10.11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb/10.11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-1" + "version": "1.4.6-4" }, "mariadb": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.11.5-1" + "version": "10.11.6-1" } } \ No newline at end of file diff --git a/bitnami/mariadb/10.11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mariadb/10.11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mariadb/10.11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mariadb/10.11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mariadb/10.11/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mariadb/10.11/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mariadb/10.11/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mariadb/10.11/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mariadb/10.11/debian-11/tags-info.yaml b/bitnami/mariadb/10.11/debian-11/tags-info.yaml index f7ad0cad5859a..2889c40f2b036 100644 --- a/bitnami/mariadb/10.11/debian-11/tags-info.yaml +++ b/bitnami/mariadb/10.11/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "10.11" - 10.11-debian-11 -- 10.11.5 +- 10.11.6 diff --git a/bitnami/mariadb/10.4/debian-11/Dockerfile b/bitnami/mariadb/10.4/debian-11/Dockerfile index 6f335d68bb0d1..b76557e2f318a 100644 --- a/bitnami/mariadb/10.4/debian-11/Dockerfile +++ b/bitnami/mariadb/10.4/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T17:08:41Z" \ + org.opencontainers.image.created="2023-12-18T21:32:17Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.4.31-debian-11-r45" \ + org.opencontainers.image.ref.name="10.4.32-debian-11-r2" \ org.opencontainers.image.title="mariadb" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="10.4.31" + org.opencontainers.image.version="10.4.32" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu67 libjemalloc2 liblzma5 libncurses6 libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 procps psmisc zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ini-file-1.4.6-1-linux-${OS_ARCH}-debian-11" \ - "mariadb-10.4.31-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "ini-file-1.4.6-4-linux-${OS_ARCH}-debian-11" \ + "mariadb-10.4.32-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN mkdir /docker-entrypoint-initdb.d COPY rootfs / RUN /opt/bitnami/scripts/mariadb/postunpack.sh -ENV APP_VERSION="10.4.31" \ +ENV APP_VERSION="10.4.32" \ BITNAMI_APP_NAME="mariadb" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/common/sbin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH" diff --git a/bitnami/mariadb/10.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb/10.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 3f10f8247761f..96536f50234d0 100644 --- a/bitnami/mariadb/10.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb/10.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-1" + "version": "1.4.6-4" }, "mariadb": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.4.31-1" + "version": "10.4.32-1" } } \ No newline at end of file diff --git a/bitnami/mariadb/10.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mariadb/10.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mariadb/10.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mariadb/10.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mariadb/10.4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mariadb/10.4/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mariadb/10.4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mariadb/10.4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mariadb/10.4/debian-11/tags-info.yaml b/bitnami/mariadb/10.4/debian-11/tags-info.yaml index 8feb641f13de1..f44b63f9d4e42 100644 --- a/bitnami/mariadb/10.4/debian-11/tags-info.yaml +++ b/bitnami/mariadb/10.4/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "10.4" - 10.4-debian-11 -- 10.4.31 +- 10.4.32 diff --git a/bitnami/mariadb/10.5/debian-11/Dockerfile b/bitnami/mariadb/10.5/debian-11/Dockerfile index da1671b1fde97..8d4d988d8f98b 100644 --- a/bitnami/mariadb/10.5/debian-11/Dockerfile +++ b/bitnami/mariadb/10.5/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T17:09:10Z" \ + org.opencontainers.image.created="2023-12-18T21:40:57Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.5.22-debian-11-r45" \ + org.opencontainers.image.ref.name="10.5.23-debian-11-r2" \ org.opencontainers.image.title="mariadb" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="10.5.22" + org.opencontainers.image.version="10.5.23" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu67 liblzma5 libncurses6 libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 procps psmisc zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ini-file-1.4.6-1-linux-${OS_ARCH}-debian-11" \ - "mariadb-10.5.22-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "ini-file-1.4.6-4-linux-${OS_ARCH}-debian-11" \ + "mariadb-10.5.23-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN mkdir /docker-entrypoint-initdb.d COPY rootfs / RUN /opt/bitnami/scripts/mariadb/postunpack.sh -ENV APP_VERSION="10.5.22" \ +ENV APP_VERSION="10.5.23" \ BITNAMI_APP_NAME="mariadb" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/common/sbin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH" diff --git a/bitnami/mariadb/10.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb/10.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 9b479add9decf..eb035801e02f2 100644 --- a/bitnami/mariadb/10.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb/10.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-1" + "version": "1.4.6-4" }, "mariadb": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.5.22-1" + "version": "10.5.23-1" } } \ No newline at end of file diff --git a/bitnami/mariadb/10.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mariadb/10.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mariadb/10.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mariadb/10.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mariadb/10.5/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mariadb/10.5/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mariadb/10.5/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mariadb/10.5/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mariadb/10.5/debian-11/tags-info.yaml b/bitnami/mariadb/10.5/debian-11/tags-info.yaml index 8d6dea3a23bba..20930484f8f03 100644 --- a/bitnami/mariadb/10.5/debian-11/tags-info.yaml +++ b/bitnami/mariadb/10.5/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "10.5" - 10.5-debian-11 -- 10.5.22 +- 10.5.23 diff --git a/bitnami/mariadb/10.6/debian-11/Dockerfile b/bitnami/mariadb/10.6/debian-11/Dockerfile index 7a74c6da184fe..97ef91a19c0bb 100644 --- a/bitnami/mariadb/10.6/debian-11/Dockerfile +++ b/bitnami/mariadb/10.6/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T17:13:18Z" \ + org.opencontainers.image.created="2023-12-18T20:19:34Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.6.15-debian-11-r49" \ + org.opencontainers.image.ref.name="10.6.16-debian-11-r2" \ org.opencontainers.image.title="mariadb" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="10.6.15" + org.opencontainers.image.version="10.6.16" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu67 liblzma5 libncurses6 libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 procps psmisc zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ini-file-1.4.6-1-linux-${OS_ARCH}-debian-11" \ - "mariadb-10.6.15-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "ini-file-1.4.6-4-linux-${OS_ARCH}-debian-11" \ + "mariadb-10.6.16-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN mkdir /docker-entrypoint-initdb.d COPY rootfs / RUN /opt/bitnami/scripts/mariadb/postunpack.sh -ENV APP_VERSION="10.6.15" \ +ENV APP_VERSION="10.6.16" \ BITNAMI_APP_NAME="mariadb" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/common/sbin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH" diff --git a/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 64589dea8f710..d68b744735b3c 100644 --- a/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-1" + "version": "1.4.6-4" }, "mariadb": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.6.15-1" + "version": "10.6.16-2" } } \ No newline at end of file diff --git a/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mariadb/10.6/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mariadb/10.6/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mariadb/10.6/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mariadb/10.6/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mariadb/10.6/debian-11/tags-info.yaml b/bitnami/mariadb/10.6/debian-11/tags-info.yaml index d1dc68c85a8a1..c123bd2782486 100644 --- a/bitnami/mariadb/10.6/debian-11/tags-info.yaml +++ b/bitnami/mariadb/10.6/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "10.6" - 10.6-debian-11 -- 10.6.15 +- 10.6.16 diff --git a/bitnami/mariadb/11.0/debian-11/Dockerfile b/bitnami/mariadb/11.0/debian-11/Dockerfile index 7e6c8afa7964c..e1fe6c34eaeb4 100644 --- a/bitnami/mariadb/11.0/debian-11/Dockerfile +++ b/bitnami/mariadb/11.0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T17:15:39Z" \ + org.opencontainers.image.created="2023-12-18T20:39:57Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="11.0.3-debian-11-r49" \ + org.opencontainers.image.ref.name="11.0.4-debian-11-r2" \ org.opencontainers.image.title="mariadb" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="11.0.3" + org.opencontainers.image.version="11.0.4" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu67 liblzma5 libncurses6 libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 procps psmisc zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ini-file-1.4.6-1-linux-${OS_ARCH}-debian-11" \ - "mariadb-11.0.3-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "ini-file-1.4.6-4-linux-${OS_ARCH}-debian-11" \ + "mariadb-11.0.4-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN mkdir /docker-entrypoint-initdb.d COPY rootfs / RUN /opt/bitnami/scripts/mariadb/postunpack.sh -ENV APP_VERSION="11.0.3" \ +ENV APP_VERSION="11.0.4" \ BITNAMI_APP_NAME="mariadb" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/common/sbin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH" diff --git a/bitnami/mariadb/11.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb/11.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index ac80d394249cb..35340c2cb6b45 100644 --- a/bitnami/mariadb/11.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb/11.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-1" + "version": "1.4.6-4" }, "mariadb": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.0.3-1" + "version": "11.0.4-2" } } \ No newline at end of file diff --git a/bitnami/mariadb/11.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mariadb/11.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mariadb/11.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mariadb/11.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mariadb/11.0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mariadb/11.0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mariadb/11.0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mariadb/11.0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mariadb/11.0/debian-11/tags-info.yaml b/bitnami/mariadb/11.0/debian-11/tags-info.yaml index 552c9b4e116b0..e2d3847fda090 100644 --- a/bitnami/mariadb/11.0/debian-11/tags-info.yaml +++ b/bitnami/mariadb/11.0/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "11.0" - 11.0-debian-11 -- 11.0.3 +- 11.0.4 diff --git a/bitnami/mariadb/11.1/debian-11/Dockerfile b/bitnami/mariadb/11.1/debian-11/Dockerfile index cc71ab44045ed..18e682b34c6d8 100644 --- a/bitnami/mariadb/11.1/debian-11/Dockerfile +++ b/bitnami/mariadb/11.1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-20T18:54:31Z" \ + org.opencontainers.image.created="2023-12-18T21:06:20Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="11.1.2-debian-11-r1" \ + org.opencontainers.image.ref.name="11.1.3-debian-11-r2" \ org.opencontainers.image.title="mariadb" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="11.1.2" + org.opencontainers.image.version="11.1.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu67 liblzma5 libncurses6 libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 procps psmisc zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ini-file-1.4.6-2-linux-${OS_ARCH}-debian-11" \ - "mariadb-11.1.2-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "ini-file-1.4.6-4-linux-${OS_ARCH}-debian-11" \ + "mariadb-11.1.3-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN mkdir /docker-entrypoint-initdb.d COPY rootfs / RUN /opt/bitnami/scripts/mariadb/postunpack.sh -ENV APP_VERSION="11.1.2" \ +ENV APP_VERSION="11.1.3" \ BITNAMI_APP_NAME="mariadb" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/common/sbin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH" diff --git a/bitnami/mariadb/11.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb/11.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 6660fe65b4345..416c011e00a53 100644 --- a/bitnami/mariadb/11.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb/11.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-2" + "version": "1.4.6-4" }, "mariadb": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.1.2-1" + "version": "11.1.3-1" } } \ No newline at end of file diff --git a/bitnami/mariadb/11.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mariadb/11.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mariadb/11.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mariadb/11.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mariadb/11.1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mariadb/11.1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mariadb/11.1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mariadb/11.1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mariadb/11.1/debian-11/tags-info.yaml b/bitnami/mariadb/11.1/debian-11/tags-info.yaml index 261dfa85973e0..d2033f81afe7e 100644 --- a/bitnami/mariadb/11.1/debian-11/tags-info.yaml +++ b/bitnami/mariadb/11.1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "11.1" - 11.1-debian-11 -- 11.1.2 +- 11.1.3 - latest diff --git a/bitnami/mariadb/11.2/debian-11/Dockerfile b/bitnami/mariadb/11.2/debian-11/Dockerfile new file mode 100644 index 0000000000000..00db02a902d13 --- /dev/null +++ b/bitnami/mariadb/11.2/debian-11/Dockerfile @@ -0,0 +1,57 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +FROM docker.io/bitnami/minideb:bullseye + +ARG TARGETARCH + +LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-12-19T07:45:58Z" \ + org.opencontainers.image.description="Application packaged by VMware, Inc" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.ref.name="11.2.2-debian-11-r0" \ + org.opencontainers.image.title="mariadb" \ + org.opencontainers.image.vendor="VMware, Inc." \ + org.opencontainers.image.version="11.2.2" + +ENV HOME="/" \ + OS_ARCH="${TARGETARCH:-amd64}" \ + OS_FLAVOUR="debian-11" \ + OS_NAME="linux" + +COPY prebuildfs / +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] +# Install required system packages and dependencies +RUN install_packages ca-certificates curl libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu67 liblzma5 libncurses6 libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 procps psmisc zlib1g +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ + COMPONENTS=( \ + "ini-file-1.4.6-4-linux-${OS_ARCH}-debian-11" \ + "mariadb-11.2.2-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ + for COMPONENT in "${COMPONENTS[@]}"; do \ + if [ ! -f "${COMPONENT}.tar.gz" ]; then \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ + rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ + done +RUN apt-get autoremove --purge -y curl && \ + apt-get update && apt-get upgrade -y && \ + apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives +RUN chmod g+rwX /opt/bitnami +RUN mkdir /docker-entrypoint-initdb.d + +COPY rootfs / +RUN /opt/bitnami/scripts/mariadb/postunpack.sh +ENV APP_VERSION="11.2.2" \ + BITNAMI_APP_NAME="mariadb" \ + PATH="/opt/bitnami/common/bin:/opt/bitnami/common/sbin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH" + +EXPOSE 3306 + +USER 1001 +ENTRYPOINT [ "/opt/bitnami/scripts/mariadb/entrypoint.sh" ] +CMD [ "/opt/bitnami/scripts/mariadb/run.sh" ] diff --git a/bitnami/mariadb/11.2/debian-11/docker-compose.yml b/bitnami/mariadb/11.2/debian-11/docker-compose.yml new file mode 100644 index 0000000000000..b25ea307d7f98 --- /dev/null +++ b/bitnami/mariadb/11.2/debian-11/docker-compose.yml @@ -0,0 +1,24 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +version: '2.1' + +services: + mariadb: + image: docker.io/bitnami/mariadb:11.2 + ports: + - '3306:3306' + volumes: + - 'mariadb_data:/bitnami/mariadb' + environment: + # ALLOW_EMPTY_PASSWORD is recommended only for development. + - ALLOW_EMPTY_PASSWORD=yes + healthcheck: + test: ['CMD', '/opt/bitnami/scripts/mariadb/healthcheck.sh'] + interval: 15s + timeout: 5s + retries: 6 + +volumes: + mariadb_data: + driver: local diff --git a/bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json new file mode 100644 index 0000000000000..5bc624169bf82 --- /dev/null +++ b/bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -0,0 +1,14 @@ +{ + "ini-file": { + "arch": "amd64", + "distro": "debian-11", + "type": "NAMI", + "version": "1.4.6-4" + }, + "mariadb": { + "arch": "amd64", + "distro": "debian-11", + "type": "NAMI", + "version": "11.2.2-0" + } +} \ No newline at end of file diff --git a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt similarity index 100% rename from bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt rename to bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt diff --git a/bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh similarity index 76% rename from bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh rename to bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh rename to bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh diff --git a/bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh rename to bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh diff --git a/bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh b/bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh rename to bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh diff --git a/bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh rename to bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh diff --git a/bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh rename to bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh diff --git a/bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh rename to bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh diff --git a/bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh rename to bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh diff --git a/bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh rename to bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh diff --git a/bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh rename to bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh diff --git a/bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh rename to bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh diff --git a/bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh rename to bitnami/mariadb/11.2/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh diff --git a/bitnami/postgresql/11/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/mariadb/11.2/debian-11/prebuildfs/usr/sbin/install_packages similarity index 100% rename from bitnami/postgresql/11/debian-11/prebuildfs/usr/sbin/install_packages rename to bitnami/mariadb/11.2/debian-11/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/mariadb/11.2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mariadb/11.2/debian-11/prebuildfs/usr/sbin/run-script new file mode 100755 index 0000000000000..b7a5bf1e50bff --- /dev/null +++ b/bitnami/mariadb/11.2/debian-11/prebuildfs/usr/sbin/run-script @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -u + +if [ $# -eq 0 ]; then + >&2 echo "No arguments provided" + exit 1 +fi + +script=$1 +exit_code="${2:-96}" +fail_if_not_present="${3:-y}" + +if test -f "$script"; then + sh $script + + if [ $? -ne 0 ]; then + exit $((exit_code)) + fi +elif [ "$fail_if_not_present" = "y" ]; then + >&2 echo "script not found: $script" + exit 127 +fi diff --git a/bitnami/mariadb/11.2/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh b/bitnami/mariadb/11.2/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh new file mode 100644 index 0000000000000..192984bec0a0c --- /dev/null +++ b/bitnami/mariadb/11.2/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh @@ -0,0 +1,1371 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +# +# Bitnami MySQL library + +# shellcheck disable=SC1090,SC1091,SC2119,SC2120 + +# Load Generic Libraries +. /opt/bitnami/scripts/libfile.sh +. /opt/bitnami/scripts/liblog.sh +. /opt/bitnami/scripts/libfs.sh +. /opt/bitnami/scripts/libos.sh +. /opt/bitnami/scripts/libservice.sh +. /opt/bitnami/scripts/libvalidations.sh +. /opt/bitnami/scripts/libversion.sh + +######################## +# Configure database extra start flags +# Globals: +# DB_* +# Arguments: +# None +# Returns: +# Array with extra flags to use +######################### +mysql_extra_flags() { + local randNumber + local -a dbExtraFlags=() + # shellcheck disable=SC2153 + read -r -a userExtraFlags <<< "$DB_EXTRA_FLAGS" + + if [[ -n "$DB_REPLICATION_MODE" ]]; then + randNumber="$(head /dev/urandom | tr -dc 0-9 | head -c 3 ; echo '')" + dbExtraFlags+=("--server-id=$randNumber" "--binlog-format=ROW" "--log-bin=mysql-bin" "--sync-binlog=1") + if [[ "$DB_REPLICATION_MODE" = "slave" ]]; then + dbExtraFlags+=("--relay-log=mysql-relay-bin" "--log-slave-updates=1" "--read-only=1") + if [[ "$DB_FLAVOR" = "mysql" ]]; then + dbExtraFlags+=("--master-info-repository=TABLE" "--relay-log-info-repository=TABLE") + fi + elif [[ "$DB_REPLICATION_MODE" = "master" ]]; then + dbExtraFlags+=("--innodb_flush_log_at_trx_commit=1") + fi + fi + + [[ "${#userExtraFlags[@]}" -eq 0 ]] || dbExtraFlags+=("${userExtraFlags[@]}") + + echo "${dbExtraFlags[@]:-}" +} + +######################## +# Validate settings in MYSQL_*/MARIADB_* environment variables +# Globals: +# DB_* +# Arguments: +# None +# Returns: +# None +######################### +mysql_validate() { + info "Validating settings in MYSQL_*/MARIADB_* env vars" + local error_code=0 + + # Auxiliary functions + print_validation_error() { + error "$1" + error_code=1 + } + + empty_password_enabled_warn() { + warn "You set the environment variable ALLOW_EMPTY_PASSWORD=${ALLOW_EMPTY_PASSWORD}. For safety reasons, do not use this flag in a production environment." + } + empty_password_error() { + print_validation_error "The $1 environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow the container to be started with blank passwords. This is recommended only for development." + } + backslash_password_error() { + print_validation_error "The password cannot contain backslashes ('\'). Set the environment variable $1 with no backslashes (more info at https://dev.mysql.com/doc/refman/8.0/en/string-comparison-functions.html)" + } + + if [[ -n "$DB_REPLICATION_MODE" ]]; then + if [[ "$DB_REPLICATION_MODE" = "master" ]]; then + if is_boolean_yes "$ALLOW_EMPTY_PASSWORD"; then + empty_password_enabled_warn + else + if [[ -n "$DB_REPLICATION_USER" ]] && [[ -z "$DB_REPLICATION_PASSWORD" ]]; then + empty_password_error "$(get_env_var REPLICATION_PASSWORD)" + fi + if [[ -z "$DB_ROOT_PASSWORD" ]]; then + empty_password_error "$(get_env_var ROOT_PASSWORD)" + fi + if (( ${#DB_ROOT_PASSWORD} > 32 )); then + print_validation_error "The password can not be longer than 32 characters. Set the environment variable $(get_env_var ROOT_PASSWORD) with a shorter value (currently ${#DB_ROOT_PASSWORD} characters)" + fi + if [[ -n "$DB_USER" ]] && [[ -z "$DB_PASSWORD" ]]; then + empty_password_error "$(get_env_var PASSWORD)" + fi + fi + elif [[ "$DB_REPLICATION_MODE" = "slave" ]]; then + if [[ -z "$DB_MASTER_HOST" ]]; then + print_validation_error "Slave replication mode chosen without setting the environment variable $(get_env_var MASTER_HOST). Use it to indicate where the Master node is running" + fi + else + print_validation_error "Invalid replication mode. Available options are 'master/slave'" + fi + else + if is_boolean_yes "$ALLOW_EMPTY_PASSWORD"; then + empty_password_enabled_warn + else + if [[ -z "$DB_ROOT_PASSWORD" ]]; then + empty_password_error "$(get_env_var ROOT_PASSWORD)" + fi + if [[ -n "$DB_USER" ]] && [[ -z "$DB_PASSWORD" ]]; then + empty_password_error "$(get_env_var PASSWORD)" + fi + fi + fi + if [[ "${DB_ROOT_PASSWORD:-}" = *\\* ]]; then + backslash_password_error "$(get_env_var ROOT_PASSWORD)" + fi + if [[ -n "$DB_USER" ]] && [[ "$DB_USER" = "root" ]]; then + print_validation_error "root user is already created in the database and you can't use it as username for user creation." + fi + if [[ "${DB_PASSWORD:-}" = *\\* ]]; then + backslash_password_error "$(get_env_var PASSWORD)" + fi + if [[ "${DB_REPLICATION_PASSWORD:-}" = *\\* ]]; then + backslash_password_error "$(get_env_var REPLICATION_PASSWORD)" + fi + + collation_env_var="$(get_env_var COLLATION)" + is_empty_value "${!collation_env_var:-}" || warn "The usage of '$(get_env_var COLLATION)' is deprecated and will soon be removed. Use '$(get_env_var COLLATE)' instead." + + [[ "$error_code" -eq 0 ]] || exit "$error_code" +} + +######################## +# Creates MySQL/MariaDB configuration file +# Globals: +# DB_* +# Arguments: +# None +# Returns: +# None +######################### +mysql_create_default_config() { + debug "Creating main configuration file" + cat > "$DB_CONF_FILE" < "${DB_CONF_DIR}/bitnami/my_custom.cnf" + if ! grep --silent "!include ${DB_CONF_DIR}/bitnami/my_custom.cnf" "${DB_CONF_FILE}"; then + echo "!include ${DB_CONF_DIR}/bitnami/my_custom.cnf" >> "${DB_CONF_FILE}" + fi + else + warn "Could not inject custom configuration for the ${DB_FLAVOR} configuration file '$DB_CONF_DIR/bitnami/my_custom.cnf' because it is not writable." + fi + fi + + if [[ -e "$DB_DATA_DIR/mysql" ]]; then + info "Using persisted data" + # mysql_upgrade requires the server to be running + [[ -n "$(get_master_env_var_value ROOT_PASSWORD)" ]] && export ROOT_AUTH_ENABLED="yes" + # https://dev.mysql.com/doc/refman/8.0/en/replication-upgrade.html + mysql_upgrade + else + debug "Cleaning data directory to ensure successfully initialization" + rm -rf "${DB_DATA_DIR:?}"/* + info "Installing database" + mysql_install_db + mysql_start_bg + wait_for_mysql_access + # we delete existing users and create new ones with stricter access + # commands can still be executed until we restart or run 'flush privileges' + info "Configuring authentication" + mysql_execute "mysql" <=8 depends on this command + # users are not configured on slave nodes during initialization due to --skip-slave-start + wait_for_mysql + + # Special configuration flag for system with slow disks that could take more time + # in initializing + if [[ -n "${DB_INIT_SLEEP_TIME}" ]]; then + debug "Sleeping ${DB_INIT_SLEEP_TIME} seconds before continuing with initialization" + sleep "${DB_INIT_SLEEP_TIME}" + fi +} + +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +# +# Library for mysql common + +######################## +# Extract mysql version from version string +# Globals: +# DB_* +# Arguments: +# None +# Returns: +# Version string +######################### +mysql_get_version() { + local ver_string + local -a ver_split + + ver_string=$("${DB_BIN_DIR}/mysql" "--version") + read -r -a ver_split <<< "$ver_string" + + if [[ "$ver_string" = *" Distrib "* ]]; then + echo "${ver_split[4]::-1}" + else + echo "${ver_split[2]}" + fi +} + +######################## +# Gets an environment variable name based on the suffix +# Globals: +# DB_FLAVOR +# Arguments: +# $1 - environment variable suffix +# Returns: +# environment variable name +######################### +get_env_var() { + local -r id="${1:?id is required}" + local -r prefix="${DB_FLAVOR//-/_}" + echo "${prefix^^}_${id}" +} + +######################## +# Gets an environment variable value for the master node and based on the suffix +# Arguments: +# $1 - environment variable suffix +# Returns: +# environment variable value +######################### +get_master_env_var_value() { + local envVar + + PREFIX="" + [[ "${DB_REPLICATION_MODE:-}" = "slave" ]] && PREFIX="MASTER_" + envVar="$(get_env_var "${PREFIX}${1}_FILE")" + if [[ -f "${!envVar:-}" ]]; then + echo "$(< "${!envVar}")" + else + envVar="$(get_env_var "${PREFIX}${1}")" + echo "${!envVar:-}" + fi +} + +######################## +# Execute an arbitrary query/queries against the running MySQL/MariaDB service and print to stdout +# Stdin: +# Query/queries to execute +# Globals: +# BITNAMI_DEBUG +# DB_* +# Arguments: +# $1 - Database where to run the queries +# $2 - User to run queries +# $3 - Password +# $4 - Extra MySQL CLI options +# Returns: +# None +mysql_execute_print_output() { + local -r db="${1:-}" + local -r user="${2:-root}" + local -r pass="${3:-}" + local -a opts extra_opts + read -r -a opts <<< "${@:4}" + read -r -a extra_opts <<< "$(mysql_client_extra_opts)" + + # Process mysql CLI arguments + local -a args=() + if [[ -f "$DB_CONF_FILE" ]]; then + args+=("--defaults-file=${DB_CONF_FILE}") + fi + args+=("-N" "-u" "$user") + [[ -n "$db" ]] && args+=("$db") + [[ -n "$pass" ]] && args+=("-p$pass") + [[ "${#opts[@]}" -gt 0 ]] && args+=("${opts[@]}") + [[ "${#extra_opts[@]}" -gt 0 ]] && args+=("${extra_opts[@]}") + + # Obtain the command specified via stdin + if [[ "${BITNAMI_DEBUG:-false}" = true ]]; then + local mysql_cmd + mysql_cmd="$(> "$custom_conf_file" + cat "$old_custom_conf_file" >> "$custom_conf_file" + fi + if am_i_root; then + [[ -e "$DB_VOLUME_DIR/.initialized" ]] && rm "$DB_VOLUME_DIR/.initialized" + rm -rf "$DB_VOLUME_DIR/conf" + else + warn "Old custom configuration migrated, please manually remove the 'conf' directory from the volume use to persist data" + fi +} + +######################## +# Ensure a db user exists with the given password for the '%' host +# Globals: +# DB_* +# Flags: +# -p|--password - database password +# -u|--user - database user +# --auth-plugin - authentication plugin +# --use-ldap - authenticate user via LDAP +# --host - database host +# --port - database host +# Arguments: +# $1 - database user +# Returns: +# None +######################### +mysql_ensure_user_exists() { + local -r user="${1:?user is required}" + local password="" + local auth_plugin="" + local use_ldap="no" + local hosts + local auth_string="" + # For accessing an external database + local db_host="" + local db_port="" + + # Validate arguments + shift 1 + while [ "$#" -gt 0 ]; do + case "$1" in + -p|--password) + shift + password="${1:?missing database password}" + ;; + --auth-plugin) + shift + auth_plugin="${1:?missing authentication plugin}" + ;; + --use-ldap) + use_ldap="yes" + ;; + --host) + shift + db_host="${1:?missing database host}" + ;; + --port) + shift + db_port="${1:?missing database port}" + ;; + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; + esac + shift + done + if is_boolean_yes "$use_ldap"; then + auth_string="identified via pam using '$DB_FLAVOR'" + elif [[ -n "$password" ]]; then + if [[ -n "$auth_plugin" ]]; then + auth_string="identified with $auth_plugin by '$password'" + else + auth_string="identified by '$password'" + fi + fi + debug "creating database user \'$user\'" + + local -a mysql_execute_cmd=("mysql_execute") + local -a mysql_execute_print_output_cmd=("mysql_execute_print_output") + if [[ -n "$db_host" && -n "$db_port" ]]; then + mysql_execute_cmd=("mysql_remote_execute" "$db_host" "$db_port") + mysql_execute_print_output_cmd=("mysql_remote_execute_print_output" "$db_host" "$db_port") + fi + + local mysql_create_user_cmd + [[ "$DB_FLAVOR" = "mariadb" ]] && mysql_create_user_cmd="create or replace user" || mysql_create_user_cmd="create user if not exists" + "${mysql_execute_cmd[@]}" "mysql" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" <=10.4, the mysql.user table was replaced with a view: https://mariadb.com/kb/en/mysqluser-table/ + # Views have a definer user, in this case set to 'root', which needs to exist for the view to work + # In MySQL, to avoid issues when renaming the root user, they use the 'mysql.sys' user as a definer: https://dev.mysql.com/doc/refman/5.7/en/sys-schema.html + # However, for MariaDB that is not the case, so when the 'root' user is renamed the 'mysql.user' table stops working and the view needs to be fixed + if [[ "$user" != "root" && ! "$(mysql_get_version)" =~ ^10.[0123]. ]]; then + alter_view_str="$(mysql_execute_print_output "mysql" "$user" "$password" "-s" <&2 + return 1 + ;; + esac + shift + done + + local -a mysql_execute_cmd=("mysql_execute") + [[ -n "$db_host" && -n "$db_port" ]] && mysql_execute_cmd=("mysql_remote_execute" "$db_host" "$db_port") + + local -a create_database_args=() + [[ -n "$character_set" ]] && create_database_args+=("character set = '${character_set}'") + [[ -n "$collate" ]] && create_database_args+=("collate = '${collate}'") + + debug "Creating database $database" + "${mysql_execute_cmd[@]}" "mysql" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" <&2 + return 1 + ;; + esac + shift + done + + local -a flags=("$user") + [[ -n "$db_host" ]] && flags+=("--host" "${db_host}") + [[ -n "$db_port" ]] && flags+=("--port" "${db_port}") + if is_boolean_yes "$use_ldap"; then + flags+=("--use-ldap") + elif [[ -n "$password" ]]; then + flags+=("-p" "$password") + [[ -n "$auth_plugin" ]] && flags=("${flags[@]}" "--auth-plugin" "$auth_plugin") + fi + mysql_ensure_user_exists "${flags[@]}" +} + +######################## +# Optionally create the given database, and then optionally give a user +# full privileges on the database. +# Flags: +# -u|--user - database user +# --character-set - character set +# --collation - collation +# --host - database host +# --port - database port +# Arguments: +# $1 - database name +# Returns: +# None +######################### +mysql_ensure_optional_database_exists() { + local -r database="${1:?database is missing}" + local character_set="" + local collate="" + local user="" + local privileges="" + # For accessing an external database + local db_host="" + local db_port="" + + # Validate arguments + shift 1 + while [ "$#" -gt 0 ]; do + case "$1" in + --character-set) + shift + character_set="${1:?missing character set}" + ;; + --collate) + shift + collate="${1:?missing collate}" + ;; + -u|--user) + shift + user="${1:?missing database user}" + ;; + --host) + shift + db_host="${1:?missing database host}" + ;; + --port) + shift + db_port="${1:?missing database port}" + ;; + --privileges) + shift + privileges="${1:?missing privileges}" + ;; + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; + esac + shift + done + + local -a flags=("$database") + [[ -n "$character_set" ]] && flags+=("--character-set" "$character_set") + [[ -n "$collate" ]] && flags+=("--collate" "$collate") + [[ -n "$db_host" ]] && flags+=("--host" "$db_host") + [[ -n "$db_port" ]] && flags+=("--port" "$db_port") + mysql_ensure_database_exists "${flags[@]}" + + if [[ -n "$user" ]]; then + mysql_ensure_user_has_database_privileges "$user" "$database" "$privileges" "$db_host" "$db_port" + fi +} + +######################## +# Add or modify an entry in the MySQL configuration file ("$DB_CONF_FILE") +# Globals: +# DB_* +# Arguments: +# $1 - MySQL variable name +# $2 - Value to assign to the MySQL variable +# $3 - Section in the MySQL configuration file the key is located (default: mysqld) +# $4 - Configuration file (default: "$BD_CONF_FILE") +# Returns: +# None +######################### +mysql_conf_set() { + local -r key="${1:?key missing}" + local -r value="${2:?value missing}" + read -r -a sections <<<"${3:-mysqld}" + local -r ignore_inline_comments="${4:-no}" + local -r file="${5:-"$DB_CONF_FILE"}" + info "Setting ${key} option" + debug "Setting ${key} to '${value}' in ${DB_FLAVOR} configuration file ${file}" + # Check if the configuration exists in the file + for section in "${sections[@]}"; do + if is_boolean_yes "$ignore_inline_comments"; then + ini-file set --ignore-inline-comments --section "$section" --key "$key" --value "$value" "$file" + else + ini-file set --section "$section" --key "$key" --value "$value" "$file" + fi + done +} + +######################## +# Update MySQL/MariaDB configuration file with user custom inputs +# Globals: +# DB_* +# Arguments: +# None +# Returns: +# None +######################### +mysql_update_custom_config() { + # Persisted configuration files from old versions + ! is_dir_empty "$DB_VOLUME_DIR" && [[ -d "$DB_VOLUME_DIR/conf" ]] && mysql_migrate_old_configuration + + # User injected custom configuration + if [[ -f "$DB_CONF_DIR/my_custom.cnf" ]]; then + debug "Injecting custom configuration from my_custom.conf" + cat "$DB_CONF_DIR/my_custom.cnf" > "$DB_CONF_DIR/bitnami/my_custom.cnf" + fi + + ! is_empty_value "$DB_USER" && mysql_conf_set "user" "$DB_USER" "mysqladmin" + ! is_empty_value "$DB_PORT_NUMBER" && mysql_conf_set "port" "$DB_PORT_NUMBER" "mysqld client manager" + ! is_empty_value "$DB_CHARACTER_SET" && mysql_conf_set "character_set_server" "$DB_CHARACTER_SET" + ! is_empty_value "$DB_COLLATE" && mysql_conf_set "collation_server" "$DB_COLLATE" + ! is_empty_value "$DB_BIND_ADDRESS" && mysql_conf_set "bind_address" "$DB_BIND_ADDRESS" + ! is_empty_value "$DB_AUTHENTICATION_PLUGIN" && mysql_conf_set "default_authentication_plugin" "$DB_AUTHENTICATION_PLUGIN" + ! is_empty_value "$DB_SQL_MODE" && mysql_conf_set "sql_mode" "$DB_SQL_MODE" + ! is_empty_value "$DB_ENABLE_SLOW_QUERY" && mysql_conf_set "slow_query_log" "$DB_ENABLE_SLOW_QUERY" + ! is_empty_value "$DB_LONG_QUERY_TIME" && mysql_conf_set "long_query_time" "$DB_LONG_QUERY_TIME" + + # Avoid exit code of previous commands to affect the result of this function + true +} + +######################## +# Find the path to the libjemalloc library file +# Globals: +# None +# Arguments: +# None +# Returns: +# Path to a libjemalloc shared object file +######################### +find_jemalloc_lib() { + local -a locations=( "/usr/lib" "/usr/lib64" ) + local -r pattern='libjemalloc.so.[0-9]' + local path + for dir in "${locations[@]}"; do + # Find the first element matching the pattern and quit + [[ ! -d "$dir" ]] && continue + path="$(find "$dir" -name "$pattern" -print -quit)" + [[ -n "$path" ]] && break + done + echo "${path:-}" +} + +######################## +# Execute a reliable health check against the current mysql instance +# Globals: +# DB_ROOT_PASSWORD, DB_MASTER_ROOT_PASSWORD +# Arguments: +# None +# Returns: +# mysqladmin output +######################### +mysql_healthcheck() { + local args=("-uroot" "-h0.0.0.0") + local root_password + + root_password="$(get_master_env_var_value ROOT_PASSWORD)" + if [[ -n "$root_password" ]]; then + args+=("-p${root_password}") + fi + + mysqladmin "${args[@]}" ping && mysqladmin "${args[@]}" status +} + +######################## +# Prints flavor of 'mysql' client (useful to determine proper CLI flags that can be used) +# Globals: +# DB_* +# Arguments: +# None +# Returns: +# mysql client flavor +######################### +mysql_client_flavor() { + if "${DB_BIN_DIR}/mysql" "--version" 2>&1 | grep -q MariaDB; then + echo "mariadb" + else + echo "mysql" + fi +} + +######################## +# Prints extra options for MySQL client calls (i.e. SSL options) +# Globals: +# DB_* +# Arguments: +# None +# Returns: +# List of options to pass to "mysql" CLI +######################### +mysql_client_extra_opts() { + # Helper to get the proper value for the MySQL client environment variable + mysql_client_env_value() { + local env_name="MYSQL_CLIENT_${1:?missing name}" + if [[ -n "${!env_name:-}" ]]; then + echo "${!env_name:-}" + else + env_name="DB_CLIENT_${1}" + echo "${!env_name:-}" + fi + } + local -a opts=() + local key value + if is_boolean_yes "${DB_ENABLE_SSL:-no}"; then + if [[ "$(mysql_client_flavor)" = "mysql" ]]; then + opts+=("--ssl-mode=REQUIRED") + else + opts+=("--ssl=TRUE") + fi + # Add "--ssl-ca", "--ssl-key" and "--ssl-cert" options if the env vars are defined + for key in ca key cert; do + value="$(mysql_client_env_value "SSL_${key^^}_FILE")" + [[ -n "${value}" ]] && opts+=("--ssl-${key}=${value}") + done + fi + echo "${opts[@]:-}" +} diff --git a/bitnami/mariadb/11.2/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh b/bitnami/mariadb/11.2/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh new file mode 100644 index 0000000000000..23c51b1d73404 --- /dev/null +++ b/bitnami/mariadb/11.2/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh @@ -0,0 +1,173 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +# +# Environment configuration for mariadb + +# The values for all environment variables will be set in the below order of precedence +# 1. Custom environment variables defined below after Bitnami defaults +# 2. Constants defined in this file (environment variables with no default), i.e. BITNAMI_ROOT_DIR +# 3. Environment variables overridden via external files using *_FILE variables (see below) +# 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata) + +# Load logging library +# shellcheck disable=SC1090,SC1091 +. /opt/bitnami/scripts/liblog.sh + +export BITNAMI_ROOT_DIR="/opt/bitnami" +export BITNAMI_VOLUME_DIR="/bitnami" + +# Logging configuration +export MODULE="${MODULE:-mariadb}" +export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}" + +# By setting an environment variable matching *_FILE to a file path, the prefixed environment +# variable will be overridden with the value specified in that file +mariadb_env_vars=( + ALLOW_EMPTY_PASSWORD + MARIADB_AUTHENTICATION_PLUGIN + MARIADB_ROOT_USER + MARIADB_ROOT_PASSWORD + MARIADB_USER + MARIADB_PASSWORD + MARIADB_DATABASE + MARIADB_MASTER_HOST + MARIADB_MASTER_PORT_NUMBER + MARIADB_MASTER_ROOT_USER + MARIADB_MASTER_ROOT_PASSWORD + MARIADB_MASTER_DELAY + MARIADB_REPLICATION_USER + MARIADB_REPLICATION_PASSWORD + MARIADB_PORT_NUMBER + MARIADB_REPLICATION_MODE + MARIADB_EXTRA_FLAGS + MARIADB_INIT_SLEEP_TIME + MARIADB_CHARACTER_SET + MARIADB_COLLATE + MARIADB_BIND_ADDRESS + MARIADB_SQL_MODE + MARIADB_SKIP_TEST_DB + MARIADB_CLIENT_ENABLE_SSL + MARIADB_CLIENT_SSL_CA_FILE + MARIADB_CLIENT_SSL_CERT_FILE + MARIADB_CLIENT_SSL_KEY_FILE + MARIADB_CLIENT_EXTRA_FLAGS + MARIADB_STARTUP_WAIT_RETRIES + MARIADB_STARTUP_WAIT_SLEEP_TIME + MARIADB_ENABLE_SLOW_QUERY + MARIADB_LONG_QUERY_TIME + DB_ENABLE_SLOW_QUERY + DB_LONG_QUERY_TIME +) +for env_var in "${mariadb_env_vars[@]}"; do + file_env_var="${env_var}_FILE" + if [[ -n "${!file_env_var:-}" ]]; then + if [[ -r "${!file_env_var:-}" ]]; then + export "${env_var}=$(< "${!file_env_var}")" + unset "${file_env_var}" + else + warn "Skipping export of '${env_var}'. '${!file_env_var:-}' is not readable." + fi + fi +done +unset mariadb_env_vars +export DB_FLAVOR="mariadb" + +# Paths +export DB_BASE_DIR="${BITNAMI_ROOT_DIR}/mariadb" +export DB_VOLUME_DIR="${BITNAMI_VOLUME_DIR}/mariadb" +export DB_DATA_DIR="${DB_VOLUME_DIR}/data" +export DB_BIN_DIR="${DB_BASE_DIR}/bin" +export DB_SBIN_DIR="${DB_BASE_DIR}/sbin" +export DB_CONF_DIR="${DB_BASE_DIR}/conf" +export DB_LOGS_DIR="${DB_BASE_DIR}/logs" +export DB_TMP_DIR="${DB_BASE_DIR}/tmp" +export DB_CONF_FILE="${DB_CONF_DIR}/my.cnf" +export DB_PID_FILE="${DB_TMP_DIR}/mysqld.pid" +export DB_SOCKET_FILE="${DB_TMP_DIR}/mysql.sock" +export PATH="${DB_SBIN_DIR}:${DB_BIN_DIR}:/opt/bitnami/common/bin:${PATH}" + +# System users (when running with a privileged user) +export DB_DAEMON_USER="mysql" +export DB_DAEMON_GROUP="mysql" + +# Default configuration (build-time) +export MARIADB_DEFAULT_PORT_NUMBER="3306" +export DB_DEFAULT_PORT_NUMBER="$MARIADB_DEFAULT_PORT_NUMBER" # only used at build time +export MARIADB_DEFAULT_CHARACTER_SET="utf8mb4" +export DB_DEFAULT_CHARACTER_SET="$MARIADB_DEFAULT_CHARACTER_SET" # only used at build time +export MARIADB_DEFAULT_BIND_ADDRESS="0.0.0.0" +export DB_DEFAULT_BIND_ADDRESS="$MARIADB_DEFAULT_BIND_ADDRESS" # only used at build time + +# MariaDB authentication. +export ALLOW_EMPTY_PASSWORD="${ALLOW_EMPTY_PASSWORD:-no}" +export MARIADB_AUTHENTICATION_PLUGIN="${MARIADB_AUTHENTICATION_PLUGIN:-}" +export DB_AUTHENTICATION_PLUGIN="$MARIADB_AUTHENTICATION_PLUGIN" +export MARIADB_ROOT_USER="${MARIADB_ROOT_USER:-root}" +export DB_ROOT_USER="$MARIADB_ROOT_USER" # only used during the first initialization +export MARIADB_ROOT_PASSWORD="${MARIADB_ROOT_PASSWORD:-}" +export DB_ROOT_PASSWORD="$MARIADB_ROOT_PASSWORD" # only used during the first initialization +export MARIADB_USER="${MARIADB_USER:-}" +export DB_USER="$MARIADB_USER" # only used during the first initialization +export MARIADB_PASSWORD="${MARIADB_PASSWORD:-}" +export DB_PASSWORD="$MARIADB_PASSWORD" # only used during the first initialization +export MARIADB_DATABASE="${MARIADB_DATABASE:-}" +export DB_DATABASE="$MARIADB_DATABASE" # only used during the first initialization +export MARIADB_MASTER_HOST="${MARIADB_MASTER_HOST:-}" +export DB_MASTER_HOST="$MARIADB_MASTER_HOST" # only used during the first initialization +export MARIADB_MASTER_PORT_NUMBER="${MARIADB_MASTER_PORT_NUMBER:-3306}" +export DB_MASTER_PORT_NUMBER="$MARIADB_MASTER_PORT_NUMBER" # only used during the first initialization +export MARIADB_MASTER_ROOT_USER="${MARIADB_MASTER_ROOT_USER:-root}" +export DB_MASTER_ROOT_USER="$MARIADB_MASTER_ROOT_USER" # only used during the first initialization +export MARIADB_MASTER_ROOT_PASSWORD="${MARIADB_MASTER_ROOT_PASSWORD:-}" +export DB_MASTER_ROOT_PASSWORD="$MARIADB_MASTER_ROOT_PASSWORD" # only used during the first initialization +export MARIADB_MASTER_DELAY="${MARIADB_MASTER_DELAY:-0}" +export DB_MASTER_DELAY="$MARIADB_MASTER_DELAY" # only used during the first initialization +export MARIADB_REPLICATION_USER="${MARIADB_REPLICATION_USER:-}" +export DB_REPLICATION_USER="$MARIADB_REPLICATION_USER" # only used during the first initialization +export MARIADB_REPLICATION_PASSWORD="${MARIADB_REPLICATION_PASSWORD:-}" +export DB_REPLICATION_PASSWORD="$MARIADB_REPLICATION_PASSWORD" # only used during the first initialization + +# Settings +export MARIADB_PORT_NUMBER="${MARIADB_PORT_NUMBER:-}" +export DB_PORT_NUMBER="$MARIADB_PORT_NUMBER" +export MARIADB_REPLICATION_MODE="${MARIADB_REPLICATION_MODE:-}" +export DB_REPLICATION_MODE="$MARIADB_REPLICATION_MODE" +export MARIADB_EXTRA_FLAGS="${MARIADB_EXTRA_FLAGS:-}" +export DB_EXTRA_FLAGS="$MARIADB_EXTRA_FLAGS" +export MARIADB_INIT_SLEEP_TIME="${MARIADB_INIT_SLEEP_TIME:-}" +export DB_INIT_SLEEP_TIME="$MARIADB_INIT_SLEEP_TIME" +export MARIADB_CHARACTER_SET="${MARIADB_CHARACTER_SET:-}" +export DB_CHARACTER_SET="$MARIADB_CHARACTER_SET" +# MARIADB_COLLATION is deprecated in favor of MARIADB_COLLATE +MARIADB_COLLATE="${MARIADB_COLLATE:-"${MARIADB_COLLATION:-}"}" +export MARIADB_COLLATE="${MARIADB_COLLATE:-}" +export DB_COLLATE="$MARIADB_COLLATE" +export MARIADB_BIND_ADDRESS="${MARIADB_BIND_ADDRESS:-}" +export DB_BIND_ADDRESS="$MARIADB_BIND_ADDRESS" +export MARIADB_SQL_MODE="${MARIADB_SQL_MODE:-}" +export DB_SQL_MODE="$MARIADB_SQL_MODE" +export MARIADB_SKIP_TEST_DB="${MARIADB_SKIP_TEST_DB:-no}" +export DB_SKIP_TEST_DB="$MARIADB_SKIP_TEST_DB" +export MARIADB_CLIENT_ENABLE_SSL="${MARIADB_CLIENT_ENABLE_SSL:-no}" +export DB_CLIENT_ENABLE_SSL="$MARIADB_CLIENT_ENABLE_SSL" +export MARIADB_CLIENT_SSL_CA_FILE="${MARIADB_CLIENT_SSL_CA_FILE:-}" +export DB_CLIENT_SSL_CA_FILE="$MARIADB_CLIENT_SSL_CA_FILE" +export MARIADB_CLIENT_SSL_CERT_FILE="${MARIADB_CLIENT_SSL_CERT_FILE:-}" +export DB_CLIENT_SSL_CERT_FILE="$MARIADB_CLIENT_SSL_CERT_FILE" +export MARIADB_CLIENT_SSL_KEY_FILE="${MARIADB_CLIENT_SSL_KEY_FILE:-}" +export DB_CLIENT_SSL_KEY_FILE="$MARIADB_CLIENT_SSL_KEY_FILE" +export MARIADB_CLIENT_EXTRA_FLAGS="${MARIADB_CLIENT_EXTRA_FLAGS:-no}" +export DB_CLIENT_EXTRA_FLAGS="$MARIADB_CLIENT_EXTRA_FLAGS" +export MARIADB_STARTUP_WAIT_RETRIES="${MARIADB_STARTUP_WAIT_RETRIES:-300}" +export DB_STARTUP_WAIT_RETRIES="$MARIADB_STARTUP_WAIT_RETRIES" +export MARIADB_STARTUP_WAIT_SLEEP_TIME="${MARIADB_STARTUP_WAIT_SLEEP_TIME:-2}" +export DB_STARTUP_WAIT_SLEEP_TIME="$MARIADB_STARTUP_WAIT_SLEEP_TIME" +MARIADB_ENABLE_SLOW_QUERY="${MARIADB_ENABLE_SLOW_QUERY:-"${DB_ENABLE_SLOW_QUERY:-}"}" +export MARIADB_ENABLE_SLOW_QUERY="${MARIADB_ENABLE_SLOW_QUERY:-0}" +export DB_ENABLE_SLOW_QUERY="$MARIADB_ENABLE_SLOW_QUERY" +MARIADB_LONG_QUERY_TIME="${MARIADB_LONG_QUERY_TIME:-"${DB_LONG_QUERY_TIME:-}"}" +export MARIADB_LONG_QUERY_TIME="${MARIADB_LONG_QUERY_TIME:-10.0}" +export DB_LONG_QUERY_TIME="$MARIADB_LONG_QUERY_TIME" + +# Custom environment variables may be defined below diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh b/bitnami/mariadb/11.2/debian-11/rootfs/opt/bitnami/scripts/mariadb/entrypoint.sh similarity index 51% rename from bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh rename to bitnami/mariadb/11.2/debian-11/rootfs/opt/bitnami/scripts/mariadb/entrypoint.sh index cce4b3e874a33..7da38021232ca 100755 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh +++ b/bitnami/mariadb/11.2/debian-11/rootfs/opt/bitnami/scripts/mariadb/entrypoint.sh @@ -11,17 +11,17 @@ set -o pipefail # Load libraries . /opt/bitnami/scripts/libbitnami.sh -. /opt/bitnami/scripts/libnginx.sh +. /opt/bitnami/scripts/libmariadb.sh -# Load NGINX environment variables -. /opt/bitnami/scripts/nginx-env.sh +# Load MariaDB environment variables +. /opt/bitnami/scripts/mariadb-env.sh print_welcome_page -if [[ "$1" = "/opt/bitnami/scripts/nginx/run.sh" ]]; then - info "** Starting NGINX setup **" - /opt/bitnami/scripts/nginx/setup.sh - info "** NGINX setup finished! **" +if [[ "$1" = "/opt/bitnami/scripts/mariadb/run.sh" ]]; then + info "** Starting MariaDB setup **" + /opt/bitnami/scripts/mariadb/setup.sh + info "** MariaDB setup finished! **" fi echo "" diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/restart.sh b/bitnami/mariadb/11.2/debian-11/rootfs/opt/bitnami/scripts/mariadb/healthcheck.sh similarity index 56% rename from bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/restart.sh rename to bitnami/mariadb/11.2/debian-11/rootfs/opt/bitnami/scripts/mariadb/healthcheck.sh index deaa515bac323..a42fac08c8348 100755 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/nginx/restart.sh +++ b/bitnami/mariadb/11.2/debian-11/rootfs/opt/bitnami/scripts/mariadb/healthcheck.sh @@ -10,10 +10,9 @@ set -o pipefail # set -o xtrace # Uncomment this line for debugging purposes # Load libraries -. /opt/bitnami/scripts/libnginx.sh +. /opt/bitnami/scripts/libmariadb.sh -# Load NGINX environment variables -. /opt/bitnami/scripts/nginx-env.sh +# Load MySQL environment variables +. /opt/bitnami/scripts/mariadb-env.sh -/opt/bitnami/scripts/nginx/stop.sh -/opt/bitnami/scripts/nginx/start.sh +mysql_healthcheck diff --git a/bitnami/mariadb/11.2/debian-11/rootfs/opt/bitnami/scripts/mariadb/postunpack.sh b/bitnami/mariadb/11.2/debian-11/rootfs/opt/bitnami/scripts/mariadb/postunpack.sh new file mode 100755 index 0000000000000..775f4d9124073 --- /dev/null +++ b/bitnami/mariadb/11.2/debian-11/rootfs/opt/bitnami/scripts/mariadb/postunpack.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libfs.sh +. /opt/bitnami/scripts/libmariadb.sh + +# Load MariaDB environment variables +. /opt/bitnami/scripts/mariadb-env.sh + +# Configure MariaDB options based on build-time defaults +info "Configuring default MariaDB options" +ensure_dir_exists "$DB_CONF_DIR" +mysql_create_default_config + +for dir in "$DB_TMP_DIR" "$DB_LOGS_DIR" "$DB_CONF_DIR" "${DB_CONF_DIR}/bitnami" "$DB_VOLUME_DIR" "$DB_DATA_DIR"; do + ensure_dir_exists "$dir" + chmod -R g+rwX "$dir" +done + +# Fix to avoid issues detecting plugins in mysql_install_db +ln -sf "$DB_BASE_DIR/plugin" "$DB_BASE_DIR/lib/plugin" + +# Redirect all logging to stdout +ln -sf "/proc/1/fd/1" "$DB_LOGS_DIR/mysqld.log" diff --git a/bitnami/mariadb/11.2/debian-11/rootfs/opt/bitnami/scripts/mariadb/run.sh b/bitnami/mariadb/11.2/debian-11/rootfs/opt/bitnami/scripts/mariadb/run.sh new file mode 100755 index 0000000000000..6be2d7dadf5af --- /dev/null +++ b/bitnami/mariadb/11.2/debian-11/rootfs/opt/bitnami/scripts/mariadb/run.sh @@ -0,0 +1,41 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libos.sh +. /opt/bitnami/scripts/libmariadb.sh + +# Load MariaDB environment variables +. /opt/bitnami/scripts/mariadb-env.sh + +# mysqld_safe does not allow logging to stdout/stderr, so we stick with mysqld +EXEC="${DB_SBIN_DIR}/mysqld" + +flags=("--defaults-file=${DB_CONF_DIR}/my.cnf" "--basedir=${DB_BASE_DIR}" "--datadir=${DB_DATA_DIR}" "--socket=${DB_SOCKET_FILE}") +[[ -z "${DB_PID_FILE:-}" ]] || flags+=("--pid-file=${DB_PID_FILE}") + +# Add flags specified via the 'DB_EXTRA_FLAGS' environment variable +read -r -a db_extra_flags <<< "$(mysql_extra_flags)" +[[ "${#db_extra_flags[@]}" -gt 0 ]] && flags+=("${db_extra_flags[@]}") + +# Add flags passed to this script +flags+=("$@") + +# Fix for MDEV-16183 - mysqld_safe already does this, but we are using mysqld +LD_PRELOAD="$(find_jemalloc_lib)${LD_PRELOAD:+ "$LD_PRELOAD"}" +export LD_PRELOAD + +info "** Starting MariaDB **" +if am_i_root; then + exec_as_user "$DB_DAEMON_USER" "$EXEC" "${flags[@]}" +else + exec "$EXEC" "${flags[@]}" +fi diff --git a/bitnami/mariadb/11.2/debian-11/rootfs/opt/bitnami/scripts/mariadb/setup.sh b/bitnami/mariadb/11.2/debian-11/rootfs/opt/bitnami/scripts/mariadb/setup.sh new file mode 100755 index 0000000000000..dc9c12a2bd056 --- /dev/null +++ b/bitnami/mariadb/11.2/debian-11/rootfs/opt/bitnami/scripts/mariadb/setup.sh @@ -0,0 +1,40 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libfs.sh +. /opt/bitnami/scripts/libos.sh +. /opt/bitnami/scripts/libmariadb.sh + +# Load MariaDB environment variables +. /opt/bitnami/scripts/mariadb-env.sh + +# Ensure mysql unix socket file does not exist +rm -rf "${DB_SOCKET_FILE}.lock" +# Ensure MariaDB environment variables settings are valid +mysql_validate +# Ensure MariaDB is stopped when this script ends. +trap "mysql_stop" EXIT +if am_i_root; then + # Ensure 'daemon' user exists when running as 'root' + ensure_user_exists "$DB_DAEMON_USER" --group "$DB_DAEMON_GROUP" + # Fix logging issue when running as root + chmod o+w "$(readlink /dev/stdout)" +fi +# Ensure MariaDB is initialized +mysql_initialize +# Allow running custom initialization scripts +mysql_custom_scripts 'init' +# Allow running custom start scripts +mysql_custom_scripts 'start' +# Stop MariaDB before flagging it as fully initialized. +# Relying only on the trap defined above could produce a race condition. +mysql_stop diff --git a/bitnami/mariadb/11.2/debian-11/tags-info.yaml b/bitnami/mariadb/11.2/debian-11/tags-info.yaml new file mode 100644 index 0000000000000..5058c1fe8fb6b --- /dev/null +++ b/bitnami/mariadb/11.2/debian-11/tags-info.yaml @@ -0,0 +1,5 @@ +rolling-tags: +- "11.2" +- 11.2-debian-11 +- 11.2.2 +- latest diff --git a/bitnami/mariadb/README.md b/bitnami/mariadb/README.md index 6fd09c32b30dd..b443fdb4c607e 100644 --- a/bitnami/mariadb/README.md +++ b/bitnami/mariadb/README.md @@ -1,4 +1,4 @@ -# MariaDB packaged by Bitnami +# Bitnami package for MariaDB ## What is MariaDB? @@ -27,7 +27,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/mariadb/docker-compose-replication.yml b/bitnami/mariadb/docker-compose-replication.yml index 39809d078ae32..bd160db386ff0 100644 --- a/bitnami/mariadb/docker-compose-replication.yml +++ b/bitnami/mariadb/docker-compose-replication.yml @@ -5,7 +5,7 @@ version: '2.1' services: mariadb-master: - image: docker.io/bitnami/mariadb:11.1 + image: docker.io/bitnami/mariadb:11.2 ports: - '3306' volumes: @@ -25,7 +25,7 @@ services: retries: 6 mariadb-slave: - image: docker.io/bitnami/mariadb:11.1 + image: docker.io/bitnami/mariadb:11.2 ports: - '3306' depends_on: diff --git a/bitnami/mariadb/docker-compose.yml b/bitnami/mariadb/docker-compose.yml index 9dc55733e0301..b25ea307d7f98 100644 --- a/bitnami/mariadb/docker-compose.yml +++ b/bitnami/mariadb/docker-compose.yml @@ -5,7 +5,7 @@ version: '2.1' services: mariadb: - image: docker.io/bitnami/mariadb:11.1 + image: docker.io/bitnami/mariadb:11.2 ports: - '3306:3306' volumes: diff --git a/bitnami/mastodon/4/debian-11/Dockerfile b/bitnami/mastodon/4/debian-11/Dockerfile index 25cf49050a849..cd4756a6e2358 100644 --- a/bitnami/mastodon/4/debian-11/Dockerfile +++ b/bitnami/mastodon/4/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T07:52:06Z" \ + org.opencontainers.image.created="2023-12-05T17:56:42Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.2.1-debian-11-r2" \ + org.opencontainers.image.ref.name="4.2.3-debian-11-r0" \ org.opencontainers.image.title="mastodon" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="4.2.1" + org.opencontainers.image.version="4.2.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,26 +21,26 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages acl ca-certificates curl ffmpeg file imagemagick libbsd0 libbz2-1.0 libcom-err2 libcrypt1 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu67 libidn11 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpq5 libreadline-dev libreadline8 libsasl2-2 libsqlite3-0 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libxml2 libxslt1.1 procps sqlite3 zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN install_packages acl ca-certificates curl ffmpeg file imagemagick libbrotli1 libbsd0 libbz2-1.0 libcom-err2 libcrypt1 libcurl4 libedit2 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn11 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libncursesw6 libnettle8 libnghttp2-14 libnsl2 libp11-kit0 libpcre2-8-0 libpq5 libpsl5 libreadline-dev libreadline8 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libxml2 libxslt1.1 libyaml-dev procps sqlite3 zlib1g +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "ruby-3.0.6-7-linux-${OS_ARCH}-debian-11" \ + "python-3.11.7-0-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-3-linux-${OS_ARCH}-debian-11" \ + "ruby-3.0.6-9-linux-${OS_ARCH}-debian-11" \ "redis-client-7.0.14-0-linux-${OS_ARCH}-debian-11" \ - "postgresql-client-16.0.0-0-linux-${OS_ARCH}-debian-11" \ - "node-16.20.2-1-linux-${OS_ARCH}-debian-11" \ - "mastodon-4.2.1-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "postgresql-client-16.1.0-0-linux-${OS_ARCH}-debian-11" \ + "node-18.19.0-0-linux-${OS_ARCH}-debian-11" \ + "mastodon-4.2.3-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -49,7 +49,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/mastodon/postunpack.sh -ENV APP_VERSION="4.2.1" \ +ENV APP_VERSION="4.2.3" \ BITNAMI_APP_NAME="mastodon" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/common/bin:/opt/bitnami/ruby/bin:/opt/bitnami/redis/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/node/bin:/opt/bitnami/mastodon/bin:$PATH" diff --git a/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 4f59310bebba6..da7f644f63842 100644 --- a/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,25 +3,25 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.2.1-0" + "version": "4.2.3-0" }, "node": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.20.2-1" + "version": "18.19.0-0" }, "postgresql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.0.0-0" + "version": "16.1.0-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.7-0" }, "redis-client": { "arch": "amd64", @@ -33,12 +33,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.0.6-7" + "version": "3.0.6-9" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-3" } } \ No newline at end of file diff --git a/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mastodon/4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mastodon/4/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mastodon/4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mastodon/4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mastodon/4/debian-11/tags-info.yaml b/bitnami/mastodon/4/debian-11/tags-info.yaml index 1121547d49008..f44958ca7ca06 100644 --- a/bitnami/mastodon/4/debian-11/tags-info.yaml +++ b/bitnami/mastodon/4/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "4" - 4-debian-11 -- 4.2.1 +- 4.2.3 - latest diff --git a/bitnami/mastodon/README.md b/bitnami/mastodon/README.md index b2b367f554507..267d40da6d293 100644 --- a/bitnami/mastodon/README.md +++ b/bitnami/mastodon/README.md @@ -1,4 +1,4 @@ -# Mastodon packaged by Bitnami +# Bitnami package for Mastodon ## What is Mastodon? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/matomo/4/debian-11/Dockerfile b/bitnami/matomo/4/debian-11/Dockerfile index ca31de3065e12..cd8c7e479a2ba 100644 --- a/bitnami/matomo/4/debian-11/Dockerfile +++ b/bitnami/matomo/4/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:22:28Z" \ + org.opencontainers.image.created="2023-12-02T09:02:07Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.15.1-debian-11-r63" \ + org.opencontainers.image.ref.name="4.16.0-debian-11-r2" \ org.opencontainers.image.title="matomo" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="4.15.1" + org.opencontainers.image.version="4.16.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,26 +21,26 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates cron curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 libldap-common liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps rsync zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.2.11-3-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.57-12-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.11.5-1-linux-${OS_ARCH}-debian-11" \ - "libphp-8.2.11-0-linux-${OS_ARCH}-debian-11" \ - "ini-file-1.4.6-2-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "matomo-4.15.1-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "php-8.2.13-6-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.58-1-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.11.6-0-linux-${OS_ARCH}-debian-11" \ + "libphp-8.2.13-0-linux-${OS_ARCH}-debian-11" \ + "ini-file-1.4.6-3-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-3-linux-${OS_ARCH}-debian-11" \ + "matomo-4.16.0-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -56,7 +56,7 @@ RUN /opt/bitnami/scripts/matomo/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ - APP_VERSION="4.15.1" \ + APP_VERSION="4.16.0" \ BITNAMI_APP_NAME="matomo" \ PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/matomo/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/matomo/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index dd310af6b2039..05268204ba0e1 100644 --- a/bitnami/matomo/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/matomo/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,42 +3,42 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.57-12" + "version": "2.4.58-1" }, "ini-file": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-2" + "version": "1.4.6-3" }, "libphp": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.11-0" + "version": "8.2.13-0" }, "matomo": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.15.1-1" + "version": "4.16.0-1" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.11.5-1" + "version": "10.11.6-0" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.11-3" + "version": "8.2.13-6" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-3" } } \ No newline at end of file diff --git a/bitnami/matomo/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/matomo/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/matomo/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/matomo/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/matomo/4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/matomo/4/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/matomo/4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/matomo/4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/matomo/4/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/matomo/4/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh index 765d1d8ce1ed5..6a480ad4ddde9 100755 --- a/bitnami/matomo/4/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh +++ b/bitnami/matomo/4/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh @@ -46,6 +46,7 @@ apache_setup_bitnami_config() { local -a modules_to_disable=( "http2_module" "proxy_hcheck_module" + "proxy_html_module" "proxy_http2_module" ) for module in "${modules_to_disable[@]}"; do diff --git a/bitnami/matomo/4/debian-11/tags-info.yaml b/bitnami/matomo/4/debian-11/tags-info.yaml index 2753029580e28..847e0e2c1761a 100644 --- a/bitnami/matomo/4/debian-11/tags-info.yaml +++ b/bitnami/matomo/4/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "4" - 4-debian-11 -- 4.15.1 +- 4.16.0 - latest diff --git a/bitnami/matomo/README.md b/bitnami/matomo/README.md index 1d41d2e60ba9b..9b6f0aa81c1a1 100644 --- a/bitnami/matomo/README.md +++ b/bitnami/matomo/README.md @@ -1,4 +1,4 @@ -# Matomo packaged by Bitnami +# Bitnami package for Matomo ## What is Matomo? @@ -23,7 +23,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/mediawiki/1/debian-11/Dockerfile b/bitnami/mediawiki/1/debian-11/Dockerfile index b237ef492a7c8..f9368d2e2861d 100644 --- a/bitnami/mediawiki/1/debian-11/Dockerfile +++ b/bitnami/mediawiki/1/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T23:43:48Z" \ + org.opencontainers.image.created="2023-12-02T07:41:58Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.40.1-debian-11-r4" \ + org.opencontainers.image.ref.name="1.40.1-debian-11-r8" \ org.opencontainers.image.title="mediawiki" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.40.1" @@ -21,25 +21,25 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.1.24-3-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.57-12-linux-${OS_ARCH}-debian-11" \ - "mysql-client-11.1.2-0-linux-${OS_ARCH}-debian-11" \ - "libphp-8.1.24-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "mediawiki-1.40.1-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "php-8.1.26-4-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.58-1-linux-${OS_ARCH}-debian-11" \ + "mysql-client-11.1.3-0-linux-${OS_ARCH}-debian-11" \ + "libphp-8.1.26-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-3-linux-${OS_ARCH}-debian-11" \ + "mediawiki-1.40.1-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/mediawiki/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mediawiki/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 398d6b80e029f..01bf176b193bc 100644 --- a/bitnami/mediawiki/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mediawiki/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,36 +3,36 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.57-12" + "version": "2.4.58-1" }, "libphp": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.24-0" + "version": "8.1.26-0" }, "mediawiki": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.40.1-0" + "version": "1.40.1-1" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.1.2-0" + "version": "11.1.3-0" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.24-3" + "version": "8.1.26-4" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-3" } } \ No newline at end of file diff --git a/bitnami/mediawiki/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mediawiki/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mediawiki/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mediawiki/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mediawiki/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mediawiki/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mediawiki/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mediawiki/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh index 765d1d8ce1ed5..6a480ad4ddde9 100755 --- a/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh +++ b/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh @@ -46,6 +46,7 @@ apache_setup_bitnami_config() { local -a modules_to_disable=( "http2_module" "proxy_hcheck_module" + "proxy_html_module" "proxy_http2_module" ) for module in "${modules_to_disable[@]}"; do diff --git a/bitnami/mediawiki/README.md b/bitnami/mediawiki/README.md index e217149899a33..b65a25dadd704 100644 --- a/bitnami/mediawiki/README.md +++ b/bitnami/mediawiki/README.md @@ -1,4 +1,4 @@ -# MediaWiki packaged by Bitnami +# Bitnami package for MediaWiki ## What is MediaWiki? @@ -21,7 +21,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/memcached-exporter/0/debian-11/Dockerfile b/bitnami/memcached-exporter/0/debian-11/Dockerfile index d26f12dcc75b9..2dda697c33059 100644 --- a/bitnami/memcached-exporter/0/debian-11/Dockerfile +++ b/bitnami/memcached-exporter/0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T06:14:37Z" \ + org.opencontainers.image.created="2023-12-07T00:59:59Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.13.0-debian-11-r121" \ + org.opencontainers.image.ref.name="0.14.1-debian-11-r0" \ org.opencontainers.image.title="memcached-exporter" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.13.0" + org.opencontainers.image.version="0.14.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "memcached-exporter-0.13.0-6-linux-${OS_ARCH}-debian-11" \ - ) && \ + "memcached-exporter-0.14.1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="0.13.0" \ +ENV APP_VERSION="0.14.1" \ BITNAMI_APP_NAME="memcached-exporter" \ PATH="/opt/bitnami/memcached-exporter/bin:$PATH" diff --git a/bitnami/memcached-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/memcached-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 6801e95bc5402..bff81c1634106 100644 --- a/bitnami/memcached-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/memcached-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.13.0-6" + "version": "0.14.1-0" } } \ No newline at end of file diff --git a/bitnami/memcached-exporter/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/memcached-exporter/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/memcached-exporter/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/memcached-exporter/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/memcached-exporter/0/debian-11/tags-info.yaml b/bitnami/memcached-exporter/0/debian-11/tags-info.yaml index f688bdf1fc76c..f48d69e5e70d3 100644 --- a/bitnami/memcached-exporter/0/debian-11/tags-info.yaml +++ b/bitnami/memcached-exporter/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.13.0 +- 0.14.1 - latest diff --git a/bitnami/memcached-exporter/README.md b/bitnami/memcached-exporter/README.md index 480ee4e9a27a6..21d47c78216ae 100644 --- a/bitnami/memcached-exporter/README.md +++ b/bitnami/memcached-exporter/README.md @@ -1,4 +1,4 @@ -# Memcached Exporter packaged by Bitnami +# Bitnami package for Memcached Exporter ## What is Memcached Exporter? @@ -18,7 +18,7 @@ docker run --name memcached-exporter bitnami/memcached-exporter:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/memcached/1/debian-11/Dockerfile b/bitnami/memcached/1/debian-11/Dockerfile index 46972460ee8ee..950fd5cf68288 100644 --- a/bitnami/memcached/1/debian-11/Dockerfile +++ b/bitnami/memcached/1/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-16T09:58:07Z" \ + org.opencontainers.image.created="2023-12-15T16:41:30Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.6.22-debian-11-r0" \ + org.opencontainers.image.ref.name="1.6.22-debian-11-r2" \ org.opencontainers.image.title="memcached" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.6.22" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libevent-2.1-7 libsasl2-2 libsasl2-modules libssl1.1 netcat-openbsd procps sasl2-bin -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ "memcached-1.6.22-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/memcached/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/memcached/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/memcached/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/memcached/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/memcached/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/memcached/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/memcached/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/memcached/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/memcached/README.md b/bitnami/memcached/README.md index 3a3ffd700f401..eb7a006f4eada 100644 --- a/bitnami/memcached/README.md +++ b/bitnami/memcached/README.md @@ -1,4 +1,4 @@ -# Memcached packaged by Bitnami +# Bitnami package for Memcached ## What is Memcached? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/metallb-controller/0/debian-11/Dockerfile b/bitnami/metallb-controller/0/debian-11/Dockerfile index acfb6c4f5ea86..d84b22f3bccb1 100644 --- a/bitnami/metallb-controller/0/debian-11/Dockerfile +++ b/bitnami/metallb-controller/0/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-20T16:29:07Z" \ + org.opencontainers.image.created="2023-12-07T00:52:46Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.13.12-debian-11-r0" \ + org.opencontainers.image.ref.name="0.13.12-debian-11-r2" \ org.opencontainers.image.title="metallb-controller" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="0.13.12" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "metallb-0.13.12-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "metallb-0.13.12-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/metallb-controller/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/metallb-controller/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c22a41f556134..1f5d21ee38922 100644 --- a/bitnami/metallb-controller/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/metallb-controller/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.13.12-0" + "version": "0.13.12-2" } } \ No newline at end of file diff --git a/bitnami/metallb-controller/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/metallb-controller/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/metallb-controller/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/metallb-controller/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/metallb-controller/README.md b/bitnami/metallb-controller/README.md index b1743cfe80ba9..39278637251fd 100644 --- a/bitnami/metallb-controller/README.md +++ b/bitnami/metallb-controller/README.md @@ -1,4 +1,4 @@ -# MetalLB packaged by Bitnami +# Bitnami package for MetalLB ## What is MetalLB? @@ -18,7 +18,7 @@ docker run --name metallb-controller bitnami/metallb-controller:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/metallb-speaker/0/debian-11/Dockerfile b/bitnami/metallb-speaker/0/debian-11/Dockerfile index 7693be0d05db1..5a8c14e1878ab 100644 --- a/bitnami/metallb-speaker/0/debian-11/Dockerfile +++ b/bitnami/metallb-speaker/0/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-20T16:28:57Z" \ + org.opencontainers.image.created="2023-12-07T01:26:12Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.13.12-debian-11-r0" \ + org.opencontainers.image.ref.name="0.13.12-debian-11-r2" \ org.opencontainers.image.title="metallb-speaker" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="0.13.12" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "metallb-speaker-0.13.12-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "metallb-speaker-0.13.12-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/metallb-speaker/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/metallb-speaker/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index aee12d3fb70ef..4018a3c9a332b 100644 --- a/bitnami/metallb-speaker/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/metallb-speaker/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.13.12-0" + "version": "0.13.12-2" } } \ No newline at end of file diff --git a/bitnami/metallb-speaker/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/metallb-speaker/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/metallb-speaker/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/metallb-speaker/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/metallb-speaker/README.md b/bitnami/metallb-speaker/README.md index 7eb817c49ea16..eca31e63f30d3 100644 --- a/bitnami/metallb-speaker/README.md +++ b/bitnami/metallb-speaker/README.md @@ -1,4 +1,4 @@ -# MetalLB Speaker packaged by Bitnami +# Bitnami package for MetalLB Speaker ## What is MetalLB Speaker? @@ -18,7 +18,7 @@ docker run --name metallb-speaker bitnami/metallb-speaker:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/metrics-server/0/debian-11/Dockerfile b/bitnami/metrics-server/0/debian-11/Dockerfile index ec903773bba63..9c2aaf6b25902 100644 --- a/bitnami/metrics-server/0/debian-11/Dockerfile +++ b/bitnami/metrics-server/0/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-18T13:48:48Z" \ + org.opencontainers.image.created="2023-12-07T00:53:58Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.6.4-debian-11-r71" \ + org.opencontainers.image.ref.name="0.6.4-debian-11-r73" \ org.opencontainers.image.title="metrics-server" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="0.6.4" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "metrics-server-0.6.4-5-linux-${OS_ARCH}-debian-11" \ - ) && \ + "metrics-server-0.6.4-7-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/metrics-server/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/metrics-server/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 66cacfc7da300..361775f6dbf4a 100644 --- a/bitnami/metrics-server/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/metrics-server/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.6.4-5" + "version": "0.6.4-7" } } \ No newline at end of file diff --git a/bitnami/metrics-server/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/metrics-server/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/metrics-server/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/metrics-server/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/metrics-server/README.md b/bitnami/metrics-server/README.md index 6090eef676f9a..acce16c5dee7c 100644 --- a/bitnami/metrics-server/README.md +++ b/bitnami/metrics-server/README.md @@ -1,4 +1,4 @@ -# Metrics Server packaged by Bitnami +# Bitnami package for Metrics Server ## What is Metrics Server? @@ -20,7 +20,7 @@ docker run --name metrics-server bitnami/metrics-server:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/milvus/2/debian-11/Dockerfile b/bitnami/milvus/2/debian-11/Dockerfile index 9a2bc917ea58a..f6ef30f88f77b 100644 --- a/bitnami/milvus/2/debian-11/Dockerfile +++ b/bitnami/milvus/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:13:01Z" \ + org.opencontainers.image.created="2023-12-15T11:43:39Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.2.14-debian-11-r37" \ + org.opencontainers.image.ref.name="2.3.3-debian-11-r2" \ org.opencontainers.image.title="milvus" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.2.14" + org.opencontainers.image.version="2.3.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,23 +21,23 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages ca-certificates curl libblas3 libboost-filesystem1.74.0 libbrotli1 libcom-err2 libcurl4 libffi7 libgcc-s1 libgcrypt20 libgfortran5 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblapack3 libldap-2.4-2 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 libquadmath0 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libstdc++6 libtasn1-6 libtbb2 libunistring2 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN install_packages ca-certificates curl libgcc-s1 libgomp1 libstdc++6 procps +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "milvus-2.2.14-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "yq-4.40.5-0-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "milvus-2.3.3-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,9 +46,9 @@ RUN apt-get autoremove --purge -y curl && \ RUN useradd -r -u 1001 -g root milvus RUN mkdir -p /opt/bitnami/milvus/tmp && chmod g+rwX /opt/bitnami/milvus/tmp && ln -s /opt/bitnami/milvus/tmp /run/milvus && mkdir -p /bitnami/milvus/data && chmod g+rwX /bitnami/milvus/data && ln -s /bitnami/milvus/data /var/lib/milvus && ln -s /opt/bitnami/milvus /milvus -ENV APP_VERSION="2.2.14" \ +ENV APP_VERSION="2.3.3" \ BITNAMI_APP_NAME="milvus" \ - LD_LIBRARY_PATH="/opt/bitnami/milvus/lib:/opt/bitnami/openblas/lib:$LD_LIBRARY_PATH" \ + LD_LIBRARY_PATH="/opt/bitnami/milvus/lib:$LD_LIBRARY_PATH" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/milvus/bin:$PATH" WORKDIR /opt/bitnami/milvus diff --git a/bitnami/milvus/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/milvus/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 9d32f50ea7bc2..4cf8c9d8e6a6c 100644 --- a/bitnami/milvus/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/milvus/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,24 +3,24 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.2.14-0" + "version": "2.3.3-1" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.5-0" } } \ No newline at end of file diff --git a/bitnami/milvus/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/milvus/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/milvus/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/milvus/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/milvus/2/debian-11/tags-info.yaml b/bitnami/milvus/2/debian-11/tags-info.yaml index 1676c47f97651..25837eb903713 100644 --- a/bitnami/milvus/2/debian-11/tags-info.yaml +++ b/bitnami/milvus/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.2.14 +- 2.3.3 - latest diff --git a/bitnami/milvus/README.md b/bitnami/milvus/README.md index acca0457e125f..c1462926bcecb 100644 --- a/bitnami/milvus/README.md +++ b/bitnami/milvus/README.md @@ -1,4 +1,4 @@ -# Milvus packaged by Bitnami +# Bitnami package for Milvus ## What is Milvus? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/minio-client/2023/debian-11/Dockerfile b/bitnami/minio-client/2023/debian-11/Dockerfile index e1f600a265784..c160569616242 100644 --- a/bitnami/minio-client/2023/debian-11/Dockerfile +++ b/bitnami/minio-client/2023/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T07:30:32Z" \ + org.opencontainers.image.created="2023-12-15T00:50:42Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2023.10.24-debian-11-r0" \ + org.opencontainers.image.ref.name="2023.12.14-debian-11-r0" \ org.opencontainers.image.title="minio-client" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2023.10.24" + org.opencontainers.image.version="2023.12.14" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN install_packages ca-certificates curl jq procps +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "minio-client-2023.10.24-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "minio-client-2023.12.14-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -44,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/minio-client/postunpack.sh -ENV APP_VERSION="2023.10.24" \ +ENV APP_VERSION="2023.12.14" \ BITNAMI_APP_NAME="minio-client" \ PATH="/opt/bitnami/minio-client/bin:$PATH" diff --git a/bitnami/minio-client/2023/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/minio-client/2023/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 5e59235063182..66e30f977e861 100644 --- a/bitnami/minio-client/2023/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/minio-client/2023/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2023.10.24-0" + "version": "2023.12.14-0" } } \ No newline at end of file diff --git a/bitnami/minio-client/2023/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/minio-client/2023/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/minio-client/2023/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/minio-client/2023/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/minio-client/2023/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/minio-client/2023/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/minio-client/2023/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/minio-client/2023/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/minio-client/2023/debian-11/tags-info.yaml b/bitnami/minio-client/2023/debian-11/tags-info.yaml index 9c1e8ae6c350e..a7bd681bf6df7 100644 --- a/bitnami/minio-client/2023/debian-11/tags-info.yaml +++ b/bitnami/minio-client/2023/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2023" - 2023-debian-11 -- 2023.10.24 +- 2023.12.14 - latest diff --git a/bitnami/minio-client/README.md b/bitnami/minio-client/README.md index 6244585733d21..ed39fa1c670e8 100644 --- a/bitnami/minio-client/README.md +++ b/bitnami/minio-client/README.md @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/minio/2023/debian-11/Dockerfile b/bitnami/minio/2023/debian-11/Dockerfile index 16473a95e1df5..891698fee9ea1 100644 --- a/bitnami/minio/2023/debian-11/Dockerfile +++ b/bitnami/minio/2023/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T10:58:57Z" \ + org.opencontainers.image.created="2023-12-15T01:04:21Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2023.10.25-debian-11-r1" \ + org.opencontainers.image.ref.name="2023.12.14-debian-11-r0" \ org.opencontainers.image.title="minio" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2023.10.25" + org.opencontainers.image.version="2023.12.14" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,22 +21,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl jq procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "minio-client-2023.10.24-0-linux-${OS_ARCH}-debian-11" \ - "minio-2023.10.25-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "minio-client-2023.12.14-0-linux-${OS_ARCH}-debian-11" \ + "minio-2023.12.14-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -46,7 +46,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/minio-client/postunpack.sh RUN /opt/bitnami/scripts/minio/postunpack.sh -ENV APP_VERSION="2023.10.25" \ +ENV APP_VERSION="2023.12.14" \ BITNAMI_APP_NAME="minio" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/minio-client/bin:/opt/bitnami/minio/bin:$PATH" diff --git a/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index aecf936fd2a52..e055e5a9b36c4 100644 --- a/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2023.10.25-1" + "version": "2023.12.14-0" }, "minio-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2023.10.24-0" + "version": "2023.12.14-0" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" } } \ No newline at end of file diff --git a/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/minio/2023/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/minio/2023/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/minio/2023/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/minio/2023/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/minio/2023/debian-11/tags-info.yaml b/bitnami/minio/2023/debian-11/tags-info.yaml index 4203b76777daa..a7bd681bf6df7 100644 --- a/bitnami/minio/2023/debian-11/tags-info.yaml +++ b/bitnami/minio/2023/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2023" - 2023-debian-11 -- 2023.10.25 +- 2023.12.14 - latest diff --git a/bitnami/minio/README.md b/bitnami/minio/README.md index bdf8a784f733c..3d019967e4bcd 100644 --- a/bitnami/minio/README.md +++ b/bitnami/minio/README.md @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/mlflow/2/debian-11/Dockerfile b/bitnami/mlflow/2/debian-11/Dockerfile index 6725917318687..619c34dee8b53 100644 --- a/bitnami/mlflow/2/debian-11/Dockerfile +++ b/bitnami/mlflow/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-29T23:18:46Z" \ + org.opencontainers.image.created="2023-12-15T11:47:36Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.8.0-debian-11-r0" \ + org.opencontainers.image.ref.name="2.9.2-debian-11-r0" \ org.opencontainers.image.title="mlflow" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.8.0" + org.opencontainers.image.version="2.9.2" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl git libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpq5 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.10.13-8-linux-${OS_ARCH}-debian-11" \ - "mlflow-2.8.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.10.13-13-linux-${OS_ARCH}-debian-11" \ + "mlflow-2.9.2-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -45,7 +45,7 @@ RUN useradd -r -u 1001 -g root mlflow RUN mkdir /.local && chmod g+rwX /.local RUN mkdir -p /app/mlruns /app/mlartifacts /bitnami/mlflow && chmod g+rwX /app /app/mlruns /app/mlartifacts /bitnami/mlflow && ln -s /opt/bitnami/python/lib/*/site-packages/mlflow/server/auth/ /bitnami/mlflow-basic-auth -ENV APP_VERSION="2.8.0" \ +ENV APP_VERSION="2.9.2" \ BITNAMI_APP_NAME="mlflow" \ PATH="/opt/bitnami/python/bin:$PATH" diff --git a/bitnami/mlflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mlflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 7160b2466018a..6585f397370e1 100644 --- a/bitnami/mlflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mlflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.8.0-0" + "version": "2.9.2-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.10.13-8" + "version": "3.10.13-13" } } \ No newline at end of file diff --git a/bitnami/mlflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mlflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mlflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mlflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mlflow/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mlflow/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mlflow/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mlflow/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mlflow/2/debian-11/tags-info.yaml b/bitnami/mlflow/2/debian-11/tags-info.yaml index 478070c5f86ed..0a5ea3b1a8061 100644 --- a/bitnami/mlflow/2/debian-11/tags-info.yaml +++ b/bitnami/mlflow/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.8.0 +- 2.9.2 - latest diff --git a/bitnami/mlflow/README.md b/bitnami/mlflow/README.md index 162f65d1b05ae..033355e64eba5 100644 --- a/bitnami/mlflow/README.md +++ b/bitnami/mlflow/README.md @@ -1,4 +1,4 @@ -# MLflow packaged by Bitnami +# Bitnami package for MLflow ## What is MLflow? @@ -22,12 +22,12 @@ docker-compose up -d ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use MLflow in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. @@ -90,7 +90,7 @@ If your MLflow app has a `requirements.txt` defining your app's dependencies, yo ```console docker run -it --name mlflow -v /path/to/app:/app bitnami/mlflow \ - sh -c "pip install --file requirements.txt && python script.py" + sh -c "pip install -r requirements.txt && python script.py" ``` **Further Reading:** diff --git a/bitnami/mongodb-exporter/0/debian-11/Dockerfile b/bitnami/mongodb-exporter/0/debian-11/Dockerfile index 9cc9aa1ce98d7..7b571122d5755 100644 --- a/bitnami/mongodb-exporter/0/debian-11/Dockerfile +++ b/bitnami/mongodb-exporter/0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T06:41:48Z" \ + org.opencontainers.image.created="2023-12-06T19:10:41Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.39.0-debian-11-r123" \ + org.opencontainers.image.ref.name="0.40.0-debian-11-r1" \ org.opencontainers.image.title="mongodb-exporter" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.39.0" + org.opencontainers.image.version="0.40.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "mongodb-exporter-0.39.0-6-linux-${OS_ARCH}-debian-11" \ - ) && \ + "mongodb-exporter-0.40.0-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -43,7 +43,7 @@ RUN apt-get autoremove --purge -y curl && \ RUN chmod g+rwX /opt/bitnami RUN ln -sf /opt/bitnami/mongodb-exporter/bin/mongodb_exporter /bin/mongodb_exporter -ENV APP_VERSION="0.39.0" \ +ENV APP_VERSION="0.40.0" \ BITNAMI_APP_NAME="mongodb-exporter" \ PATH="/opt/bitnami/mongodb-exporter/bin:$PATH" diff --git a/bitnami/mongodb-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mongodb-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 46372f6b70325..a99f688e23212 100644 --- a/bitnami/mongodb-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mongodb-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.39.0-6" + "version": "0.40.0-1" } } \ No newline at end of file diff --git a/bitnami/mongodb-exporter/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mongodb-exporter/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mongodb-exporter/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mongodb-exporter/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mongodb-exporter/0/debian-11/tags-info.yaml b/bitnami/mongodb-exporter/0/debian-11/tags-info.yaml index 0ea357647f818..814fa7a165d06 100644 --- a/bitnami/mongodb-exporter/0/debian-11/tags-info.yaml +++ b/bitnami/mongodb-exporter/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.39.0 +- 0.40.0 - latest diff --git a/bitnami/mongodb-exporter/README.md b/bitnami/mongodb-exporter/README.md index 2f6deda3ef80d..26cd314c8fdfd 100644 --- a/bitnami/mongodb-exporter/README.md +++ b/bitnami/mongodb-exporter/README.md @@ -1,4 +1,4 @@ -# MongoDB Exporter packaged by Bitnami +# Bitnami package for MongoDB Exporter ## What is MongoDB Exporter? @@ -18,7 +18,7 @@ docker run --name mongodb-exporter bitnami/mongodb-exporter:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/mongodb-sharded/5.0/debian-11/Dockerfile b/bitnami/mongodb-sharded/5.0/debian-11/Dockerfile index 1d6232a242daf..ebfa02d941c70 100644 --- a/bitnami/mongodb-sharded/5.0/debian-11/Dockerfile +++ b/bitnami/mongodb-sharded/5.0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-26T22:52:38Z" \ + org.opencontainers.image.created="2023-12-07T19:11:13Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.0.22-debian-11-r0" \ + org.opencontainers.image.ref.name="5.0.23-debian-11-r3" \ org.opencontainers.image.title="mongodb-sharded" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="5.0.22" + org.opencontainers.image.version="5.0.23" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,24 +21,24 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbrotli1 libcom-err2 libcurl4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libtasn1-6 libunistring2 numactl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "mongodb-shell-2.0.2-0-linux-${OS_ARCH}-debian-11" \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "mongodb-5.0.22-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "mongodb-shell-2.1.1-0-linux-${OS_ARCH}-debian-11" \ + "yq-4.40.4-1-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "mongodb-5.0.23-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -50,7 +50,7 @@ RUN ln -s /opt/bitnami/scripts/mongodb-sharded/run.sh /run.sh COPY rootfs / RUN /opt/bitnami/scripts/mongodb-sharded/postunpack.sh -ENV APP_VERSION="5.0.22" \ +ENV APP_VERSION="5.0.23" \ BITNAMI_APP_NAME="mongodb-sharded" \ PATH="/opt/bitnami/mongodb/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/mongodb-sharded/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mongodb-sharded/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c6f4fe86675ca..78ba55261e95e 100644 --- a/bitnami/mongodb-sharded/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mongodb-sharded/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,30 +3,30 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "5.0.22-0" + "version": "5.0.23-2" }, "mongodb-shell": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.0.2-0" + "version": "2.1.1-0" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.4-1" } } \ No newline at end of file diff --git a/bitnami/mongodb-sharded/5.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mongodb-sharded/5.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mongodb-sharded/5.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mongodb-sharded/5.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mongodb-sharded/5.0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mongodb-sharded/5.0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mongodb-sharded/5.0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mongodb-sharded/5.0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mongodb-sharded/5.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh b/bitnami/mongodb-sharded/5.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh index 4e6dc8c989b0e..3c6f40101f1d6 100644 --- a/bitnami/mongodb-sharded/5.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh +++ b/bitnami/mongodb-sharded/5.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh @@ -606,7 +606,7 @@ mongodb_set_auth_conf() { local authorization if ! mongodb_is_file_external "$conf_file_name"; then - if [[ -n "$MONGODB_ROOT_PASSWORD" ]] || [[ -n "$MONGODB_PASSWORD" ]]; then + if [[ -n "$MONGODB_ROOT_PASSWORD" ]] || [[ -n "$MONGODB_INITIAL_PRIMARY_ROOT_PASSWORD" ]] || [[ -n "$MONGODB_PASSWORD" ]]; then authorization="$(yq eval .security.authorization "$MONGODB_CONF_FILE")" if [[ "$authorization" = "disabled" ]]; then diff --git a/bitnami/mongodb-sharded/5.0/debian-11/tags-info.yaml b/bitnami/mongodb-sharded/5.0/debian-11/tags-info.yaml index 5e87e47d4ad00..9a6a2de905a90 100644 --- a/bitnami/mongodb-sharded/5.0/debian-11/tags-info.yaml +++ b/bitnami/mongodb-sharded/5.0/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "5.0" - 5.0-debian-11 -- 5.0.22 +- 5.0.23 diff --git a/bitnami/mongodb-sharded/6.0/debian-11/Dockerfile b/bitnami/mongodb-sharded/6.0/debian-11/Dockerfile index 51ba1299971dd..20e164861607c 100644 --- a/bitnami/mongodb-sharded/6.0/debian-11/Dockerfile +++ b/bitnami/mongodb-sharded/6.0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-20T20:28:40Z" \ + org.opencontainers.image.created="2023-12-07T18:57:01Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.0.11-debian-11-r1" \ + org.opencontainers.image.ref.name="6.0.12-debian-11-r3" \ org.opencontainers.image.title="mongodb-sharded" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="6.0.11" + org.opencontainers.image.version="6.0.12" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,24 +21,24 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbrotli1 libcom-err2 libcurl4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libtasn1-6 libunistring2 numactl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "mongodb-shell-2.0.2-0-linux-${OS_ARCH}-debian-11" \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "mongodb-6.0.11-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "mongodb-shell-2.1.1-0-linux-${OS_ARCH}-debian-11" \ + "yq-4.40.4-1-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "mongodb-6.0.12-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -50,7 +50,7 @@ RUN ln -s /opt/bitnami/scripts/mongodb-sharded/run.sh /run.sh COPY rootfs / RUN /opt/bitnami/scripts/mongodb-sharded/postunpack.sh -ENV APP_VERSION="6.0.11" \ +ENV APP_VERSION="6.0.12" \ BITNAMI_APP_NAME="mongodb-sharded" \ PATH="/opt/bitnami/mongodb/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/mongodb-sharded/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mongodb-sharded/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 7d4b3ffc40bb3..43ee1bf76266f 100644 --- a/bitnami/mongodb-sharded/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mongodb-sharded/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,30 +3,30 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "6.0.11-1" + "version": "6.0.12-2" }, "mongodb-shell": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.0.2-0" + "version": "2.1.1-0" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.4-1" } } \ No newline at end of file diff --git a/bitnami/mongodb-sharded/6.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mongodb-sharded/6.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mongodb-sharded/6.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mongodb-sharded/6.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mongodb-sharded/6.0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mongodb-sharded/6.0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mongodb-sharded/6.0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mongodb-sharded/6.0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mongodb-sharded/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh b/bitnami/mongodb-sharded/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh index 4e6dc8c989b0e..3c6f40101f1d6 100644 --- a/bitnami/mongodb-sharded/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh +++ b/bitnami/mongodb-sharded/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh @@ -606,7 +606,7 @@ mongodb_set_auth_conf() { local authorization if ! mongodb_is_file_external "$conf_file_name"; then - if [[ -n "$MONGODB_ROOT_PASSWORD" ]] || [[ -n "$MONGODB_PASSWORD" ]]; then + if [[ -n "$MONGODB_ROOT_PASSWORD" ]] || [[ -n "$MONGODB_INITIAL_PRIMARY_ROOT_PASSWORD" ]] || [[ -n "$MONGODB_PASSWORD" ]]; then authorization="$(yq eval .security.authorization "$MONGODB_CONF_FILE")" if [[ "$authorization" = "disabled" ]]; then diff --git a/bitnami/mongodb-sharded/6.0/debian-11/tags-info.yaml b/bitnami/mongodb-sharded/6.0/debian-11/tags-info.yaml index 4f062d40bcbc8..2c3a94ad9620e 100644 --- a/bitnami/mongodb-sharded/6.0/debian-11/tags-info.yaml +++ b/bitnami/mongodb-sharded/6.0/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "6.0" - 6.0-debian-11 -- 6.0.11 +- 6.0.12 diff --git a/bitnami/mongodb-sharded/7.0/debian-11/Dockerfile b/bitnami/mongodb-sharded/7.0/debian-11/Dockerfile index dcf8a1b0b26bf..f85ead98cc35e 100644 --- a/bitnami/mongodb-sharded/7.0/debian-11/Dockerfile +++ b/bitnami/mongodb-sharded/7.0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-20T20:54:06Z" \ + org.opencontainers.image.created="2023-12-07T18:53:46Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.0.2-debian-11-r7" \ + org.opencontainers.image.ref.name="7.0.4-debian-11-r2" \ org.opencontainers.image.title="mongodb-sharded" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.0.2" + org.opencontainers.image.version="7.0.4" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,24 +21,24 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbrotli1 libcom-err2 libcurl4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libtasn1-6 libunistring2 numactl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "mongodb-shell-2.0.2-0-linux-${OS_ARCH}-debian-11" \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "mongodb-7.0.2-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "mongodb-shell-2.1.1-0-linux-${OS_ARCH}-debian-11" \ + "yq-4.40.4-1-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "mongodb-7.0.4-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -50,7 +50,7 @@ RUN ln -s /opt/bitnami/scripts/mongodb-sharded/run.sh /run.sh COPY rootfs / RUN /opt/bitnami/scripts/mongodb-sharded/postunpack.sh -ENV APP_VERSION="7.0.2" \ +ENV APP_VERSION="7.0.4" \ BITNAMI_APP_NAME="mongodb-sharded" \ PATH="/opt/bitnami/mongodb/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/mongodb-sharded/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mongodb-sharded/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8c7dd9e37fadc..b02dfaaba9050 100644 --- a/bitnami/mongodb-sharded/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mongodb-sharded/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,30 +3,30 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.0.2-2" + "version": "7.0.4-1" }, "mongodb-shell": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.0.2-0" + "version": "2.1.1-0" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.4-1" } } \ No newline at end of file diff --git a/bitnami/mongodb-sharded/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mongodb-sharded/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mongodb-sharded/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mongodb-sharded/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mongodb-sharded/7.0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mongodb-sharded/7.0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mongodb-sharded/7.0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mongodb-sharded/7.0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mongodb-sharded/7.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh b/bitnami/mongodb-sharded/7.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh index 4e6dc8c989b0e..3c6f40101f1d6 100644 --- a/bitnami/mongodb-sharded/7.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh +++ b/bitnami/mongodb-sharded/7.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh @@ -606,7 +606,7 @@ mongodb_set_auth_conf() { local authorization if ! mongodb_is_file_external "$conf_file_name"; then - if [[ -n "$MONGODB_ROOT_PASSWORD" ]] || [[ -n "$MONGODB_PASSWORD" ]]; then + if [[ -n "$MONGODB_ROOT_PASSWORD" ]] || [[ -n "$MONGODB_INITIAL_PRIMARY_ROOT_PASSWORD" ]] || [[ -n "$MONGODB_PASSWORD" ]]; then authorization="$(yq eval .security.authorization "$MONGODB_CONF_FILE")" if [[ "$authorization" = "disabled" ]]; then diff --git a/bitnami/mongodb-sharded/7.0/debian-11/tags-info.yaml b/bitnami/mongodb-sharded/7.0/debian-11/tags-info.yaml index 3baec4b236dca..6ab8d642f4acc 100644 --- a/bitnami/mongodb-sharded/7.0/debian-11/tags-info.yaml +++ b/bitnami/mongodb-sharded/7.0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "7.0" - 7.0-debian-11 -- 7.0.2 +- 7.0.4 - latest diff --git a/bitnami/mongodb-sharded/README.md b/bitnami/mongodb-sharded/README.md index af91d56b9c91c..8c893e9f32559 100644 --- a/bitnami/mongodb-sharded/README.md +++ b/bitnami/mongodb-sharded/README.md @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/mongodb/5.0/debian-11/Dockerfile b/bitnami/mongodb/5.0/debian-11/Dockerfile index 8013ce17d1cab..6eb7c93ea7da9 100644 --- a/bitnami/mongodb/5.0/debian-11/Dockerfile +++ b/bitnami/mongodb/5.0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-26T22:52:24Z" \ + org.opencontainers.image.created="2023-12-07T19:11:04Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.0.22-debian-11-r0" \ + org.opencontainers.image.ref.name="5.0.23-debian-11-r3" \ org.opencontainers.image.title="mongodb" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="5.0.22" + org.opencontainers.image.version="5.0.23" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,24 +21,24 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbrotli1 libcom-err2 libcurl4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libtasn1-6 libunistring2 numactl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "mongodb-shell-2.0.2-0-linux-${OS_ARCH}-debian-11" \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "mongodb-5.0.22-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "mongodb-shell-2.1.1-0-linux-${OS_ARCH}-debian-11" \ + "yq-4.40.4-1-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "mongodb-5.0.23-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -48,7 +48,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/mongodb/postunpack.sh -ENV APP_VERSION="5.0.22" \ +ENV APP_VERSION="5.0.23" \ BITNAMI_APP_NAME="mongodb" \ PATH="/opt/bitnami/mongodb/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/mongodb/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mongodb/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c6f4fe86675ca..78ba55261e95e 100644 --- a/bitnami/mongodb/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mongodb/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,30 +3,30 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "5.0.22-0" + "version": "5.0.23-2" }, "mongodb-shell": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.0.2-0" + "version": "2.1.1-0" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.4-1" } } \ No newline at end of file diff --git a/bitnami/mongodb/5.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mongodb/5.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mongodb/5.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mongodb/5.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mongodb/5.0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mongodb/5.0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mongodb/5.0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mongodb/5.0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh b/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh index 4e6dc8c989b0e..3c6f40101f1d6 100644 --- a/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh +++ b/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh @@ -606,7 +606,7 @@ mongodb_set_auth_conf() { local authorization if ! mongodb_is_file_external "$conf_file_name"; then - if [[ -n "$MONGODB_ROOT_PASSWORD" ]] || [[ -n "$MONGODB_PASSWORD" ]]; then + if [[ -n "$MONGODB_ROOT_PASSWORD" ]] || [[ -n "$MONGODB_INITIAL_PRIMARY_ROOT_PASSWORD" ]] || [[ -n "$MONGODB_PASSWORD" ]]; then authorization="$(yq eval .security.authorization "$MONGODB_CONF_FILE")" if [[ "$authorization" = "disabled" ]]; then diff --git a/bitnami/mongodb/5.0/debian-11/tags-info.yaml b/bitnami/mongodb/5.0/debian-11/tags-info.yaml index 5e87e47d4ad00..9a6a2de905a90 100644 --- a/bitnami/mongodb/5.0/debian-11/tags-info.yaml +++ b/bitnami/mongodb/5.0/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "5.0" - 5.0-debian-11 -- 5.0.22 +- 5.0.23 diff --git a/bitnami/mongodb/6.0/debian-11/Dockerfile b/bitnami/mongodb/6.0/debian-11/Dockerfile index d3c9a1bdd06fb..ebff015d961a8 100644 --- a/bitnami/mongodb/6.0/debian-11/Dockerfile +++ b/bitnami/mongodb/6.0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-20T20:37:49Z" \ + org.opencontainers.image.created="2023-12-07T18:56:18Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.0.11-debian-11-r1" \ + org.opencontainers.image.ref.name="6.0.12-debian-11-r3" \ org.opencontainers.image.title="mongodb" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="6.0.11" + org.opencontainers.image.version="6.0.12" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,24 +21,24 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbrotli1 libcom-err2 libcurl4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libtasn1-6 libunistring2 numactl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "mongodb-shell-2.0.2-0-linux-${OS_ARCH}-debian-11" \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "mongodb-6.0.11-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "mongodb-shell-2.1.1-0-linux-${OS_ARCH}-debian-11" \ + "yq-4.40.4-1-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "mongodb-6.0.12-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -48,7 +48,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/mongodb/postunpack.sh -ENV APP_VERSION="6.0.11" \ +ENV APP_VERSION="6.0.12" \ BITNAMI_APP_NAME="mongodb" \ PATH="/opt/bitnami/mongodb/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/mongodb/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mongodb/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 7d4b3ffc40bb3..43ee1bf76266f 100644 --- a/bitnami/mongodb/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mongodb/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,30 +3,30 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "6.0.11-1" + "version": "6.0.12-2" }, "mongodb-shell": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.0.2-0" + "version": "2.1.1-0" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.4-1" } } \ No newline at end of file diff --git a/bitnami/mongodb/6.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mongodb/6.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mongodb/6.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mongodb/6.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mongodb/6.0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mongodb/6.0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mongodb/6.0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mongodb/6.0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mongodb/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh b/bitnami/mongodb/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh index 4e6dc8c989b0e..3c6f40101f1d6 100644 --- a/bitnami/mongodb/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh +++ b/bitnami/mongodb/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh @@ -606,7 +606,7 @@ mongodb_set_auth_conf() { local authorization if ! mongodb_is_file_external "$conf_file_name"; then - if [[ -n "$MONGODB_ROOT_PASSWORD" ]] || [[ -n "$MONGODB_PASSWORD" ]]; then + if [[ -n "$MONGODB_ROOT_PASSWORD" ]] || [[ -n "$MONGODB_INITIAL_PRIMARY_ROOT_PASSWORD" ]] || [[ -n "$MONGODB_PASSWORD" ]]; then authorization="$(yq eval .security.authorization "$MONGODB_CONF_FILE")" if [[ "$authorization" = "disabled" ]]; then diff --git a/bitnami/mongodb/6.0/debian-11/tags-info.yaml b/bitnami/mongodb/6.0/debian-11/tags-info.yaml index 4f062d40bcbc8..2c3a94ad9620e 100644 --- a/bitnami/mongodb/6.0/debian-11/tags-info.yaml +++ b/bitnami/mongodb/6.0/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "6.0" - 6.0-debian-11 -- 6.0.11 +- 6.0.12 diff --git a/bitnami/mongodb/7.0/debian-11/Dockerfile b/bitnami/mongodb/7.0/debian-11/Dockerfile index 5e5c912260308..e044e3becac56 100644 --- a/bitnami/mongodb/7.0/debian-11/Dockerfile +++ b/bitnami/mongodb/7.0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-20T20:57:18Z" \ + org.opencontainers.image.created="2023-12-07T18:52:37Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.0.2-debian-11-r7" \ + org.opencontainers.image.ref.name="7.0.4-debian-11-r2" \ org.opencontainers.image.title="mongodb" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.0.2" + org.opencontainers.image.version="7.0.4" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,24 +21,24 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbrotli1 libcom-err2 libcurl4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libtasn1-6 libunistring2 numactl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "mongodb-shell-2.0.2-0-linux-${OS_ARCH}-debian-11" \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "mongodb-7.0.2-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "mongodb-shell-2.1.1-0-linux-${OS_ARCH}-debian-11" \ + "yq-4.40.4-1-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "mongodb-7.0.4-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -48,7 +48,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/mongodb/postunpack.sh -ENV APP_VERSION="7.0.2" \ +ENV APP_VERSION="7.0.4" \ BITNAMI_APP_NAME="mongodb" \ PATH="/opt/bitnami/mongodb/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/mongodb/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mongodb/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8c7dd9e37fadc..b02dfaaba9050 100644 --- a/bitnami/mongodb/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mongodb/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,30 +3,30 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.0.2-2" + "version": "7.0.4-1" }, "mongodb-shell": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.0.2-0" + "version": "2.1.1-0" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.4-1" } } \ No newline at end of file diff --git a/bitnami/mongodb/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mongodb/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mongodb/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mongodb/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mongodb/7.0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mongodb/7.0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mongodb/7.0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mongodb/7.0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mongodb/7.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh b/bitnami/mongodb/7.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh index 4e6dc8c989b0e..3c6f40101f1d6 100644 --- a/bitnami/mongodb/7.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh +++ b/bitnami/mongodb/7.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh @@ -606,7 +606,7 @@ mongodb_set_auth_conf() { local authorization if ! mongodb_is_file_external "$conf_file_name"; then - if [[ -n "$MONGODB_ROOT_PASSWORD" ]] || [[ -n "$MONGODB_PASSWORD" ]]; then + if [[ -n "$MONGODB_ROOT_PASSWORD" ]] || [[ -n "$MONGODB_INITIAL_PRIMARY_ROOT_PASSWORD" ]] || [[ -n "$MONGODB_PASSWORD" ]]; then authorization="$(yq eval .security.authorization "$MONGODB_CONF_FILE")" if [[ "$authorization" = "disabled" ]]; then diff --git a/bitnami/mongodb/7.0/debian-11/tags-info.yaml b/bitnami/mongodb/7.0/debian-11/tags-info.yaml index 3baec4b236dca..6ab8d642f4acc 100644 --- a/bitnami/mongodb/7.0/debian-11/tags-info.yaml +++ b/bitnami/mongodb/7.0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "7.0" - 7.0-debian-11 -- 7.0.2 +- 7.0.4 - latest diff --git a/bitnami/mongodb/README.md b/bitnami/mongodb/README.md index 2f92efe462412..3c3c552d79d47 100644 --- a/bitnami/mongodb/README.md +++ b/bitnami/mongodb/README.md @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/moodle/4.1/debian-11/Dockerfile b/bitnami/moodle/4.1/debian-11/Dockerfile index 3a9a0eb0d1b0f..be16b955d9c63 100644 --- a/bitnami/moodle/4.1/debian-11/Dockerfile +++ b/bitnami/moodle/4.1/debian-11/Dockerfile @@ -9,39 +9,39 @@ ARG WITH_ALL_LOCALES="no" LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T20:24:29Z" \ + org.opencontainers.image.created="2023-12-17T11:07:47Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.1.6-debian-11-r2" \ + org.opencontainers.image.ref.name="4.1.7-debian-11-r1" \ org.opencontainers.image.title="moodle" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="4.1.6" + org.opencontainers.image.version="4.1.7" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates cron curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libedit2 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 locales openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.1.24-3-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.57-12-linux-${OS_ARCH}-debian-11" \ - "postgresql-client-13.12.0-1-linux-${OS_ARCH}-debian-11" \ - "mysql-client-11.1.2-0-linux-${OS_ARCH}-debian-11" \ - "libphp-8.1.24-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "moodle-4.1.6-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "php-8.1.26-11-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.58-2-linux-${OS_ARCH}-debian-11" \ + "postgresql-client-13.13.0-0-linux-${OS_ARCH}-debian-11" \ + "mysql-client-11.1.3-0-linux-${OS_ARCH}-debian-11" \ + "libphp-8.1.26-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "moodle-4.1.7-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -63,7 +63,7 @@ RUN /opt/bitnami/scripts/moodle/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ - APP_VERSION="4.1.6" \ + APP_VERSION="4.1.7" \ BITNAMI_APP_NAME="moodle" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ diff --git a/bitnami/moodle/4.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/moodle/4.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index a2c389c41101c..acf3b431b32bc 100644 --- a/bitnami/moodle/4.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/moodle/4.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,42 +3,42 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.57-12" + "version": "2.4.58-2" }, "libphp": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.24-0" + "version": "8.1.26-0" }, "moodle": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.1.6-0" + "version": "4.1.7-1" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.1.2-0" + "version": "11.1.3-0" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.24-3" + "version": "8.1.26-11" }, "postgresql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "13.12.0-1" + "version": "13.13.0-0" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" } } \ No newline at end of file diff --git a/bitnami/moodle/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/moodle/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/moodle/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/moodle/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/moodle/4.1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/moodle/4.1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/moodle/4.1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/moodle/4.1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/moodle/4.1/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/moodle/4.1/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh index 765d1d8ce1ed5..6a480ad4ddde9 100755 --- a/bitnami/moodle/4.1/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh +++ b/bitnami/moodle/4.1/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh @@ -46,6 +46,7 @@ apache_setup_bitnami_config() { local -a modules_to_disable=( "http2_module" "proxy_hcheck_module" + "proxy_html_module" "proxy_http2_module" ) for module in "${modules_to_disable[@]}"; do diff --git a/bitnami/moodle/4.1/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh b/bitnami/moodle/4.1/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh index b7e043bf4d1c6..0b7dc4bdc449c 100644 --- a/bitnami/moodle/4.1/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh +++ b/bitnami/moodle/4.1/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh @@ -156,6 +156,14 @@ moodle_initialize() { read -r -a extra_args <<<"$MOODLE_INSTALL_EXTRA_ARGS" [[ "${#extra_args[@]}" -gt 0 ]] && moodle_install_args+=("${extra_args[@]}") + # Handle --prefix (table prefix) being overridden via MOODLE_INSTALL_EXTRA_ARGS + mdl_prefix="mdl_" + for extra_arg in "${extra_args[@]}"; do + if [[ $extra_arg == --prefix=* ]]; then + mdl_prefix=${extra_arg#--prefix=} + break + fi + done # Setup Moodle if ! is_boolean_yes "$MOODLE_SKIP_BOOTSTRAP"; then info "Running Moodle install script" @@ -166,17 +174,17 @@ moodle_initialize() { [[ "$db_type" = "pgsql" ]] && db_remote_execute="postgresql_remote_execute" local -a db_execute_args=("$db_host" "$db_port" "$db_name" "$db_user" "$db_pass") # Configure no-reply e-mail address for SMTP - echo "INSERT INTO mdl_config (name, value) VALUES ('noreplyaddress', '${MOODLE_EMAIL}')" | "$db_remote_execute" "${db_execute_args[@]}" + echo "INSERT INTO ${mdl_prefix}config (name, value) VALUES ('noreplyaddress', '${MOODLE_EMAIL}')" | "$db_remote_execute" "${db_execute_args[@]}" # Additional Bitnami customizations - echo "UPDATE mdl_course SET summary='Moodle powered by Bitnami' WHERE id='1'" | "$db_remote_execute" "${db_execute_args[@]}" + echo "UPDATE ${mdl_prefix}course SET summary='Moodle powered by Bitnami' WHERE id='1'" | "$db_remote_execute" "${db_execute_args[@]}" # SMTP configuration if ! is_empty_value "$MOODLE_SMTP_HOST"; then info "Configuring SMTP credentials" "$db_remote_execute" "${db_execute_args[@]}" <&2 echo "No arguments provided" - exit 1 -fi - -script=$1 -exit_code="${2:-96}" -fail_if_not_present="${3:-n}" - -if test -f "$script"; then - sh $script - - if [ $? -ne 0 ]; then - exit $((exit_code)) - fi -elif [ "$fail_if_not_present" = "y" ]; then - >&2 echo "script not found: $script" - exit 127 -fi diff --git a/bitnami/mxnet/1/debian-11/rootfs/opt/bitnami/scripts/mxnet/entrypoint.sh b/bitnami/mxnet/1/debian-11/rootfs/opt/bitnami/scripts/mxnet/entrypoint.sh deleted file mode 100755 index f54be5f43f9a3..0000000000000 --- a/bitnami/mxnet/1/debian-11/rootfs/opt/bitnami/scripts/mxnet/entrypoint.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -#set -o xtrace - -# Load libraries -. /opt/bitnami/scripts/libbitnami.sh - -print_welcome_page - -echo "" -exec "$@" diff --git a/bitnami/mxnet/1/debian-11/rootfs/opt/bitnami/scripts/mxnet/postunpack.sh b/bitnami/mxnet/1/debian-11/rootfs/opt/bitnami/scripts/mxnet/postunpack.sh deleted file mode 100755 index 625c891c572a1..0000000000000 --- a/bitnami/mxnet/1/debian-11/rootfs/opt/bitnami/scripts/mxnet/postunpack.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -# Load libraries -. /opt/bitnami/scripts/libfs.sh - -MXNET_BASEDIR="/opt/bitnami/python" -MXNET_WORKSPACE="/app" - -# Ensure non-root user has write permissions on the workspace -ensure_dir_exists "$MXNET_WORKSPACE" - -chmod -R g+rwX "$MXNET_BASEDIR" "$MXNET_WORKSPACE" diff --git a/bitnami/mxnet/docker-compose.yml b/bitnami/mxnet/docker-compose.yml deleted file mode 100644 index 8f697bc48c106..0000000000000 --- a/bitnami/mxnet/docker-compose.yml +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -version: '2' - -services: - mxnet: - image: docker.io/bitnami/mxnet:1 - command: sleep infinity - volumes: - - mxnet_data:/bitnami -volumes: - mxnet_data: - driver: local diff --git a/bitnami/mysql/8.0/debian-11/Dockerfile b/bitnami/mysql/8.0/debian-11/Dockerfile index 9b1822c2f679b..bdb854c3ac5f9 100644 --- a/bitnami/mysql/8.0/debian-11/Dockerfile +++ b/bitnami/mysql/8.0/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T12:27:59Z" \ + org.opencontainers.image.created="2023-11-24T12:58:08Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.0.35-debian-11-r0" \ + org.opencontainers.image.ref.name="8.0.35-debian-11-r1" \ org.opencontainers.image.title="mysql" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="8.0.35" @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl gcc-10 libaio1 libcom-err2 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libsasl2-2 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps psmisc -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ini-file-1.4.6-2-linux-${OS_ARCH}-debian-11" \ + "ini-file-1.4.6-3-linux-${OS_ARCH}-debian-11" \ "mysql-8.0.35-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/mysql/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mysql/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index d5054549751e3..49cada8d15da4 100644 --- a/bitnami/mysql/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mysql/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-2" + "version": "1.4.6-3" }, "mysql": { "arch": "amd64", diff --git a/bitnami/mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mysql/8.2/debian-11/Dockerfile b/bitnami/mysql/8.2/debian-11/Dockerfile index bbf1eda940fba..cf6e7f3c972f1 100644 --- a/bitnami/mysql/8.2/debian-11/Dockerfile +++ b/bitnami/mysql/8.2/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-29T16:27:48Z" \ + org.opencontainers.image.created="2023-11-28T16:52:23Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.2.0-debian-11-r0" \ + org.opencontainers.image.ref.name="8.2.0-debian-11-r1" \ org.opencontainers.image.title="mysql" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="8.2.0" @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl gcc-10 libaio1 libcom-err2 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libsasl2-2 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps psmisc -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ini-file-1.4.6-2-linux-${OS_ARCH}-debian-11" \ + "ini-file-1.4.6-3-linux-${OS_ARCH}-debian-11" \ "mysql-8.2.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/mysql/8.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mysql/8.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index f921956dd0a80..1bea3eb559f0c 100644 --- a/bitnami/mysql/8.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mysql/8.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-2" + "version": "1.4.6-3" }, "mysql": { "arch": "amd64", diff --git a/bitnami/mysql/8.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mysql/8.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mysql/8.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mysql/8.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mysql/README.md b/bitnami/mysql/README.md index b0e4c8655ebed..f02a89a5c8cc4 100644 --- a/bitnami/mysql/README.md +++ b/bitnami/mysql/README.md @@ -1,4 +1,4 @@ -# MySQL packaged by Bitnami +# Bitnami package for MySQL ## What is MySQL? @@ -27,7 +27,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/mysqld-exporter/0/debian-11/Dockerfile b/bitnami/mysqld-exporter/0/debian-11/Dockerfile index b6a94c0e7a064..72f3716d13a85 100644 --- a/bitnami/mysqld-exporter/0/debian-11/Dockerfile +++ b/bitnami/mysqld-exporter/0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T07:48:14Z" \ + org.opencontainers.image.created="2023-12-12T16:24:57Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.15.0-debian-11-r70" \ + org.opencontainers.image.ref.name="0.15.1-debian-11-r0" \ org.opencontainers.image.title="mysqld-exporter" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.15.0" + org.opencontainers.image.version="0.15.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "mysqld-exporter-0.15.0-4-linux-${OS_ARCH}-debian-11" \ - ) && \ + "mysqld-exporter-0.15.1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -43,7 +43,7 @@ RUN apt-get autoremove --purge -y curl && \ RUN chmod g+rwX /opt/bitnami RUN ln -sf /opt/bitnami/mysqld-exporter/bin/mysqld_exporter /bin/mysqld_exporter -ENV APP_VERSION="0.15.0" \ +ENV APP_VERSION="0.15.1" \ BITNAMI_APP_NAME="mysqld-exporter" \ PATH="/opt/bitnami/mysqld-exporter/bin:$PATH" diff --git a/bitnami/mysqld-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mysqld-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index dc9485d1de6a3..7aebe74d77f54 100644 --- a/bitnami/mysqld-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mysqld-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.15.0-4" + "version": "0.15.1-0" } } \ No newline at end of file diff --git a/bitnami/mysqld-exporter/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mysqld-exporter/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/mysqld-exporter/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mysqld-exporter/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/mysqld-exporter/0/debian-11/tags-info.yaml b/bitnami/mysqld-exporter/0/debian-11/tags-info.yaml index b8d0a75d0f276..46994ab20af1a 100644 --- a/bitnami/mysqld-exporter/0/debian-11/tags-info.yaml +++ b/bitnami/mysqld-exporter/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.15.0 +- 0.15.1 - latest diff --git a/bitnami/mysqld-exporter/README.md b/bitnami/mysqld-exporter/README.md index 8b1d0ba3c8bc4..94e4cb07f6c58 100644 --- a/bitnami/mysqld-exporter/README.md +++ b/bitnami/mysqld-exporter/README.md @@ -1,4 +1,4 @@ -# MySQL Server Exporter packaged by Bitnami +# Bitnami package for MySQL Server Exporter ## What is MySQL Server Exporter? @@ -18,7 +18,7 @@ docker run --name mysqld-exporter bitnami/mysqld-exporter:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/nats-exporter/0/debian-11/Dockerfile b/bitnami/nats-exporter/0/debian-11/Dockerfile index 1ba8808ba435e..98000ac479f7c 100644 --- a/bitnami/nats-exporter/0/debian-11/Dockerfile +++ b/bitnami/nats-exporter/0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T06:52:59Z" \ + org.opencontainers.image.created="2023-12-06T19:46:38Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.12.0-debian-11-r97" \ + org.opencontainers.image.ref.name="0.13.0-debian-11-r2" \ org.opencontainers.image.title="nats-exporter" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.12.0" + org.opencontainers.image.version="0.13.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "nats-exporter-0.12.0-7-linux-${OS_ARCH}-debian-11" \ - ) && \ + "nats-exporter-0.13.0-3-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="0.12.0" \ +ENV APP_VERSION="0.13.0" \ BITNAMI_APP_NAME="nats-exporter" \ PATH="/opt/bitnami/nats-exporter/bin:$PATH" diff --git a/bitnami/nats-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/nats-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 9b13a094efe18..5f3b4ebd229bd 100644 --- a/bitnami/nats-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/nats-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.12.0-7" + "version": "0.13.0-3" } } \ No newline at end of file diff --git a/bitnami/nats-exporter/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/nats-exporter/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/nats-exporter/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/nats-exporter/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/nats-exporter/0/debian-11/tags-info.yaml b/bitnami/nats-exporter/0/debian-11/tags-info.yaml index e38fc19bff7fc..f688bdf1fc76c 100644 --- a/bitnami/nats-exporter/0/debian-11/tags-info.yaml +++ b/bitnami/nats-exporter/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.12.0 +- 0.13.0 - latest diff --git a/bitnami/nats-exporter/README.md b/bitnami/nats-exporter/README.md index be55d2a350de9..1c7a98e30ff74 100644 --- a/bitnami/nats-exporter/README.md +++ b/bitnami/nats-exporter/README.md @@ -1,4 +1,4 @@ -# NATS Exporter packaged by Bitnami +# Bitnami package for NATS Exporter ## What is NATS Exporter? @@ -18,7 +18,7 @@ docker run --name nats-exporter bitnami/nats-exporter:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/nats/2/debian-11/Dockerfile b/bitnami/nats/2/debian-11/Dockerfile index bca38c7f8978b..7d8b64b2eb436 100644 --- a/bitnami/nats/2/debian-11/Dockerfile +++ b/bitnami/nats/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-27T19:27:00Z" \ + org.opencontainers.image.created="2023-12-07T09:41:33Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.10.4-debian-11-r0" \ + org.opencontainers.image.ref.name="2.10.7-debian-11-r0" \ org.opencontainers.image.title="nats" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.10.4" + org.opencontainers.image.version="2.10.7" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl openssl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "nats-2.10.4-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "nats-2.10.7-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -45,7 +45,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/nats/postunpack.sh -ENV APP_VERSION="2.10.4" \ +ENV APP_VERSION="2.10.7" \ BITNAMI_APP_NAME="nats" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/nats/bin:$PATH" diff --git a/bitnami/nats/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/nats/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index db722d441df50..fba63c51437e4 100644 --- a/bitnami/nats/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/nats/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.10.4-0" + "version": "2.10.7-0" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" } } \ No newline at end of file diff --git a/bitnami/nats/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/nats/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/nats/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/nats/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/nats/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/nats/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/nats/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/nats/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/nats/2/debian-11/tags-info.yaml b/bitnami/nats/2/debian-11/tags-info.yaml index 38d8ca5b559d6..255d9fa5d1e0e 100644 --- a/bitnami/nats/2/debian-11/tags-info.yaml +++ b/bitnami/nats/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.10.4 +- 2.10.7 - latest diff --git a/bitnami/nats/README.md b/bitnami/nats/README.md index 450f329e8fffc..1e32cc1757338 100644 --- a/bitnami/nats/README.md +++ b/bitnami/nats/README.md @@ -1,4 +1,4 @@ -# NATS packaged by Bitnami +# Bitnami package for NATS ## What is NATS? @@ -25,7 +25,7 @@ docker-compose up * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/natscli/0/debian-11/Dockerfile b/bitnami/natscli/0/debian-11/Dockerfile index 963101ad56471..ac361fccf11e6 100644 --- a/bitnami/natscli/0/debian-11/Dockerfile +++ b/bitnami/natscli/0/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T13:27:14Z" \ + org.opencontainers.image.created="2023-12-07T11:01:09Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.1.1-debian-11-r0" \ + org.opencontainers.image.ref.name="0.1.1-debian-11-r2" \ org.opencontainers.image.title="natscli" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="0.1.1" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "natscli-0.1.1-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "natscli-0.1.1-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/natscli/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/natscli/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 666330c21561a..bbf3a1add6e71 100644 --- a/bitnami/natscli/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/natscli/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.1.1-0" + "version": "0.1.1-2" } } \ No newline at end of file diff --git a/bitnami/natscli/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/natscli/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/natscli/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/natscli/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/natscli/README.md b/bitnami/natscli/README.md index 61e0a86f0e177..eceac0b30b4c8 100644 --- a/bitnami/natscli/README.md +++ b/bitnami/natscli/README.md @@ -1,4 +1,4 @@ -# NATS CLI packaged by Bitnami +# Bitnami package for NATS CLI ## What is NATS CLI? @@ -22,12 +22,12 @@ docker-compose up -d ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use NATS CLI in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/neo4j/4/debian-11/Dockerfile b/bitnami/neo4j/4/debian-11/Dockerfile index 9d9ec8052db0e..a780593d2474f 100644 --- a/bitnami/neo4j/4/debian-11/Dockerfile +++ b/bitnami/neo4j/4/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T17:52:58Z" \ + org.opencontainers.image.created="2023-11-21T19:52:10Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.4.26-debian-11-r2" \ + org.opencontainers.image.ref.name="4.4.28-debian-11-r1" \ org.opencontainers.image.title="neo4j" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="4.4.26" + org.opencontainers.image.version="4.4.28" ENV HOME="/opt/bitnami/neo4j/.home" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -27,8 +27,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl jq procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "java-11.0.20-8-5-linux-${OS_ARCH}-debian-11" \ - "neo4j-4.4.26-0-linux-${OS_ARCH}-debian-11" \ + "java-11.0.21-10-6-linux-${OS_ARCH}-debian-11" \ + "neo4j-4.4.28-1-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -47,7 +47,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/neo4j/postunpack.sh -ENV APP_VERSION="4.4.26" \ +ENV APP_VERSION="4.4.28" \ BITNAMI_APP_NAME="neo4j" \ JAVA_HOME="/opt/bitnami/java" \ JAVA_OPTS="-Duser.home=/opt/bitnami/neo4j/.home" \ diff --git a/bitnami/neo4j/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/neo4j/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index e3ff726519355..4c82c65458ee6 100644 --- a/bitnami/neo4j/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/neo4j/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.0.20-8-5" + "version": "11.0.21-10-6" }, "neo4j": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.4.26-0" + "version": "4.4.28-1" } } \ No newline at end of file diff --git a/bitnami/neo4j/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/neo4j/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/neo4j/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/neo4j/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/neo4j/4/debian-11/tags-info.yaml b/bitnami/neo4j/4/debian-11/tags-info.yaml index da1ddeb866500..a6f15dae5be3e 100644 --- a/bitnami/neo4j/4/debian-11/tags-info.yaml +++ b/bitnami/neo4j/4/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "4" - 4-debian-11 -- 4.4.26 +- 4.4.28 diff --git a/bitnami/neo4j/5/debian-11/Dockerfile b/bitnami/neo4j/5/debian-11/Dockerfile index a507e9c0a025f..d15195fd64336 100644 --- a/bitnami/neo4j/5/debian-11/Dockerfile +++ b/bitnami/neo4j/5/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-26T16:35:58Z" \ + org.opencontainers.image.created="2023-12-18T21:06:30Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.13.0-debian-11-r0" \ + org.opencontainers.image.ref.name="5.15.0-debian-11-r0" \ org.opencontainers.image.title="neo4j" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="5.13.0" + org.opencontainers.image.version="5.15.0" ENV HOME="/opt/bitnami/neo4j/.home" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,21 +22,21 @@ ENV HOME="/opt/bitnami/neo4j/.home" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl jq procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.9-11-1-linux-${OS_ARCH}-debian-11" \ - "neo4j-5.13.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "neo4j-5.15.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -47,7 +47,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/neo4j/postunpack.sh -ENV APP_VERSION="5.13.0" \ +ENV APP_VERSION="5.15.0" \ BITNAMI_APP_NAME="neo4j" \ JAVA_HOME="/opt/bitnami/java" \ JAVA_OPTS="-Duser.home=/opt/bitnami/neo4j/.home" \ diff --git a/bitnami/neo4j/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/neo4j/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 5b3b9a8da241f..2b82aa5cd6f07 100644 --- a/bitnami/neo4j/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/neo4j/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.9-11-1" + "version": "17.0.9-11-6" }, "neo4j": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "5.13.0-0" + "version": "5.15.0-0" } } \ No newline at end of file diff --git a/bitnami/neo4j/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/neo4j/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/neo4j/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/neo4j/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/neo4j/5/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/neo4j/5/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/neo4j/5/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/neo4j/5/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/neo4j/5/debian-11/tags-info.yaml b/bitnami/neo4j/5/debian-11/tags-info.yaml index 013f013288227..53f4a7dfca2d3 100644 --- a/bitnami/neo4j/5/debian-11/tags-info.yaml +++ b/bitnami/neo4j/5/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "5" - 5-debian-11 -- 5.13.0 +- 5.15.0 - latest diff --git a/bitnami/neo4j/README.md b/bitnami/neo4j/README.md index 09a880cbce269..98a9637a2cc97 100644 --- a/bitnami/neo4j/README.md +++ b/bitnami/neo4j/README.md @@ -1,4 +1,4 @@ -# Neo4j packaged by Bitnami +# Bitnami package for Neo4j ## What is Neo4j? @@ -27,7 +27,7 @@ You can find the default credentials and available configuration options in the * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/nginx-exporter/0/debian-11/Dockerfile b/bitnami/nginx-exporter/0/debian-11/Dockerfile index 43e4a733f7408..ab7d08456df49 100644 --- a/bitnami/nginx-exporter/0/debian-11/Dockerfile +++ b/bitnami/nginx-exporter/0/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T07:14:48Z" \ + org.opencontainers.image.created="2023-12-07T12:52:25Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.11.0-debian-11-r369" \ + org.opencontainers.image.ref.name="0.11.0-debian-11-r371" \ org.opencontainers.image.title="nginx-exporter" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="0.11.0" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "nginx-exporter-0.11.0-14-linux-${OS_ARCH}-debian-11" \ - ) && \ + "nginx-exporter-0.11.0-16-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/nginx-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/nginx-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 0e2921e8bcc89..6e4acc28545f6 100644 --- a/bitnami/nginx-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/nginx-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.11.0-14" + "version": "0.11.0-16" } } \ No newline at end of file diff --git a/bitnami/nginx-exporter/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/nginx-exporter/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/nginx-exporter/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/nginx-exporter/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/nginx-exporter/README.md b/bitnami/nginx-exporter/README.md index ddb6708742aa1..46c733274130e 100644 --- a/bitnami/nginx-exporter/README.md +++ b/bitnami/nginx-exporter/README.md @@ -1,4 +1,4 @@ -# NGINX Exporter packaged by Bitnami +# Bitnami package for NGINX Exporter ## What is NGINX Exporter? @@ -18,7 +18,7 @@ docker run --name nginx-exporter bitnami/nginx-exporter:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/nginx-ingress-controller/1/debian-11/Dockerfile b/bitnami/nginx-ingress-controller/1/debian-11/Dockerfile index 5078cffc5e04f..6c0c619b98a37 100644 --- a/bitnami/nginx-ingress-controller/1/debian-11/Dockerfile +++ b/bitnami/nginx-ingress-controller/1/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T23:20:38Z" \ + org.opencontainers.image.created="2023-12-07T11:27:17Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.9.4-debian-11-r0" \ + org.opencontainers.image.ref.name="1.9.4-debian-11-r3" \ org.opencontainers.image.title="nginx-ingress-controller" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.9.4" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbrotli1 libcap2-bin libcom-err2 libcrypt1 libcurl4 libffi7 libgcc-s1 libgcrypt20 libgeoip1 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libnettle8 libnghttp2-14 libp11-kit0 libpcre3 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libstdc++6 libtasn1-6 libunistring2 libxml2 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "nginx-ingress-controller-1.9.4-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "nginx-ingress-controller-1.9.4-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 0a9bee204a8ad..f9a92288b619b 100644 --- a/bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.9.4-0" + "version": "1.9.4-2" } } \ No newline at end of file diff --git a/bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/nginx-ingress-controller/README.md b/bitnami/nginx-ingress-controller/README.md index 6ab02210d6931..3b94fc9c54b85 100644 --- a/bitnami/nginx-ingress-controller/README.md +++ b/bitnami/nginx-ingress-controller/README.md @@ -1,4 +1,4 @@ -# NGINX Ingress Controller packaged by Bitnami +# Bitnami package for NGINX Ingress Controller ## What is NGINX Ingress Controller? @@ -20,7 +20,7 @@ docker run --name nginx-ingress-controller bitnami/nginx-ingress-controller:late * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/nginx/1.24/debian-11/Dockerfile b/bitnami/nginx/1.24/debian-11/Dockerfile index 25d9dc9eb28ed..0ae1f1001f140 100644 --- a/bitnami/nginx/1.24/debian-11/Dockerfile +++ b/bitnami/nginx/1.24/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T20:52:48Z" \ + org.opencontainers.image.created="2023-12-09T01:03:05Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.24.0-debian-11-r152" \ + org.opencontainers.image.ref.name="1.24.0-debian-11-r154" \ org.opencontainers.image.title="nginx" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.24.0" @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libcrypt1 libgeoip1 libpcre3 libssl1.1 openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "render-template-1.0.6-1-linux-${OS_ARCH}-debian-11" \ - "nginx-1.24.0-11-linux-${OS_ARCH}-debian-11" \ - ) && \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "nginx-1.24.0-12-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/nginx/1.24/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/nginx/1.24/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index a6ef488838e86..d724e0044af05 100644 --- a/bitnami/nginx/1.24/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/nginx/1.24/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.24.0-11" + "version": "1.24.0-12" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-1" + "version": "1.0.6-4" } } \ No newline at end of file diff --git a/bitnami/nginx/1.24/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/nginx/1.24/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/nginx/1.24/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/nginx/1.24/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/nginx/1.24/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/nginx/1.24/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/nginx/1.24/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/nginx/1.24/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/nginx/1.24/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf b/bitnami/nginx/1.24/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf index 6c2b5b1ba288f..aaf0428032c41 100644 --- a/bitnami/nginx/1.24/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf +++ b/bitnami/nginx/1.24/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf @@ -33,7 +33,7 @@ http { gzip_proxied any; gzip_types text/plain text/css application/javascript text/xml application/xml+rss; keepalive_timeout 65; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; + ssl_protocols TLSv1.2 TLSv1.3; ssl_ciphers HIGH:!aNULL:!MD5; client_max_body_size 80M; server_tokens off; diff --git a/bitnami/nginx/1.25/debian-11/Dockerfile b/bitnami/nginx/1.25/debian-11/Dockerfile index ed383278494f4..11ca36c2dd7fb 100644 --- a/bitnami/nginx/1.25/debian-11/Dockerfile +++ b/bitnami/nginx/1.25/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T19:44:12Z" \ + org.opencontainers.image.created="2023-12-09T01:05:31Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.25.3-debian-11-r0" \ + org.opencontainers.image.ref.name="1.25.3-debian-11-r2" \ org.opencontainers.image.title="nginx" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.25.3" @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libcrypt1 libgeoip1 libpcre3 libssl1.1 openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "nginx-1.25.3-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "nginx-1.25.3-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/nginx/1.25/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/nginx/1.25/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 34571db801f84..6f0973799e3da 100644 --- a/bitnami/nginx/1.25/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/nginx/1.25/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.25.3-0" + "version": "1.25.3-1" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" } } \ No newline at end of file diff --git a/bitnami/nginx/1.25/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/nginx/1.25/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/nginx/1.25/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/nginx/1.25/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/nginx/1.25/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/nginx/1.25/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/nginx/1.25/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/nginx/1.25/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/nginx/1.25/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf b/bitnami/nginx/1.25/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf index 6c2b5b1ba288f..aaf0428032c41 100644 --- a/bitnami/nginx/1.25/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf +++ b/bitnami/nginx/1.25/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf @@ -33,7 +33,7 @@ http { gzip_proxied any; gzip_types text/plain text/css application/javascript text/xml application/xml+rss; keepalive_timeout 65; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; + ssl_protocols TLSv1.2 TLSv1.3; ssl_ciphers HIGH:!aNULL:!MD5; client_max_body_size 80M; server_tokens off; diff --git a/bitnami/nginx/README.md b/bitnami/nginx/README.md index 883541a184b20..b591f3a98c33c 100644 --- a/bitnami/nginx/README.md +++ b/bitnami/nginx/README.md @@ -1,4 +1,4 @@ -# NGINX Open Source packaged by Bitnami +# Bitnami package for NGINX Open Source ## What is NGINX Open Source? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/node-exporter/1/debian-11/Dockerfile b/bitnami/node-exporter/1/debian-11/Dockerfile index 97835c0bcba4c..a67b38d24c853 100644 --- a/bitnami/node-exporter/1/debian-11/Dockerfile +++ b/bitnami/node-exporter/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T07:21:21Z" \ + org.opencontainers.image.created="2023-12-06T23:04:03Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.6.1-debian-11-r78" \ + org.opencontainers.image.ref.name="1.7.0-debian-11-r1" \ org.opencontainers.image.title="node-exporter" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.6.1" + org.opencontainers.image.version="1.7.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "node-exporter-1.6.1-5-linux-${OS_ARCH}-debian-11" \ - ) && \ + "node-exporter-1.7.0-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="1.6.1" \ +ENV APP_VERSION="1.7.0" \ BITNAMI_APP_NAME="node-exporter" \ PATH="/opt/bitnami/node-exporter/bin:$PATH" diff --git a/bitnami/node-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/node-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 87ea3df007071..094be896652ea 100644 --- a/bitnami/node-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/node-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.6.1-5" + "version": "1.7.0-1" } } \ No newline at end of file diff --git a/bitnami/node-exporter/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/node-exporter/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/node-exporter/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/node-exporter/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/node-exporter/1/debian-11/tags-info.yaml b/bitnami/node-exporter/1/debian-11/tags-info.yaml index 817e36b64569d..c12a7a21c494f 100644 --- a/bitnami/node-exporter/1/debian-11/tags-info.yaml +++ b/bitnami/node-exporter/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.6.1 +- 1.7.0 - latest diff --git a/bitnami/node-exporter/README.md b/bitnami/node-exporter/README.md index 3c62bc9cf96af..746864c550868 100644 --- a/bitnami/node-exporter/README.md +++ b/bitnami/node-exporter/README.md @@ -1,4 +1,4 @@ -# Node Exporter packaged by Bitnami +# Bitnami package for Node Exporter ## What is Node Exporter? @@ -18,7 +18,7 @@ docker run --name node-exporter bitnami/node-exporter:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/node/16/debian-11/Dockerfile b/bitnami/node/16/debian-11/Dockerfile index 74231b32858a6..33a5950c7773c 100644 --- a/bitnami/node/16/debian-11/Dockerfile +++ b/bitnami/node/16/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T06:17:30Z" \ + org.opencontainers.image.created="2023-12-02T09:08:54Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="16.20.2-debian-11-r51" \ + org.opencontainers.image.ref.name="16.20.2-debian-11-r53" \ org.opencontainers.image.title="node" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="16.20.2" @@ -20,21 +20,21 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages build-essential ca-certificates curl git libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libsqlite3-dev libssl-dev libssl1.1 libstdc++6 libtinfo6 libtirpc3 pkg-config procps unzip wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ + "python-3.11.6-11-linux-${OS_ARCH}-debian-11" \ "node-16.20.2-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/node/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/node/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c516bdb97cc58..47d9145fbff3d 100644 --- a/bitnami/node/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/node/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,6 +9,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.6-11" } } \ No newline at end of file diff --git a/bitnami/node/16/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/node/16/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/node/16/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/node/16/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/node/18/debian-11/Dockerfile b/bitnami/node/18/debian-11/Dockerfile index f007624acf0c4..d85a3d8bb2264 100644 --- a/bitnami/node/18/debian-11/Dockerfile +++ b/bitnami/node/18/debian-11/Dockerfile @@ -7,34 +7,34 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T06:18:03Z" \ + org.opencontainers.image.created="2023-12-02T09:05:30Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="18.18.2-debian-11-r1" \ + org.opencontainers.image.ref.name="18.19.0-debian-11-r1" \ org.opencontainers.image.title="node" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="18.18.2" + org.opencontainers.image.version="18.19.0" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages build-essential ca-certificates curl git libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libsqlite3-dev libssl-dev libssl1.1 libstdc++6 libtinfo6 libtirpc3 pkg-config procps unzip wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "node-18.18.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.6-11-linux-${OS_ARCH}-debian-11" \ + "node-18.19.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -44,7 +44,7 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ sed -i 's/^PASS_MIN_DAYS.*/PASS_MIN_DAYS 0/' /etc/login.defs && \ sed -i 's/sha512/sha512 minlen=8/' /etc/pam.d/common-password -ENV APP_VERSION="18.18.2" \ +ENV APP_VERSION="18.19.0" \ BITNAMI_APP_NAME="node" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/node/bin:$PATH" diff --git a/bitnami/node/18/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/node/18/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 45ead13faa2ea..caceecfcd0b89 100644 --- a/bitnami/node/18/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/node/18/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "18.18.2-0" + "version": "18.19.0-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.6-11" } } \ No newline at end of file diff --git a/bitnami/node/18/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/node/18/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/node/18/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/node/18/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/node/18/debian-11/tags-info.yaml b/bitnami/node/18/debian-11/tags-info.yaml index dda40ab1c4298..340e8104e40d4 100644 --- a/bitnami/node/18/debian-11/tags-info.yaml +++ b/bitnami/node/18/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "18" - 18-debian-11 -- 18.18.2 +- 18.19.0 diff --git a/bitnami/node/20/debian-11/Dockerfile b/bitnami/node/20/debian-11/Dockerfile index 33f16b92a78cb..e0d1c7fd690d3 100644 --- a/bitnami/node/20/debian-11/Dockerfile +++ b/bitnami/node/20/debian-11/Dockerfile @@ -7,34 +7,34 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T18:26:01Z" \ + org.opencontainers.image.created="2023-12-02T07:33:35Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="20.9.0-debian-11-r0" \ + org.opencontainers.image.ref.name="20.10.0-debian-11-r1" \ org.opencontainers.image.title="node" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="20.9.0" + org.opencontainers.image.version="20.10.0" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages build-essential ca-certificates curl git libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libsqlite3-dev libssl-dev libssl1.1 libstdc++6 libtinfo6 libtirpc3 pkg-config procps unzip wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "node-20.9.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.6-11-linux-${OS_ARCH}-debian-11" \ + "node-20.10.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -44,7 +44,7 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ sed -i 's/^PASS_MIN_DAYS.*/PASS_MIN_DAYS 0/' /etc/login.defs && \ sed -i 's/sha512/sha512 minlen=8/' /etc/pam.d/common-password -ENV APP_VERSION="20.9.0" \ +ENV APP_VERSION="20.10.0" \ BITNAMI_APP_NAME="node" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/node/bin:$PATH" diff --git a/bitnami/node/20/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/node/20/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index bb578cb0e0056..b4231c0b89614 100644 --- a/bitnami/node/20/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/node/20/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "20.9.0-0" + "version": "20.10.0-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.6-11" } } \ No newline at end of file diff --git a/bitnami/node/20/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/node/20/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/node/20/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/node/20/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/node/20/debian-11/tags-info.yaml b/bitnami/node/20/debian-11/tags-info.yaml index 2937901e7d43c..1cc1834b920d4 100644 --- a/bitnami/node/20/debian-11/tags-info.yaml +++ b/bitnami/node/20/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "20" - 20-debian-11 -- 20.9.0 +- 20.10.0 - latest diff --git a/bitnami/node/README.md b/bitnami/node/README.md index b0706d739e12a..7d480268adcd7 100644 --- a/bitnami/node/README.md +++ b/bitnami/node/README.md @@ -1,4 +1,4 @@ -# Node.js packaged by Bitnami +# Bitnami package for Node.js ## What is Node.js? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/notation/1/debian-11/Dockerfile b/bitnami/notation/1/debian-11/Dockerfile index 4ef07dad1522c..122848a7ccee5 100644 --- a/bitnami/notation/1/debian-11/Dockerfile +++ b/bitnami/notation/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T08:32:51Z" \ + org.opencontainers.image.created="2023-12-07T11:25:55Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.0.0-debian-11-r1" \ + org.opencontainers.image.ref.name="1.0.1-debian-11-r2" \ org.opencontainers.image.title="notation" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.0.0" + org.opencontainers.image.version="1.0.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "notation-1.0.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "notation-1.0.1-3-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -43,7 +43,7 @@ RUN apt-get autoremove --purge -y curl && \ RUN chmod g+rwX /opt/bitnami RUN mkdir -p "/.config" && chmod g+rwX "/.config" -ENV APP_VERSION="1.0.0" \ +ENV APP_VERSION="1.0.1" \ BITNAMI_APP_NAME="notation" \ PATH="/opt/bitnami/notation/bin:$PATH" diff --git a/bitnami/notation/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/notation/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 894ae6a63c2ba..7a78018319355 100644 --- a/bitnami/notation/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/notation/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.0-0" + "version": "1.0.1-3" } } \ No newline at end of file diff --git a/bitnami/notation/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/notation/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/notation/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/notation/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/notation/1/debian-11/tags-info.yaml b/bitnami/notation/1/debian-11/tags-info.yaml index bb856c8a7b9bd..a8f651b3a58c8 100644 --- a/bitnami/notation/1/debian-11/tags-info.yaml +++ b/bitnami/notation/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.0.0 +- 1.0.1 - latest diff --git a/bitnami/notation/README.md b/bitnami/notation/README.md index b7e4eb14ce27d..ea4e3c17c2425 100644 --- a/bitnami/notation/README.md +++ b/bitnami/notation/README.md @@ -1,10 +1,10 @@ -# Notation packaged by Bitnami +# Bitnami package for Notation ## What is Notation? > Notation is a CLI project to add signatures as standard items in the OCI registry ecosystem, and to build a set of simple tooling for signing and verifying these signatures. -[Overview of Notation](https://github.com/notaryproject/notation) +[Overview of Notation](https://notaryproject.dev) Trademarks: This software listing is packaged by Bitnami. The respective trademarks mentioned in the offering are owned by the respective companies, and use of them does not imply any affiliation or endorsement. ## TL;DR @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/oauth2-proxy/7/debian-11/Dockerfile b/bitnami/oauth2-proxy/7/debian-11/Dockerfile index ec3a982274586..c203c85c5443c 100644 --- a/bitnami/oauth2-proxy/7/debian-11/Dockerfile +++ b/bitnami/oauth2-proxy/7/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T07:33:13Z" \ + org.opencontainers.image.created="2023-12-07T11:27:29Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.5.1-debian-11-r10" \ + org.opencontainers.image.ref.name="7.5.1-debian-11-r12" \ org.opencontainers.image.title="oauth2-proxy" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="7.5.1" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "oauth2-proxy-7.5.1-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "oauth2-proxy-7.5.1-5-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/oauth2-proxy/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/oauth2-proxy/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 2792ec1b882f5..e49307ee0ec05 100644 --- a/bitnami/oauth2-proxy/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/oauth2-proxy/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.5.1-3" + "version": "7.5.1-5" } } \ No newline at end of file diff --git a/bitnami/oauth2-proxy/7/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/oauth2-proxy/7/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/oauth2-proxy/7/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/oauth2-proxy/7/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/oauth2-proxy/README.md b/bitnami/oauth2-proxy/README.md index 3f778ab2b7f62..45399a805202e 100644 --- a/bitnami/oauth2-proxy/README.md +++ b/bitnami/oauth2-proxy/README.md @@ -1,4 +1,4 @@ -# OAuth2 Proxy packaged by Bitnami +# Bitnami package for OAuth2 Proxy ## What is OAuth2 Proxy? @@ -18,7 +18,7 @@ docker run --name oauth2-proxy bitnami/oauth2-proxy:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh deleted file mode 100644 index 184de8a117e28..0000000000000 --- a/bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Bitnami custom library - -# shellcheck disable=SC1091 - -# Load Generic Libraries -. /opt/bitnami/scripts/liblog.sh - -# Constants -BOLD='\033[1m' - -# Functions - -######################## -# Print the welcome page -# Globals: -# DISABLE_WELCOME_MESSAGE -# BITNAMI_APP_NAME -# Arguments: -# None -# Returns: -# None -######################### -print_welcome_page() { - if [[ -z "${DISABLE_WELCOME_MESSAGE:-}" ]]; then - if [[ -n "$BITNAMI_APP_NAME" ]]; then - print_image_welcome_page - fi - fi -} - -######################## -# Print the welcome page for a Bitnami Docker image -# Globals: -# BITNAMI_APP_NAME -# Arguments: -# None -# Returns: -# None -######################### -print_image_welcome_page() { - local github_url="https://github.com/bitnami/containers" - - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" -} - diff --git a/bitnami/odoo/14/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/odoo/14/debian-11/prebuildfs/usr/sbin/run-script deleted file mode 100755 index 4ca0f897277eb..0000000000000 --- a/bitnami/odoo/14/debian-11/prebuildfs/usr/sbin/run-script +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -set -u - -if [ $# -eq 0 ]; then - >&2 echo "No arguments provided" - exit 1 -fi - -script=$1 -exit_code="${2:-96}" -fail_if_not_present="${3:-n}" - -if test -f "$script"; then - sh $script - - if [ $? -ne 0 ]; then - exit $((exit_code)) - fi -elif [ "$fail_if_not_present" = "y" ]; then - >&2 echo "script not found: $script" - exit 127 -fi diff --git a/bitnami/odoo/14/debian-11/tags-info.yaml b/bitnami/odoo/14/debian-11/tags-info.yaml deleted file mode 100644 index 926e8405ce897..0000000000000 --- a/bitnami/odoo/14/debian-11/tags-info.yaml +++ /dev/null @@ -1,4 +0,0 @@ -rolling-tags: -- "14" -- 14-debian-11 -- 14.0.20231010 diff --git a/bitnami/odoo/15/debian-11/Dockerfile b/bitnami/odoo/15/debian-11/Dockerfile index 5c8993e2ac025..3983985c8639f 100644 --- a/bitnami/odoo/15/debian-11/Dockerfile +++ b/bitnami/odoo/15/debian-11/Dockerfile @@ -7,37 +7,37 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T21:15:31Z" \ + org.opencontainers.image.created="2023-12-17T11:10:51Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="15.0.20231010-debian-11-r1" \ + org.opencontainers.image.ref.name="15.0.20231210-debian-11-r1" \ org.opencontainers.image.title="odoo" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="15.0.20231010" + org.opencontainers.image.version="15.0.20231210" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl fontconfig libbrotli1 libbsd0 libbz2-1.0 libc6 libcap2-bin libcom-err2 libcrypt1 libedit2 libffi7 libfreetype6 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpng16-16 libpq5 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libx11-6 libxcb1 libxext6 libxml2 libxrender1 libxslt1.1 procps xfonts-75dpi xfonts-base zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.10.13-4-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "postgresql-client-16.0.0-0-linux-${OS_ARCH}-debian-11" \ - "node-18.18.1-0-linux-${OS_ARCH}-debian-11" \ - "odoo-15.0.20231010-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.10.13-13-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "postgresql-client-16.1.0-0-linux-${OS_ARCH}-debian-11" \ + "node-18.19.0-0-linux-${OS_ARCH}-debian-11" \ + "odoo-15.0.20231210-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -53,7 +53,7 @@ RUN curl -sLO "https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6 COPY rootfs / RUN /opt/bitnami/scripts/odoo/postunpack.sh -ENV APP_VERSION="15.0.20231010" \ +ENV APP_VERSION="15.0.20231210" \ BITNAMI_APP_NAME="odoo" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/common/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/node/bin:/opt/bitnami/odoo/bin:$PATH" diff --git a/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 25cc912915fe9..0eed13f0d444d 100644 --- a/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,30 +3,30 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "18.18.1-0" + "version": "18.19.0-0" }, "odoo": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "15.0.20231010-0" + "version": "15.0.20231210-1" }, "postgresql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.0.0-0" + "version": "16.1.0-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.10.13-4" + "version": "3.10.13-13" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" } } \ No newline at end of file diff --git a/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/odoo/15/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/odoo/15/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/odoo/15/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/odoo/15/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/odoo/15/debian-11/tags-info.yaml b/bitnami/odoo/15/debian-11/tags-info.yaml index e2075847ae76e..f805779eb72f4 100644 --- a/bitnami/odoo/15/debian-11/tags-info.yaml +++ b/bitnami/odoo/15/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "15" - 15-debian-11 -- 15.0.20231010 +- 15.0.20231210 diff --git a/bitnami/odoo/16/debian-11/Dockerfile b/bitnami/odoo/16/debian-11/Dockerfile index 3dfa6a2bad824..51303b4ee4c94 100644 --- a/bitnami/odoo/16/debian-11/Dockerfile +++ b/bitnami/odoo/16/debian-11/Dockerfile @@ -7,37 +7,37 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-15T08:03:00Z" \ + org.opencontainers.image.created="2023-12-17T12:00:32Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="16.0.20231015-debian-11-r0" \ + org.opencontainers.image.ref.name="16.0.20231215-debian-11-r1" \ org.opencontainers.image.title="odoo" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="16.0.20231015" + org.opencontainers.image.version="16.0.20231215" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages acl ca-certificates curl fontconfig libbrotli1 libbsd0 libbz2-1.0 libc6 libcap2-bin libcom-err2 libcrypt1 libedit2 libffi7 libfreetype6 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpng16-16 libpq5 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libx11-6 libxcb1 libxext6 libxml2 libxrender1 libxslt1.1 procps xfonts-75dpi xfonts-base zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN install_packages acl ca-certificates curl fontconfig libbsd0 libbz2-1.0 libc6 libcap2-bin libcom-err2 libcrypt1 libedit2 libffi7 libfreetype6 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpng16-16 libpq5 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libx11-6 libxcb1 libxext6 libxml2 libxrender1 libxslt1.1 procps xfonts-75dpi xfonts-base zlib1g +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.10.13-4-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "postgresql-client-16.0.0-0-linux-${OS_ARCH}-debian-11" \ - "node-18.18.2-0-linux-${OS_ARCH}-debian-11" \ - "odoo-16.0.20231015-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.7-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "postgresql-client-16.1.0-0-linux-${OS_ARCH}-debian-11" \ + "node-18.19.0-0-linux-${OS_ARCH}-debian-11" \ + "odoo-16.0.20231215-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -53,7 +53,7 @@ RUN curl -sLO "https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6 COPY rootfs / RUN /opt/bitnami/scripts/odoo/postunpack.sh -ENV APP_VERSION="16.0.20231015" \ +ENV APP_VERSION="16.0.20231215" \ BITNAMI_APP_NAME="odoo" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/common/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/node/bin:/opt/bitnami/odoo/bin:$PATH" diff --git a/bitnami/odoo/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/odoo/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 298489a1125af..a04b7c7007e6b 100644 --- a/bitnami/odoo/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/odoo/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,30 +3,30 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "18.18.2-0" + "version": "18.19.0-0" }, "odoo": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.0.20231015-0" + "version": "16.0.20231215-1" }, "postgresql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.0.0-0" + "version": "16.1.0-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.10.13-4" + "version": "3.11.7-0" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" } } \ No newline at end of file diff --git a/bitnami/odoo/16/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/odoo/16/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/odoo/16/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/odoo/16/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/odoo/16/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/odoo/16/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/odoo/16/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/odoo/16/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/odoo/16/debian-11/tags-info.yaml b/bitnami/odoo/16/debian-11/tags-info.yaml index cf062eb95b2b2..3b211be937c7d 100644 --- a/bitnami/odoo/16/debian-11/tags-info.yaml +++ b/bitnami/odoo/16/debian-11/tags-info.yaml @@ -1,5 +1,4 @@ rolling-tags: - "16" - 16-debian-11 -- 16.0.20231015 -- latest +- 16.0.20231215 diff --git a/bitnami/odoo/14/debian-11/Dockerfile b/bitnami/odoo/17/debian-11/Dockerfile similarity index 78% rename from bitnami/odoo/14/debian-11/Dockerfile rename to bitnami/odoo/17/debian-11/Dockerfile index 95b29ae5a2e86..0e6ce41962032 100644 --- a/bitnami/odoo/14/debian-11/Dockerfile +++ b/bitnami/odoo/17/debian-11/Dockerfile @@ -7,37 +7,37 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T21:09:27Z" \ + org.opencontainers.image.created="2023-12-17T11:39:18Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="14.0.20231010-debian-11-r1" \ + org.opencontainers.image.ref.name="17.0.20231205-debian-11-r1" \ org.opencontainers.image.title="odoo" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="14.0.20231010" + org.opencontainers.image.version="17.0.20231205" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl fontconfig libbsd0 libbz2-1.0 libc6 libcap2-bin libcom-err2 libcrypt1 libedit2 libffi7 libfreetype6 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpng16-16 libpq5 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libx11-6 libxcb1 libxext6 libxml2 libxrender1 libxslt1.1 procps xfonts-75dpi xfonts-base zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.8.18-2-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "postgresql-client-16.0.0-0-linux-${OS_ARCH}-debian-11" \ - "node-18.18.1-0-linux-${OS_ARCH}-debian-11" \ - "odoo-14.0.20231010-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.7-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "postgresql-client-16.1.0-0-linux-${OS_ARCH}-debian-11" \ + "node-18.19.0-0-linux-${OS_ARCH}-debian-11" \ + "odoo-17.0.20231205-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -53,7 +53,7 @@ RUN curl -sLO "https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6 COPY rootfs / RUN /opt/bitnami/scripts/odoo/postunpack.sh -ENV APP_VERSION="14.0.20231010" \ +ENV APP_VERSION="17.0.20231205" \ BITNAMI_APP_NAME="odoo" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/common/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/node/bin:/opt/bitnami/odoo/bin:$PATH" diff --git a/bitnami/odoo/14/debian-11/docker-compose.yml b/bitnami/odoo/17/debian-11/docker-compose.yml similarity index 95% rename from bitnami/odoo/14/debian-11/docker-compose.yml rename to bitnami/odoo/17/debian-11/docker-compose.yml index 3443e827d12e7..11958dff51301 100644 --- a/bitnami/odoo/14/debian-11/docker-compose.yml +++ b/bitnami/odoo/17/debian-11/docker-compose.yml @@ -13,7 +13,7 @@ services: - POSTGRESQL_USERNAME=bn_odoo - POSTGRESQL_DATABASE=bitnami_odoo odoo: - image: docker.io/bitnami/odoo:14 + image: docker.io/bitnami/odoo:17 ports: - '80:8069' volumes: diff --git a/bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json similarity index 77% rename from bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json rename to bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 3b6feaba322e5..96a620d1d09c4 100644 --- a/bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,30 +3,30 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "18.18.1-0" + "version": "18.19.0-0" }, "odoo": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "14.0.20231010-0" + "version": "17.0.20231205-1" }, "postgresql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.0.0-0" + "version": "16.1.0-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.8.18-2" + "version": "3.11.7-0" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" } } \ No newline at end of file diff --git a/bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt new file mode 100644 index 0000000000000..76956b38e82c6 --- /dev/null +++ b/bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt @@ -0,0 +1,2 @@ +Bitnami containers ship with software bundles. You can find the licenses under: +/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh similarity index 76% rename from bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh rename to bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/drupal-nginx/9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh similarity index 100% rename from bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh rename to bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh diff --git a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh similarity index 100% rename from bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh rename to bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh diff --git a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh b/bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh similarity index 100% rename from bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh rename to bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh diff --git a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh similarity index 100% rename from bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh rename to bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh diff --git a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh similarity index 100% rename from bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh rename to bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh diff --git a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh similarity index 100% rename from bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh rename to bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh diff --git a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh similarity index 100% rename from bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh rename to bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh diff --git a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh similarity index 100% rename from bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh rename to bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh diff --git a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh similarity index 100% rename from bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh rename to bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh diff --git a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh similarity index 100% rename from bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh rename to bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh diff --git a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh similarity index 100% rename from bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh rename to bitnami/odoo/17/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh diff --git a/bitnami/odoo/17/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/odoo/17/debian-11/prebuildfs/usr/sbin/install_packages new file mode 100755 index 0000000000000..acbc3173208c0 --- /dev/null +++ b/bitnami/odoo/17/debian-11/prebuildfs/usr/sbin/install_packages @@ -0,0 +1,27 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -eu + +n=0 +max=2 +export DEBIAN_FRONTEND=noninteractive + +until [ $n -gt $max ]; do + set +e + ( + apt-get update -qq && + apt-get install -y --no-install-recommends "$@" + ) + CODE=$? + set -e + if [ $CODE -eq 0 ]; then + break + fi + if [ $n -eq $max ]; then + exit $CODE + fi + echo "apt failed, retrying" + n=$(($n + 1)) +done +apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/odoo/17/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/odoo/17/debian-11/prebuildfs/usr/sbin/run-script new file mode 100755 index 0000000000000..b7a5bf1e50bff --- /dev/null +++ b/bitnami/odoo/17/debian-11/prebuildfs/usr/sbin/run-script @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -u + +if [ $# -eq 0 ]; then + >&2 echo "No arguments provided" + exit 1 +fi + +script=$1 +exit_code="${2:-96}" +fail_if_not_present="${3:-y}" + +if test -f "$script"; then + sh $script + + if [ $? -ne 0 ]; then + exit $((exit_code)) + fi +elif [ "$fail_if_not_present" = "y" ]; then + >&2 echo "script not found: $script" + exit 127 +fi diff --git a/bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/libodoo.sh b/bitnami/odoo/17/debian-11/rootfs/opt/bitnami/scripts/libodoo.sh similarity index 100% rename from bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/libodoo.sh rename to bitnami/odoo/17/debian-11/rootfs/opt/bitnami/scripts/libodoo.sh diff --git a/bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/libpostgresqlclient.sh b/bitnami/odoo/17/debian-11/rootfs/opt/bitnami/scripts/libpostgresqlclient.sh similarity index 100% rename from bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/libpostgresqlclient.sh rename to bitnami/odoo/17/debian-11/rootfs/opt/bitnami/scripts/libpostgresqlclient.sh diff --git a/bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/odoo-env.sh b/bitnami/odoo/17/debian-11/rootfs/opt/bitnami/scripts/odoo-env.sh similarity index 100% rename from bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/odoo-env.sh rename to bitnami/odoo/17/debian-11/rootfs/opt/bitnami/scripts/odoo-env.sh diff --git a/bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl b/bitnami/odoo/17/debian-11/rootfs/opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl similarity index 100% rename from bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl rename to bitnami/odoo/17/debian-11/rootfs/opt/bitnami/scripts/odoo/bitnami-templates/odoo.conf.tpl diff --git a/bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/odoo/entrypoint.sh b/bitnami/odoo/17/debian-11/rootfs/opt/bitnami/scripts/odoo/entrypoint.sh similarity index 100% rename from bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/odoo/entrypoint.sh rename to bitnami/odoo/17/debian-11/rootfs/opt/bitnami/scripts/odoo/entrypoint.sh diff --git a/bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/odoo/postunpack.sh b/bitnami/odoo/17/debian-11/rootfs/opt/bitnami/scripts/odoo/postunpack.sh similarity index 100% rename from bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/odoo/postunpack.sh rename to bitnami/odoo/17/debian-11/rootfs/opt/bitnami/scripts/odoo/postunpack.sh diff --git a/bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/odoo/run.sh b/bitnami/odoo/17/debian-11/rootfs/opt/bitnami/scripts/odoo/run.sh similarity index 100% rename from bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/odoo/run.sh rename to bitnami/odoo/17/debian-11/rootfs/opt/bitnami/scripts/odoo/run.sh diff --git a/bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/odoo/setup.sh b/bitnami/odoo/17/debian-11/rootfs/opt/bitnami/scripts/odoo/setup.sh similarity index 100% rename from bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/odoo/setup.sh rename to bitnami/odoo/17/debian-11/rootfs/opt/bitnami/scripts/odoo/setup.sh diff --git a/bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/postgresql-client-env.sh b/bitnami/odoo/17/debian-11/rootfs/opt/bitnami/scripts/postgresql-client-env.sh similarity index 100% rename from bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/postgresql-client-env.sh rename to bitnami/odoo/17/debian-11/rootfs/opt/bitnami/scripts/postgresql-client-env.sh diff --git a/bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/postgresql-client/setup.sh b/bitnami/odoo/17/debian-11/rootfs/opt/bitnami/scripts/postgresql-client/setup.sh similarity index 100% rename from bitnami/odoo/14/debian-11/rootfs/opt/bitnami/scripts/postgresql-client/setup.sh rename to bitnami/odoo/17/debian-11/rootfs/opt/bitnami/scripts/postgresql-client/setup.sh diff --git a/bitnami/odoo/14/debian-11/rootfs/post-init.d/python.sh b/bitnami/odoo/17/debian-11/rootfs/post-init.d/python.sh similarity index 100% rename from bitnami/odoo/14/debian-11/rootfs/post-init.d/python.sh rename to bitnami/odoo/17/debian-11/rootfs/post-init.d/python.sh diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/post-init.d/shell.sh b/bitnami/odoo/17/debian-11/rootfs/post-init.d/shell.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/rootfs/post-init.d/shell.sh rename to bitnami/odoo/17/debian-11/rootfs/post-init.d/shell.sh diff --git a/bitnami/odoo/14/debian-11/rootfs/post-init.d/sql-postgresql.sh b/bitnami/odoo/17/debian-11/rootfs/post-init.d/sql-postgresql.sh similarity index 100% rename from bitnami/odoo/14/debian-11/rootfs/post-init.d/sql-postgresql.sh rename to bitnami/odoo/17/debian-11/rootfs/post-init.d/sql-postgresql.sh diff --git a/bitnami/odoo/14/debian-11/rootfs/post-init.sh b/bitnami/odoo/17/debian-11/rootfs/post-init.sh similarity index 100% rename from bitnami/odoo/14/debian-11/rootfs/post-init.sh rename to bitnami/odoo/17/debian-11/rootfs/post-init.sh diff --git a/bitnami/odoo/17/debian-11/tags-info.yaml b/bitnami/odoo/17/debian-11/tags-info.yaml new file mode 100644 index 0000000000000..de111f7005bcc --- /dev/null +++ b/bitnami/odoo/17/debian-11/tags-info.yaml @@ -0,0 +1,5 @@ +rolling-tags: +- "17" +- 17-debian-11 +- 17.0.20231205 +- latest diff --git a/bitnami/odoo/README.md b/bitnami/odoo/README.md index e31334dbc1d19..aa46798305c51 100644 --- a/bitnami/odoo/README.md +++ b/bitnami/odoo/README.md @@ -1,4 +1,4 @@ -# Odoo packaged by Bitnami +# Bitnami package for Odoo ## What is Odoo? @@ -18,12 +18,12 @@ docker-compose up -d ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use Odoo in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/odoo/docker-compose.yml b/bitnami/odoo/docker-compose.yml index 87252f3446e12..11958dff51301 100644 --- a/bitnami/odoo/docker-compose.yml +++ b/bitnami/odoo/docker-compose.yml @@ -13,7 +13,7 @@ services: - POSTGRESQL_USERNAME=bn_odoo - POSTGRESQL_DATABASE=bitnami_odoo odoo: - image: docker.io/bitnami/odoo:16 + image: docker.io/bitnami/odoo:17 ports: - '80:8069' volumes: diff --git a/bitnami/opencart/4/debian-11/Dockerfile b/bitnami/opencart/4/debian-11/Dockerfile index c079e71883867..18acfa4504dd5 100644 --- a/bitnami/opencart/4/debian-11/Dockerfile +++ b/bitnami/opencart/4/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T20:26:42Z" \ + org.opencontainers.image.created="2023-12-02T08:20:59Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.0.2-3-debian-11-r21" \ + org.opencontainers.image.ref.name="4.0.2-3-debian-11-r24" \ org.opencontainers.image.title="opencart" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.0.2-3" @@ -21,25 +21,25 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.2.11-3-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.57-12-linux-${OS_ARCH}-debian-11" \ - "mysql-client-11.1.2-0-linux-${OS_ARCH}-debian-11" \ - "libphp-8.2.11-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ + "php-8.2.13-6-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.58-1-linux-${OS_ARCH}-debian-11" \ + "mysql-client-11.1.3-0-linux-${OS_ARCH}-debian-11" \ + "libphp-8.2.13-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-3-linux-${OS_ARCH}-debian-11" \ "opencart-4.0.2-3-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/opencart/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/opencart/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8f24194c28a4d..c1ea3980e5059 100644 --- a/bitnami/opencart/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/opencart/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,19 +3,19 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.57-12" + "version": "2.4.58-1" }, "libphp": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.11-0" + "version": "8.2.13-0" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.1.2-0" + "version": "11.1.3-0" }, "opencart": { "arch": "amd64", @@ -27,12 +27,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.11-3" + "version": "8.2.13-6" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-3" } } \ No newline at end of file diff --git a/bitnami/opencart/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/opencart/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/opencart/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/opencart/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/opencart/4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/opencart/4/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/opencart/4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/opencart/4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/opencart/4/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/opencart/4/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh index 765d1d8ce1ed5..6a480ad4ddde9 100755 --- a/bitnami/opencart/4/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh +++ b/bitnami/opencart/4/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh @@ -46,6 +46,7 @@ apache_setup_bitnami_config() { local -a modules_to_disable=( "http2_module" "proxy_hcheck_module" + "proxy_html_module" "proxy_http2_module" ) for module in "${modules_to_disable[@]}"; do diff --git a/bitnami/opencart/README.md b/bitnami/opencart/README.md index f805c35ad456f..0d6f8dea886ed 100644 --- a/bitnami/opencart/README.md +++ b/bitnami/opencart/README.md @@ -1,4 +1,4 @@ -# OpenCart packaged by Bitnami +# Bitnami package for OpenCart ## What is OpenCart? @@ -21,7 +21,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/openldap/2.5/debian-11/Dockerfile b/bitnami/openldap/2.5/debian-11/Dockerfile index d8d875d2324fd..d116b6282a948 100644 --- a/bitnami/openldap/2.5/debian-11/Dockerfile +++ b/bitnami/openldap/2.5/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T18:37:13Z" \ + org.opencontainers.image.created="2023-12-15T16:52:27Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.5.16-debian-11-r59" \ + org.opencontainers.image.ref.name="2.5.16-debian-11-r61" \ org.opencontainers.image.title="openldap" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.5.16" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libargon2-1 libcap2-bin libcom-err2 libcrypt1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libltdl7 libnsl2 libnss3-tools libsasl2-2 libssl1.1 libtirpc3 libwrap0 mdbtools procps psmisc -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ "openldap-2.5.16-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/openldap/2.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/openldap/2.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/openldap/2.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/openldap/2.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/openldap/2.5/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/openldap/2.5/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/openldap/2.5/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/openldap/2.5/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh b/bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh index 5aa54187cfecd..e5ec5d63c2921 100644 --- a/bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh +++ b/bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh @@ -280,6 +280,15 @@ cn: config olcArgsFile: /opt/bitnami/openldap/var/run/slapd.args olcPidFile: /opt/bitnami/openldap/var/run/slapd.pid +# +# Enable pw-sha2 module +# +dn: cn=module,cn=config +cn: module +objectClass: olcModuleList +olcModulePath: /opt/bitnami/openldap/libexec/openldap +olcModuleLoad: pw-sha2.so + # # Schema settings # @@ -612,9 +621,6 @@ ldap_initialize() { if ! is_boolean_yes "$LDAP_ALLOW_ANON_BINDING"; then ldap_disable_anon_binding fi - if is_boolean_yes "$LDAP_ENABLE_TLS"; then - ldap_configure_tls - fi # Initialize OpenLDAP with schemas/tree structure if is_boolean_yes "$LDAP_ADD_SCHEMAS"; then ldap_add_schemas @@ -640,13 +646,6 @@ ldap_initialize() { if is_boolean_yes "$LDAP_ENABLE_SYNCPROV"; then ldap_enable_syncprov fi - # enable tls - if is_boolean_yes "$LDAP_ENABLE_TLS"; then - ldap_configure_tls - if is_boolean_yes "$LDAP_REQUIRE_TLS"; then - ldap_configure_tls_required - fi - fi if ! is_dir_empty "$LDAP_CUSTOM_LDIF_DIR"; then ldap_add_custom_ldifs elif ! is_boolean_yes "$LDAP_SKIP_DEFAULT_TREE"; then @@ -654,6 +653,13 @@ ldap_initialize() { else info "Skipping default schemas/tree structure" fi + # enable tls + if is_boolean_yes "$LDAP_ENABLE_TLS"; then + ldap_configure_tls + if is_boolean_yes "$LDAP_REQUIRE_TLS"; then + ldap_configure_tls_required + fi + fi ldap_stop fi } diff --git a/bitnami/openldap/2.6/debian-11/Dockerfile b/bitnami/openldap/2.6/debian-11/Dockerfile index 87415595cb57d..fbcc1937e9e0b 100644 --- a/bitnami/openldap/2.6/debian-11/Dockerfile +++ b/bitnami/openldap/2.6/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T18:37:13Z" \ + org.opencontainers.image.created="2023-12-15T19:29:17Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.6.6-debian-11-r59" \ + org.opencontainers.image.ref.name="2.6.6-debian-11-r61" \ org.opencontainers.image.title="openldap" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.6.6" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libargon2-1 libcap2-bin libcom-err2 libcrypt1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libltdl7 libnsl2 libnss3-tools libodbc1 libperl5.32 libsasl2-2 libssl1.1 libtirpc3 libwrap0 mdbtools procps psmisc -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ "openldap-2.6.6-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/openldap/2.6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/openldap/2.6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/openldap/2.6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/openldap/2.6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/openldap/2.6/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/openldap/2.6/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/openldap/2.6/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/openldap/2.6/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh b/bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh index 5aa54187cfecd..e5ec5d63c2921 100644 --- a/bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh +++ b/bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh @@ -280,6 +280,15 @@ cn: config olcArgsFile: /opt/bitnami/openldap/var/run/slapd.args olcPidFile: /opt/bitnami/openldap/var/run/slapd.pid +# +# Enable pw-sha2 module +# +dn: cn=module,cn=config +cn: module +objectClass: olcModuleList +olcModulePath: /opt/bitnami/openldap/libexec/openldap +olcModuleLoad: pw-sha2.so + # # Schema settings # @@ -612,9 +621,6 @@ ldap_initialize() { if ! is_boolean_yes "$LDAP_ALLOW_ANON_BINDING"; then ldap_disable_anon_binding fi - if is_boolean_yes "$LDAP_ENABLE_TLS"; then - ldap_configure_tls - fi # Initialize OpenLDAP with schemas/tree structure if is_boolean_yes "$LDAP_ADD_SCHEMAS"; then ldap_add_schemas @@ -640,13 +646,6 @@ ldap_initialize() { if is_boolean_yes "$LDAP_ENABLE_SYNCPROV"; then ldap_enable_syncprov fi - # enable tls - if is_boolean_yes "$LDAP_ENABLE_TLS"; then - ldap_configure_tls - if is_boolean_yes "$LDAP_REQUIRE_TLS"; then - ldap_configure_tls_required - fi - fi if ! is_dir_empty "$LDAP_CUSTOM_LDIF_DIR"; then ldap_add_custom_ldifs elif ! is_boolean_yes "$LDAP_SKIP_DEFAULT_TREE"; then @@ -654,6 +653,13 @@ ldap_initialize() { else info "Skipping default schemas/tree structure" fi + # enable tls + if is_boolean_yes "$LDAP_ENABLE_TLS"; then + ldap_configure_tls + if is_boolean_yes "$LDAP_REQUIRE_TLS"; then + ldap_configure_tls_required + fi + fi ldap_stop fi } diff --git a/bitnami/openldap/README.md b/bitnami/openldap/README.md index 5b2a7975fad4e..13d6c2271b677 100644 --- a/bitnami/openldap/README.md +++ b/bitnami/openldap/README.md @@ -1,4 +1,4 @@ -# OpenLDAP packaged by Bitnami +# Bitnami package for OpenLDAP ## What is OpenLDAP? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/openresty/1.21/debian-11/Dockerfile b/bitnami/openresty/1.21/debian-11/Dockerfile index 2d60c56205031..91faf4f1c4879 100644 --- a/bitnami/openresty/1.21/debian-11/Dockerfile +++ b/bitnami/openresty/1.21/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:31:11Z" \ + org.opencontainers.image.created="2023-12-02T08:44:19Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.21.4-2-debian-11-r72" \ + org.opencontainers.image.ref.name="1.21.4-3-debian-11-r2" \ org.opencontainers.image.title="openresty" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.21.4-2" + org.opencontainers.image.version="1.21.4-3" ENV HOME="/home/openresty" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/home/openresty" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbrotli1 libbsd0 libcrypt1 libdeflate0 libexpat1 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libgd3 libgeoip1 libgpg-error0 libicu67 libjbig0 libjpeg62-turbo liblzma5 libmd0 libpcre3 libpng16-16 libssl1.1 libstdc++6 libtiff5 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxml2 libxpm4 libxslt1.1 libzstd1 perl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "openresty-1.21.4-2-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "openresty-1.21.4-3-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -43,7 +43,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/openresty/postunpack.sh -ENV APP_VERSION="1.21.4-2" \ +ENV APP_VERSION="1.21.4-3" \ BITNAMI_APP_NAME="openresty" \ PATH="/opt/bitnami/openresty/bin:/opt/bitnami/openresty/luajit/bin:$PATH" diff --git a/bitnami/openresty/1.21/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/openresty/1.21/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c3c16766edc88..b889365da1f93 100644 --- a/bitnami/openresty/1.21/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/openresty/1.21/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.21.4-2-2" + "version": "1.21.4-3-0" } } \ No newline at end of file diff --git a/bitnami/openresty/1.21/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/openresty/1.21/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/openresty/1.21/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/openresty/1.21/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/openresty/1.21/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/openresty/1.21/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/openresty/1.21/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/openresty/1.21/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/openresty/1.21/debian-11/rootfs/opt/bitnami/openresty/nginx/conf/nginx.conf b/bitnami/openresty/1.21/debian-11/rootfs/opt/bitnami/openresty/nginx/conf/nginx.conf index e0c3edfd6d5d7..f05340cf48006 100644 --- a/bitnami/openresty/1.21/debian-11/rootfs/opt/bitnami/openresty/nginx/conf/nginx.conf +++ b/bitnami/openresty/1.21/debian-11/rootfs/opt/bitnami/openresty/nginx/conf/nginx.conf @@ -33,7 +33,7 @@ http { gzip_proxied any; gzip_types text/plain text/css application/javascript text/xml application/xml+rss; keepalive_timeout 65; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; + ssl_protocols TLSv1.2 TLSv1.3; ssl_ciphers HIGH:!aNULL:!MD5; client_max_body_size 80M; server_tokens off; diff --git a/bitnami/openresty/1.21/debian-11/tags-info.yaml b/bitnami/openresty/1.21/debian-11/tags-info.yaml index 91d33112af940..2f450c4cfd18b 100644 --- a/bitnami/openresty/1.21/debian-11/tags-info.yaml +++ b/bitnami/openresty/1.21/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1.21" - 1.21-debian-11 -- 1.21.4-2 +- 1.21.4-3 - latest diff --git a/bitnami/openresty/README.md b/bitnami/openresty/README.md index cdf2375769813..8e981e1a00b11 100644 --- a/bitnami/openresty/README.md +++ b/bitnami/openresty/README.md @@ -1,4 +1,4 @@ -# OpenResty packaged by Bitnami +# Bitnami package for OpenResty ## What is OpenResty? @@ -23,7 +23,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/opensearch-dashboards/1/debian-11/Dockerfile b/bitnami/opensearch-dashboards/1/debian-11/Dockerfile index b29f1af42fe7b..9f7bd7583811d 100644 --- a/bitnami/opensearch-dashboards/1/debian-11/Dockerfile +++ b/bitnami/opensearch-dashboards/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T20:47:06Z" \ + org.opencontainers.image.created="2023-12-14T04:27:31Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.3.13-debian-11-r6" \ + org.opencontainers.image.ref.name="1.3.14-debian-11-r0" \ org.opencontainers.image.title="opensearch-dashboards" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.3.13" + org.opencontainers.image.version="1.3.14" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,21 +22,21 @@ ENV HOME="/" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/opensearch-dashboards/bin:$PATH" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgcc-s1 libstdc++6 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "opensearch-dashboards-1.3.13-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "yq-4.40.5-0-linux-${OS_ARCH}-debian-11" \ + "opensearch-dashboards-1.3.14-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -45,7 +45,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/opensearch-dashboards/postunpack.sh -ENV APP_VERSION="1.3.13" \ +ENV APP_VERSION="1.3.14" \ BITNAMI_APP_NAME="opensearch-dashboards" EXPOSE 5601 diff --git a/bitnami/opensearch-dashboards/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/opensearch-dashboards/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index e47ab37e15199..e5534d011b8e9 100644 --- a/bitnami/opensearch-dashboards/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/opensearch-dashboards/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.3.13-0" + "version": "1.3.14-0" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.5-0" } } \ No newline at end of file diff --git a/bitnami/opensearch-dashboards/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/opensearch-dashboards/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/opensearch-dashboards/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/opensearch-dashboards/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/opensearch-dashboards/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/opensearch-dashboards/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/opensearch-dashboards/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/opensearch-dashboards/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/opensearch-dashboards/1/debian-11/tags-info.yaml b/bitnami/opensearch-dashboards/1/debian-11/tags-info.yaml index 19be631029af2..57fe9ac02ba92 100644 --- a/bitnami/opensearch-dashboards/1/debian-11/tags-info.yaml +++ b/bitnami/opensearch-dashboards/1/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "1" - 1-debian-11 -- 1.3.13 +- 1.3.14 diff --git a/bitnami/opensearch-dashboards/2/debian-11/Dockerfile b/bitnami/opensearch-dashboards/2/debian-11/Dockerfile index 55917184c9465..ddcb4282e667d 100644 --- a/bitnami/opensearch-dashboards/2/debian-11/Dockerfile +++ b/bitnami/opensearch-dashboards/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-18T05:50:45Z" \ + org.opencontainers.image.created="2023-12-14T05:02:02Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.11.0-debian-11-r0" \ + org.opencontainers.image.ref.name="2.11.1-debian-11-r0" \ org.opencontainers.image.title="opensearch-dashboards" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.11.0" + org.opencontainers.image.version="2.11.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,21 +22,21 @@ ENV HOME="/" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/opensearch-dashboards/bin:$PATH" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgcc-s1 libstdc++6 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "opensearch-dashboards-2.11.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "yq-4.40.5-0-linux-${OS_ARCH}-debian-11" \ + "opensearch-dashboards-2.11.1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -45,7 +45,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/opensearch-dashboards/postunpack.sh -ENV APP_VERSION="2.11.0" \ +ENV APP_VERSION="2.11.1" \ BITNAMI_APP_NAME="opensearch-dashboards" EXPOSE 5601 diff --git a/bitnami/opensearch-dashboards/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/opensearch-dashboards/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 568657e8c957c..1361b7ce43fe8 100644 --- a/bitnami/opensearch-dashboards/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/opensearch-dashboards/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.11.0-0" + "version": "2.11.1-0" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.5-0" } } \ No newline at end of file diff --git a/bitnami/opensearch-dashboards/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/opensearch-dashboards/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/opensearch-dashboards/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/opensearch-dashboards/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/opensearch-dashboards/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/opensearch-dashboards/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/opensearch-dashboards/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/opensearch-dashboards/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/opensearch-dashboards/2/debian-11/tags-info.yaml b/bitnami/opensearch-dashboards/2/debian-11/tags-info.yaml index d75a7d737f52d..ad8b31a588da3 100644 --- a/bitnami/opensearch-dashboards/2/debian-11/tags-info.yaml +++ b/bitnami/opensearch-dashboards/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.11.0 +- 2.11.1 - latest diff --git a/bitnami/opensearch-dashboards/README.md b/bitnami/opensearch-dashboards/README.md index f2679ae376dd6..d216382db2515 100644 --- a/bitnami/opensearch-dashboards/README.md +++ b/bitnami/opensearch-dashboards/README.md @@ -1,4 +1,4 @@ -# OpenSearch Dashboards packaged by Bitnami +# Bitnami package for OpenSearch Dashboards ## What is OpenSearch Dashboards? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/opensearch/1/debian-11/Dockerfile b/bitnami/opensearch/1/debian-11/Dockerfile index 43e08ff70abf1..7544f01a84e56 100644 --- a/bitnami/opensearch/1/debian-11/Dockerfile +++ b/bitnami/opensearch/1/debian-11/Dockerfile @@ -9,10 +9,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T20:11:43Z" \ + org.opencontainers.image.created="2023-12-12T12:59:55Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.3.13-debian-11-r9" \ + org.opencontainers.image.ref.name="1.3.13-debian-11-r12" \ org.opencontainers.image.title="opensearch" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.3.13" @@ -24,22 +24,22 @@ ENV HOME="/" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:/opt/bitnami/opensearch/bin:$PATH" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgcc-s1 libgomp1 libstdc++6 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ + "yq-4.40.5-0-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ "opensearch-1.3.13-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -52,7 +52,7 @@ RUN /opt/bitnami/scripts/java/postunpack.sh ENV APP_VERSION="1.3.13" \ BITNAMI_APP_NAME="opensearch" \ JAVA_HOME="/opt/bitnami/java" \ - LD_LIBRARY_PATH="/opt/bitnami/opensearch/jdk/lib:/opt/bitnami/opensearch/jdk/lib/server:$LD_LIBRARY_PATH" \ + LD_LIBRARY_PATH="/opt/bitnami/opensearch/jdk/lib:/opt/bitnami/opensearch/jdk/lib/server:/opt/bitnami/opensearch/plugins/opensearch-knn/lib:$LD_LIBRARY_PATH" \ OPENSEARCH_JAVA_HOME="/opt/bitnami/java" EXPOSE 9200 9300 diff --git a/bitnami/opensearch/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/opensearch/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 17e9f306463bd..29e3749f21a45 100644 --- a/bitnami/opensearch/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/opensearch/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "opensearch": { "arch": "amd64", @@ -15,6 +15,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.5-0" } } \ No newline at end of file diff --git a/bitnami/opensearch/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/opensearch/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/opensearch/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/opensearch/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/opensearch/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/opensearch/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/opensearch/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/opensearch/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/opensearch/2/debian-11/Dockerfile b/bitnami/opensearch/2/debian-11/Dockerfile index 31312b5b3413e..9aa688e750ee2 100644 --- a/bitnami/opensearch/2/debian-11/Dockerfile +++ b/bitnami/opensearch/2/debian-11/Dockerfile @@ -9,13 +9,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-17T01:15:45Z" \ + org.opencontainers.image.created="2023-12-12T13:00:43Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.11.0-debian-11-r0" \ + org.opencontainers.image.ref.name="2.11.1-debian-11-r2" \ org.opencontainers.image.title="opensearch" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.11.0" + org.opencontainers.image.version="2.11.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -24,22 +24,22 @@ ENV HOME="/" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:/opt/bitnami/opensearch/bin:$PATH" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgcc-s1 libgomp1 libstdc++6 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "opensearch-2.11.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "yq-4.40.5-0-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "opensearch-2.11.1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -49,10 +49,10 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/opensearch/postunpack.sh RUN /opt/bitnami/scripts/java/postunpack.sh -ENV APP_VERSION="2.11.0" \ +ENV APP_VERSION="2.11.1" \ BITNAMI_APP_NAME="opensearch" \ JAVA_HOME="/opt/bitnami/java" \ - LD_LIBRARY_PATH="/opt/bitnami/opensearch/jdk/lib:/opt/bitnami/opensearch/jdk/lib/server:$LD_LIBRARY_PATH" \ + LD_LIBRARY_PATH="/opt/bitnami/opensearch/jdk/lib:/opt/bitnami/opensearch/jdk/lib/server:/opt/bitnami/opensearch/plugins/opensearch-knn/lib:$LD_LIBRARY_PATH" \ OPENSEARCH_JAVA_HOME="/opt/bitnami/java" EXPOSE 9200 9300 diff --git a/bitnami/opensearch/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/opensearch/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 177cf9400284b..75bf0b5a72787 100644 --- a/bitnami/opensearch/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/opensearch/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "opensearch": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.11.0-0" + "version": "2.11.1-0" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.5-0" } } \ No newline at end of file diff --git a/bitnami/opensearch/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/opensearch/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/opensearch/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/opensearch/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/opensearch/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/opensearch/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/opensearch/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/opensearch/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/opensearch/2/debian-11/tags-info.yaml b/bitnami/opensearch/2/debian-11/tags-info.yaml index d75a7d737f52d..ad8b31a588da3 100644 --- a/bitnami/opensearch/2/debian-11/tags-info.yaml +++ b/bitnami/opensearch/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.11.0 +- 2.11.1 - latest diff --git a/bitnami/opensearch/README.md b/bitnami/opensearch/README.md index 6dc1cfb048c62..174a809b0bf08 100644 --- a/bitnami/opensearch/README.md +++ b/bitnami/opensearch/README.md @@ -1,4 +1,4 @@ -# OpenSearch packaged by Bitnami +# Bitnami package for OpenSearch ## What is OpenSearch? @@ -27,7 +27,7 @@ You can find the available configuration options in the [Environment Variables]( * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/oras/1/debian-11/Dockerfile b/bitnami/oras/1/debian-11/Dockerfile index dcc14fbd5622e..de1abfe8cd54a 100644 --- a/bitnami/oras/1/debian-11/Dockerfile +++ b/bitnami/oras/1/debian-11/Dockerfile @@ -8,21 +8,21 @@ ARG TARGETARCH ENV OS_ARCH="${TARGETARCH:-amd64}" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "oras-1.1.0-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "oras-1.1.0-5-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done @@ -36,10 +36,10 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="scratch" \ - org.opencontainers.image.created="2023-10-11T07:38:48Z" \ + org.opencontainers.image.created="2023-12-06T20:27:12Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.1.0-debian-11-r26" \ + org.opencontainers.image.ref.name="1.1.0-debian-11-r28" \ org.opencontainers.image.title="oras" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.1.0" diff --git a/bitnami/oras/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/oras/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 59524087ec3f4..bdfe2dc304aaf 100644 --- a/bitnami/oras/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/oras/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.1.0-3" + "version": "1.1.0-5" } } \ No newline at end of file diff --git a/bitnami/oras/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/oras/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/oras/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/oras/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/oras/README.md b/bitnami/oras/README.md index c3617f84519b3..2a414992f0bfd 100644 --- a/bitnami/oras/README.md +++ b/bitnami/oras/README.md @@ -1,4 +1,4 @@ -# ORAS packaged by Bitnami +# Bitnami package for ORAS ## What is ORAS? @@ -18,7 +18,9 @@ docker run --name oras bitnami/oras:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use ORAS in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/os-shell/11/debian-11/Dockerfile b/bitnami/os-shell/11/debian-11/Dockerfile index 92426d53b478f..c325267cc5719 100644 --- a/bitnami/os-shell/11/debian-11/Dockerfile +++ b/bitnami/os-shell/11/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T20:58:42Z" \ + org.opencontainers.image.created="2023-12-02T08:21:31Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="11-debian-11-r90" \ + org.opencontainers.image.ref.name="11-debian-11-r92" \ org.opencontainers.image.title="os-shell" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="11" @@ -21,23 +21,23 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl jq procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "ini-file-1.4.6-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "yq-4.40.3-0-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-3-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-3-linux-${OS_ARCH}-debian-11" \ + "ini-file-1.4.6-3-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/os-shell/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/os-shell/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index ffba4a827710d..06681c31d3300 100644 --- a/bitnami/os-shell/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/os-shell/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,24 +3,24 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-2" + "version": "1.4.6-3" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-3" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-3" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.3-0" } } \ No newline at end of file diff --git a/bitnami/os-shell/11/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/os-shell/11/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/os-shell/11/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/os-shell/11/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/os-shell/README.md b/bitnami/os-shell/README.md index 644c2b5b99451..439302168e0e3 100644 --- a/bitnami/os-shell/README.md +++ b/bitnami/os-shell/README.md @@ -1,4 +1,4 @@ -# OS Shell + Utility packaged by Bitnami +# Bitnami package for OS Shell + Utility ## What is OS Shell + Utility? @@ -18,7 +18,7 @@ docker run --name os-shell bitnami/os-shell:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/osclass/8/debian-11/Dockerfile b/bitnami/osclass/8/debian-11/Dockerfile index 24626173e5c1b..046c288874c9b 100644 --- a/bitnami/osclass/8/debian-11/Dockerfile +++ b/bitnami/osclass/8/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:25:05Z" \ + org.opencontainers.image.created="2023-12-11T12:00:09Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.1.2-debian-11-r100" \ + org.opencontainers.image.ref.name="8.2.0-debian-11-r0" \ org.opencontainers.image.title="osclass" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="8.1.2" + org.opencontainers.image.version="8.2.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,25 +21,25 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.1.24-3-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.57-12-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.11.5-1-linux-${OS_ARCH}-debian-11" \ - "libphp-8.1.24-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - "osclass-8.1.2-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "php-8.1.26-10-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.58-2-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.11.6-0-linux-${OS_ARCH}-debian-11" \ + "libphp-8.1.26-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "osclass-8.2.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -54,7 +54,7 @@ RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh RUN /opt/bitnami/scripts/osclass/postunpack.sh ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ - APP_VERSION="8.1.2" \ + APP_VERSION="8.2.0" \ BITNAMI_APP_NAME="osclass" \ PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/osclass/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/osclass/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 59809c5c94a07..833ff38ceba0a 100644 --- a/bitnami/osclass/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/osclass/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,36 +3,36 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.57-12" + "version": "2.4.58-2" }, "libphp": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.24-0" + "version": "8.1.26-0" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.11.5-1" + "version": "10.11.6-0" }, "osclass": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.2-3" + "version": "8.2.0-0" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.24-3" + "version": "8.1.26-10" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" } } \ No newline at end of file diff --git a/bitnami/osclass/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/osclass/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/osclass/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/osclass/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/osclass/8/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/osclass/8/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/osclass/8/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/osclass/8/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/osclass/8/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/osclass/8/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh index 765d1d8ce1ed5..6a480ad4ddde9 100755 --- a/bitnami/osclass/8/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh +++ b/bitnami/osclass/8/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh @@ -46,6 +46,7 @@ apache_setup_bitnami_config() { local -a modules_to_disable=( "http2_module" "proxy_hcheck_module" + "proxy_html_module" "proxy_http2_module" ) for module in "${modules_to_disable[@]}"; do diff --git a/bitnami/osclass/8/debian-11/tags-info.yaml b/bitnami/osclass/8/debian-11/tags-info.yaml index d3d60c1231528..54e504ff0297f 100644 --- a/bitnami/osclass/8/debian-11/tags-info.yaml +++ b/bitnami/osclass/8/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "8" - 8-debian-11 -- 8.1.2 +- 8.2.0 - latest diff --git a/bitnami/osclass/README.md b/bitnami/osclass/README.md index 7b2dfc33d314d..2c4c8ea600b4c 100644 --- a/bitnami/osclass/README.md +++ b/bitnami/osclass/README.md @@ -1,4 +1,4 @@ -# Osclass packaged by Bitnami +# Bitnami package for Osclass ## What is Osclass? @@ -18,12 +18,12 @@ docker-compose up -d ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use Osclass in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/parse-dashboard/5/debian-11/Dockerfile b/bitnami/parse-dashboard/5/debian-11/Dockerfile index 6994d3d9dd7f5..8364ee0e74272 100644 --- a/bitnami/parse-dashboard/5/debian-11/Dockerfile +++ b/bitnami/parse-dashboard/5/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T07:58:23Z" \ + org.opencontainers.image.created="2023-12-02T08:06:38Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.2.0-debian-11-r22" \ + org.opencontainers.image.ref.name="5.3.0-debian-11-r2" \ org.opencontainers.image.title="parse-dashboard" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="5.2.0" + org.opencontainers.image.version="5.3.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,22 +21,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl jq libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "node-16.20.2-1-linux-${OS_ARCH}-debian-11" \ - "parse-dashboard-5.2.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.6-11-linux-${OS_ARCH}-debian-11" \ + "node-18.19.0-0-linux-${OS_ARCH}-debian-11" \ + "parse-dashboard-5.3.0-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -46,7 +46,7 @@ RUN mkdir /.local && chmod g+rwX /.local COPY rootfs / RUN /opt/bitnami/scripts/parse-dashboard/postunpack.sh -ENV APP_VERSION="5.2.0" \ +ENV APP_VERSION="5.3.0" \ BITNAMI_APP_NAME="parse-dashboard" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/node/bin:/opt/bitnami/parse-dashboard/bin:$PATH" diff --git a/bitnami/parse-dashboard/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/parse-dashboard/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index cb9a25cecaffa..dc5a1bc568456 100644 --- a/bitnami/parse-dashboard/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/parse-dashboard/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.20.2-1" + "version": "18.19.0-0" }, "parse-dashboard": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "5.2.0-0" + "version": "5.3.0-1" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.6-11" } } \ No newline at end of file diff --git a/bitnami/parse-dashboard/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/parse-dashboard/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/parse-dashboard/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/parse-dashboard/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/parse-dashboard/5/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/parse-dashboard/5/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/parse-dashboard/5/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/parse-dashboard/5/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/parse-dashboard/5/debian-11/tags-info.yaml b/bitnami/parse-dashboard/5/debian-11/tags-info.yaml index 95faca8743059..b0e0902891cdd 100644 --- a/bitnami/parse-dashboard/5/debian-11/tags-info.yaml +++ b/bitnami/parse-dashboard/5/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "5" - 5-debian-11 -- 5.2.0 +- 5.3.0 - latest diff --git a/bitnami/parse-dashboard/README.md b/bitnami/parse-dashboard/README.md index 2a85751999740..633b80877be94 100644 --- a/bitnami/parse-dashboard/README.md +++ b/bitnami/parse-dashboard/README.md @@ -1,4 +1,4 @@ -# Parse Dashboard packaged by Bitnami +# Bitnami package for Parse Dashboard ## What is Parse Dashboard? @@ -23,7 +23,7 @@ You can find the default credentials and available configuration options in the * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/parse/5/debian-11/Dockerfile b/bitnami/parse/5/debian-11/Dockerfile index 81ca243d6dc6e..08b8344a9a59e 100644 --- a/bitnami/parse/5/debian-11/Dockerfile +++ b/bitnami/parse/5/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T22:17:17Z" \ + org.opencontainers.image.created="2023-11-24T22:55:58Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.6.0-debian-11-r0" \ + org.opencontainers.image.ref.name="5.6.0-debian-11-r1" \ org.opencontainers.image.title="parse" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="5.6.0" @@ -21,23 +21,23 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl jq libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "node-16.20.2-1-linux-${OS_ARCH}-debian-11" \ - "mongodb-shell-2.0.2-0-linux-${OS_ARCH}-debian-11" \ + "python-3.11.6-11-linux-${OS_ARCH}-debian-11" \ + "node-18.18.2-0-linux-${OS_ARCH}-debian-11" \ + "mongodb-shell-2.1.0-0-linux-${OS_ARCH}-debian-11" \ "parse-5.6.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/parse/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/parse/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index ec51d5ca21d73..b13b10d36ad90 100644 --- a/bitnami/parse/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/parse/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,13 +3,13 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.0.2-0" + "version": "2.1.0-0" }, "node": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.20.2-1" + "version": "18.18.2-0" }, "parse": { "arch": "amd64", @@ -21,6 +21,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.6-11" } } \ No newline at end of file diff --git a/bitnami/parse/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/parse/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/parse/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/parse/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/parse/6/debian-11/Dockerfile b/bitnami/parse/6/debian-11/Dockerfile index cb2f65e5da974..d3cd1a309c6bb 100644 --- a/bitnami/parse/6/debian-11/Dockerfile +++ b/bitnami/parse/6/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T08:00:15Z" \ + org.opencontainers.image.created="2023-11-21T19:52:11Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.3.1-debian-11-r1" \ + org.opencontainers.image.ref.name="6.4.0-debian-11-r2" \ org.opencontainers.image.title="parse" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="6.3.1" + org.opencontainers.image.version="6.4.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -26,10 +26,10 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl jq libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "node-16.20.2-1-linux-${OS_ARCH}-debian-11" \ - "mongodb-shell-2.0.2-0-linux-${OS_ARCH}-debian-11" \ - "parse-6.3.1-0-linux-${OS_ARCH}-debian-11" \ + "python-3.11.6-10-linux-${OS_ARCH}-debian-11" \ + "node-18.18.2-0-linux-${OS_ARCH}-debian-11" \ + "mongodb-shell-2.1.0-0-linux-${OS_ARCH}-debian-11" \ + "parse-6.4.0-2-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -47,7 +47,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/parse/postunpack.sh -ENV APP_VERSION="6.3.1" \ +ENV APP_VERSION="6.4.0" \ BITNAMI_APP_NAME="parse" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/node/bin:/opt/bitnami/mongodb/bin:/opt/bitnami/parse/bin:$PATH" diff --git a/bitnami/parse/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/parse/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index a2d7cbd7a1e9a..1d8b1114d9abc 100644 --- a/bitnami/parse/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/parse/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,24 +3,24 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.0.2-0" + "version": "2.1.0-0" }, "node": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.20.2-1" + "version": "18.18.2-0" }, "parse": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "6.3.1-0" + "version": "6.4.0-2" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.6-10" } } \ No newline at end of file diff --git a/bitnami/parse/6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/parse/6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/parse/6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/parse/6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/parse/6/debian-11/tags-info.yaml b/bitnami/parse/6/debian-11/tags-info.yaml index c429360460979..cfcdc314d6c9e 100644 --- a/bitnami/parse/6/debian-11/tags-info.yaml +++ b/bitnami/parse/6/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "6" - 6-debian-11 -- 6.3.1 +- 6.4.0 - latest diff --git a/bitnami/parse/README.md b/bitnami/parse/README.md index 46de5f1da61b9..312e921416ff9 100644 --- a/bitnami/parse/README.md +++ b/bitnami/parse/README.md @@ -1,4 +1,4 @@ -# Parse Server packaged by Bitnami +# Bitnami package for Parse Server ## What is Parse Server? diff --git a/bitnami/percona-mysql/8.0/debian-11/Dockerfile b/bitnami/percona-mysql/8.0/debian-11/Dockerfile index b712bd0fe5514..c30294d7049cc 100644 --- a/bitnami/percona-mysql/8.0/debian-11/Dockerfile +++ b/bitnami/percona-mysql/8.0/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:31:14Z" \ + org.opencontainers.image.created="2023-12-18T21:15:24Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.0.34-26-debian-11-r6" \ + org.opencontainers.image.ref.name="8.0.34-26-debian-11-r9" \ org.opencontainers.image.title="percona-mysql" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="8.0.34-26" @@ -21,23 +21,23 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libaio1 libaudit1 libbrotli1 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libev4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblz4-1 liblzma5 libnettle8 libnghttp2-14 libnuma-dev libp11-kit0 libpam0g libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libstdc++6 libsystemd0 libtasn1-6 libudev0 libudev1 libunistring2 libuuid1 libzstd1 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "percona-xtrabackup-binary-8.0.30-23-8-linux-${OS_ARCH}-debian-11" \ - "ini-file-1.4.6-2-linux-${OS_ARCH}-debian-11" \ - "percona-mysql-8.0.34-26-0-linux-${OS_ARCH}-debian-11" \ - "mysql-shell-8.0.34-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "percona-xtrabackup-binary-8.0.35-30-2-linux-${OS_ARCH}-debian-11" \ + "ini-file-1.4.6-4-linux-${OS_ARCH}-debian-11" \ + "percona-mysql-8.0.34-26-1-linux-${OS_ARCH}-debian-11" \ + "mysql-shell-8.0.35-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/percona-mysql/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/percona-mysql/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 4a4b8c536fa4f..0194a813b5ea7 100644 --- a/bitnami/percona-mysql/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/percona-mysql/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,24 +3,24 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-2" + "version": "1.4.6-4" }, "mysql-shell": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.0.34-2" + "version": "8.0.35-2" }, "percona-mysql": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.0.34-26-0" + "version": "8.0.34-26-1" }, "percona-xtrabackup-binary": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.0.30-23-8" + "version": "8.0.35-30-2" } } \ No newline at end of file diff --git a/bitnami/percona-mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/percona-mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/percona-mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/percona-mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/percona-mysql/8.0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/percona-mysql/8.0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/percona-mysql/8.0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/percona-mysql/8.0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/percona-mysql/README.md b/bitnami/percona-mysql/README.md index 21624489c5cc5..ea03766c440e1 100644 --- a/bitnami/percona-mysql/README.md +++ b/bitnami/percona-mysql/README.md @@ -1,4 +1,4 @@ -# Percona Server for MySQL packaged by Bitnami +# Bitnami package for Percona Server for MySQL ## What is Percona Server for MySQL? @@ -18,7 +18,7 @@ docker run --name percona-mysql bitnami/percona-mysql:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/percona-xtrabackup/2.4/debian-11/Dockerfile b/bitnami/percona-xtrabackup/2.4/debian-11/Dockerfile index 036b6a02a889c..26a19fd07a156 100644 --- a/bitnami/percona-xtrabackup/2.4/debian-11/Dockerfile +++ b/bitnami/percona-xtrabackup/2.4/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T20:33:04Z" \ + org.opencontainers.image.created="2023-12-18T21:09:29Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.4.28-debian-11-r168" \ + org.opencontainers.image.ref.name="2.4.29-debian-11-r0" \ org.opencontainers.image.title="percona-xtrabackup" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.4.28" + org.opencontainers.image.version="2.4.29" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libaio1 libbrotli1 libcom-err2 libcrypt1 libcurl4 libev4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libstdc++6 libtasn1-6 libunistring2 procps rsync zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "percona-xtrabackup-2.4.28-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "percona-xtrabackup-2.4.29-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y ca-certificates curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y ca-certificates curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="2.4.28" \ +ENV APP_VERSION="2.4.29" \ BITNAMI_APP_NAME="percona-xtrabackup" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/mysql/bin:$PATH" diff --git a/bitnami/percona-xtrabackup/2.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/percona-xtrabackup/2.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 1402323f6eddc..bd843024d63e0 100644 --- a/bitnami/percona-xtrabackup/2.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/percona-xtrabackup/2.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.28-3" + "version": "2.4.29-0" } } \ No newline at end of file diff --git a/bitnami/percona-xtrabackup/2.4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/percona-xtrabackup/2.4/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/percona-xtrabackup/2.4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/percona-xtrabackup/2.4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/percona-xtrabackup/2.4/debian-11/tags-info.yaml b/bitnami/percona-xtrabackup/2.4/debian-11/tags-info.yaml index 30754351fc565..528b3560185ca 100644 --- a/bitnami/percona-xtrabackup/2.4/debian-11/tags-info.yaml +++ b/bitnami/percona-xtrabackup/2.4/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "2.4" - 2.4-debian-11 -- 2.4.28 +- 2.4.29 diff --git a/bitnami/percona-xtrabackup/8.0/debian-11/Dockerfile b/bitnami/percona-xtrabackup/8.0/debian-11/Dockerfile new file mode 100644 index 0000000000000..840e0f1cedb5b --- /dev/null +++ b/bitnami/percona-xtrabackup/8.0/debian-11/Dockerfile @@ -0,0 +1,50 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +FROM docker.io/bitnami/minideb:bullseye + +ARG TARGETARCH + +LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-12-18T15:21:26Z" \ + org.opencontainers.image.description="Application packaged by VMware, Inc" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.ref.name="8.0.35-30-debian-11-r1" \ + org.opencontainers.image.title="percona-xtrabackup" \ + org.opencontainers.image.vendor="VMware, Inc." \ + org.opencontainers.image.version="8.0.35-30" + +ENV HOME="/" \ + OS_ARCH="${TARGETARCH:-amd64}" \ + OS_FLAVOUR="debian-11" \ + OS_NAME="linux" + +COPY prebuildfs / +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] +# Install required system packages and dependencies +RUN install_packages ca-certificates curl libaio1 libbrotli1 libcom-err2 libcurl4 libev4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblz4-1 liblzma5 libnettle8 libnghttp2-14 libp11-kit0 libprocps8 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libstdc++6 libsystemd0 libtasn1-6 libunistring2 libzstd1 procps rsync zlib1g +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ + COMPONENTS=( \ + "percona-xtrabackup-8.0.35-30-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ + for COMPONENT in "${COMPONENTS[@]}"; do \ + if [ ! -f "${COMPONENT}.tar.gz" ]; then \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ + rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ + done +RUN apt-get autoremove --purge -y ca-certificates curl && \ + apt-get update && apt-get upgrade -y && \ + apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives +RUN chmod g+rwX /opt/bitnami + +ENV APP_VERSION="8.0.35-30" \ + BITNAMI_APP_NAME="percona-xtrabackup" \ + PATH="/opt/bitnami/common/bin:/opt/bitnami/mysql/bin:$PATH" + +USER 1001 +ENTRYPOINT [ "xtrabackup" ] diff --git a/bitnami/percona-xtrabackup/8/debian-11/docker-compose.yml b/bitnami/percona-xtrabackup/8.0/debian-11/docker-compose.yml similarity index 72% rename from bitnami/percona-xtrabackup/8/debian-11/docker-compose.yml rename to bitnami/percona-xtrabackup/8.0/debian-11/docker-compose.yml index 843029839e8ed..69ea4fd619840 100644 --- a/bitnami/percona-xtrabackup/8/debian-11/docker-compose.yml +++ b/bitnami/percona-xtrabackup/8.0/debian-11/docker-compose.yml @@ -4,5 +4,5 @@ version: '2' services: percona-xtrabackup: - image: docker.io/bitnami/percona-xtrabackup:8 + image: docker.io/bitnami/percona-xtrabackup:8.0 entrypoint: sleep infinity diff --git a/bitnami/percona-xtrabackup/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/percona-xtrabackup/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json similarity index 78% rename from bitnami/percona-xtrabackup/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json rename to bitnami/percona-xtrabackup/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 3f2afe760c132..acf125c04aae6 100644 --- a/bitnami/percona-xtrabackup/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/percona-xtrabackup/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.0.34-29-0" + "version": "8.0.35-30-1" } } \ No newline at end of file diff --git a/bitnami/percona-xtrabackup/8.0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/percona-xtrabackup/8.0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt new file mode 100644 index 0000000000000..76956b38e82c6 --- /dev/null +++ b/bitnami/percona-xtrabackup/8.0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt @@ -0,0 +1,2 @@ +Bitnami containers ship with software bundles. You can find the licenses under: +/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/percona-xtrabackup/8.0/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/percona-xtrabackup/8.0/debian-11/prebuildfs/usr/sbin/install_packages new file mode 100755 index 0000000000000..acbc3173208c0 --- /dev/null +++ b/bitnami/percona-xtrabackup/8.0/debian-11/prebuildfs/usr/sbin/install_packages @@ -0,0 +1,27 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -eu + +n=0 +max=2 +export DEBIAN_FRONTEND=noninteractive + +until [ $n -gt $max ]; do + set +e + ( + apt-get update -qq && + apt-get install -y --no-install-recommends "$@" + ) + CODE=$? + set -e + if [ $CODE -eq 0 ]; then + break + fi + if [ $n -eq $max ]; then + exit $CODE + fi + echo "apt failed, retrying" + n=$(($n + 1)) +done +apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/percona-xtrabackup/8.0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/percona-xtrabackup/8.0/debian-11/prebuildfs/usr/sbin/run-script new file mode 100755 index 0000000000000..b7a5bf1e50bff --- /dev/null +++ b/bitnami/percona-xtrabackup/8.0/debian-11/prebuildfs/usr/sbin/run-script @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -u + +if [ $# -eq 0 ]; then + >&2 echo "No arguments provided" + exit 1 +fi + +script=$1 +exit_code="${2:-96}" +fail_if_not_present="${3:-y}" + +if test -f "$script"; then + sh $script + + if [ $? -ne 0 ]; then + exit $((exit_code)) + fi +elif [ "$fail_if_not_present" = "y" ]; then + >&2 echo "script not found: $script" + exit 127 +fi diff --git a/bitnami/php-fpm/8.0/debian-11/tags-info.yaml b/bitnami/percona-xtrabackup/8.0/debian-11/tags-info.yaml similarity index 76% rename from bitnami/php-fpm/8.0/debian-11/tags-info.yaml rename to bitnami/percona-xtrabackup/8.0/debian-11/tags-info.yaml index 10ccc71b54349..f644c692c9338 100644 --- a/bitnami/php-fpm/8.0/debian-11/tags-info.yaml +++ b/bitnami/percona-xtrabackup/8.0/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "8.0" - 8.0-debian-11 -- 8.0.30 +- 8.0.35-30 diff --git a/bitnami/percona-xtrabackup/8/debian-11/Dockerfile b/bitnami/percona-xtrabackup/8.1/debian-11/Dockerfile similarity index 78% rename from bitnami/percona-xtrabackup/8/debian-11/Dockerfile rename to bitnami/percona-xtrabackup/8.1/debian-11/Dockerfile index c8a9e324965f2..28769b5498557 100644 --- a/bitnami/percona-xtrabackup/8/debian-11/Dockerfile +++ b/bitnami/percona-xtrabackup/8.1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:47:14Z" \ + org.opencontainers.image.created="2023-12-18T15:22:51Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.0.34-29-debian-11-r41" \ + org.opencontainers.image.ref.name="8.1.0-1-debian-11-r1" \ org.opencontainers.image.title="percona-xtrabackup" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="8.0.34-29" + org.opencontainers.image.version="8.1.0-1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libaio1 libbrotli1 libcom-err2 libcurl4 libev4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblz4-1 liblzma5 libnettle8 libnghttp2-14 libp11-kit0 libprocps8 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libstdc++6 libsystemd0 libtasn1-6 libunistring2 libzstd1 procps rsync zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "percona-xtrabackup-8.0.34-29-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "percona-xtrabackup-8.1.0-1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y ca-certificates curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y ca-certificates curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="8.0.34-29" \ +ENV APP_VERSION="8.1.0-1" \ BITNAMI_APP_NAME="percona-xtrabackup" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/mysql/bin:$PATH" diff --git a/bitnami/percona-xtrabackup/8.1/debian-11/docker-compose.yml b/bitnami/percona-xtrabackup/8.1/debian-11/docker-compose.yml new file mode 100644 index 0000000000000..345e5c18d7990 --- /dev/null +++ b/bitnami/percona-xtrabackup/8.1/debian-11/docker-compose.yml @@ -0,0 +1,8 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +version: '2' +services: + percona-xtrabackup: + image: docker.io/bitnami/percona-xtrabackup:8.1 + entrypoint: sleep infinity diff --git a/bitnami/percona-xtrabackup/8.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/percona-xtrabackup/8.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json new file mode 100644 index 0000000000000..fc36a94e4bdca --- /dev/null +++ b/bitnami/percona-xtrabackup/8.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -0,0 +1,8 @@ +{ + "percona-xtrabackup": { + "arch": "amd64", + "distro": "debian-11", + "type": "NAMI", + "version": "8.1.0-1-0" + } +} \ No newline at end of file diff --git a/bitnami/percona-xtrabackup/8.1/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/percona-xtrabackup/8.1/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt new file mode 100644 index 0000000000000..76956b38e82c6 --- /dev/null +++ b/bitnami/percona-xtrabackup/8.1/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt @@ -0,0 +1,2 @@ +Bitnami containers ship with software bundles. You can find the licenses under: +/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/percona-xtrabackup/8.1/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/percona-xtrabackup/8.1/debian-11/prebuildfs/usr/sbin/install_packages new file mode 100755 index 0000000000000..acbc3173208c0 --- /dev/null +++ b/bitnami/percona-xtrabackup/8.1/debian-11/prebuildfs/usr/sbin/install_packages @@ -0,0 +1,27 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -eu + +n=0 +max=2 +export DEBIAN_FRONTEND=noninteractive + +until [ $n -gt $max ]; do + set +e + ( + apt-get update -qq && + apt-get install -y --no-install-recommends "$@" + ) + CODE=$? + set -e + if [ $CODE -eq 0 ]; then + break + fi + if [ $n -eq $max ]; then + exit $CODE + fi + echo "apt failed, retrying" + n=$(($n + 1)) +done +apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/percona-xtrabackup/8.1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/percona-xtrabackup/8.1/debian-11/prebuildfs/usr/sbin/run-script new file mode 100755 index 0000000000000..b7a5bf1e50bff --- /dev/null +++ b/bitnami/percona-xtrabackup/8.1/debian-11/prebuildfs/usr/sbin/run-script @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -u + +if [ $# -eq 0 ]; then + >&2 echo "No arguments provided" + exit 1 +fi + +script=$1 +exit_code="${2:-96}" +fail_if_not_present="${3:-y}" + +if test -f "$script"; then + sh $script + + if [ $? -ne 0 ]; then + exit $((exit_code)) + fi +elif [ "$fail_if_not_present" = "y" ]; then + >&2 echo "script not found: $script" + exit 127 +fi diff --git a/bitnami/percona-xtrabackup/8.1/debian-11/tags-info.yaml b/bitnami/percona-xtrabackup/8.1/debian-11/tags-info.yaml new file mode 100644 index 0000000000000..e92165ff71706 --- /dev/null +++ b/bitnami/percona-xtrabackup/8.1/debian-11/tags-info.yaml @@ -0,0 +1,4 @@ +rolling-tags: +- "8.1" +- 8.1-debian-11 +- 8.1.0-1 diff --git a/bitnami/percona-xtrabackup/8.2/debian-11/Dockerfile b/bitnami/percona-xtrabackup/8.2/debian-11/Dockerfile new file mode 100644 index 0000000000000..63fc80aed283d --- /dev/null +++ b/bitnami/percona-xtrabackup/8.2/debian-11/Dockerfile @@ -0,0 +1,50 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +FROM docker.io/bitnami/minideb:bullseye + +ARG TARGETARCH + +LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-12-18T15:22:16Z" \ + org.opencontainers.image.description="Application packaged by VMware, Inc" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.ref.name="8.2.0-1-debian-11-r1" \ + org.opencontainers.image.title="percona-xtrabackup" \ + org.opencontainers.image.vendor="VMware, Inc." \ + org.opencontainers.image.version="8.2.0-1" + +ENV HOME="/" \ + OS_ARCH="${TARGETARCH:-amd64}" \ + OS_FLAVOUR="debian-11" \ + OS_NAME="linux" + +COPY prebuildfs / +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] +# Install required system packages and dependencies +RUN install_packages ca-certificates curl libaio1 libbrotli1 libcom-err2 libcurl4 libev4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblz4-1 liblzma5 libnettle8 libnghttp2-14 libp11-kit0 libprocps8 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libstdc++6 libsystemd0 libtasn1-6 libunistring2 libzstd1 procps rsync zlib1g +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ + COMPONENTS=( \ + "percona-xtrabackup-8.2.0-1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ + for COMPONENT in "${COMPONENTS[@]}"; do \ + if [ ! -f "${COMPONENT}.tar.gz" ]; then \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ + rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ + done +RUN apt-get autoremove --purge -y ca-certificates curl && \ + apt-get update && apt-get upgrade -y && \ + apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives +RUN chmod g+rwX /opt/bitnami + +ENV APP_VERSION="8.2.0-1" \ + BITNAMI_APP_NAME="percona-xtrabackup" \ + PATH="/opt/bitnami/common/bin:/opt/bitnami/mysql/bin:$PATH" + +USER 1001 +ENTRYPOINT [ "xtrabackup" ] diff --git a/bitnami/percona-xtrabackup/8.2/debian-11/docker-compose.yml b/bitnami/percona-xtrabackup/8.2/debian-11/docker-compose.yml new file mode 100644 index 0000000000000..85c1145b24ce3 --- /dev/null +++ b/bitnami/percona-xtrabackup/8.2/debian-11/docker-compose.yml @@ -0,0 +1,8 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +version: '2' +services: + percona-xtrabackup: + image: docker.io/bitnami/percona-xtrabackup:8.2 + entrypoint: sleep infinity diff --git a/bitnami/percona-xtrabackup/8.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/percona-xtrabackup/8.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json new file mode 100644 index 0000000000000..f74f0659698d8 --- /dev/null +++ b/bitnami/percona-xtrabackup/8.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -0,0 +1,8 @@ +{ + "percona-xtrabackup": { + "arch": "amd64", + "distro": "debian-11", + "type": "NAMI", + "version": "8.2.0-1-0" + } +} \ No newline at end of file diff --git a/bitnami/percona-xtrabackup/8.2/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/percona-xtrabackup/8.2/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt new file mode 100644 index 0000000000000..76956b38e82c6 --- /dev/null +++ b/bitnami/percona-xtrabackup/8.2/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt @@ -0,0 +1,2 @@ +Bitnami containers ship with software bundles. You can find the licenses under: +/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/percona-xtrabackup/8.2/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/percona-xtrabackup/8.2/debian-11/prebuildfs/usr/sbin/install_packages new file mode 100755 index 0000000000000..acbc3173208c0 --- /dev/null +++ b/bitnami/percona-xtrabackup/8.2/debian-11/prebuildfs/usr/sbin/install_packages @@ -0,0 +1,27 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -eu + +n=0 +max=2 +export DEBIAN_FRONTEND=noninteractive + +until [ $n -gt $max ]; do + set +e + ( + apt-get update -qq && + apt-get install -y --no-install-recommends "$@" + ) + CODE=$? + set -e + if [ $CODE -eq 0 ]; then + break + fi + if [ $n -eq $max ]; then + exit $CODE + fi + echo "apt failed, retrying" + n=$(($n + 1)) +done +apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/percona-xtrabackup/8.2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/percona-xtrabackup/8.2/debian-11/prebuildfs/usr/sbin/run-script new file mode 100755 index 0000000000000..b7a5bf1e50bff --- /dev/null +++ b/bitnami/percona-xtrabackup/8.2/debian-11/prebuildfs/usr/sbin/run-script @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -u + +if [ $# -eq 0 ]; then + >&2 echo "No arguments provided" + exit 1 +fi + +script=$1 +exit_code="${2:-96}" +fail_if_not_present="${3:-y}" + +if test -f "$script"; then + sh $script + + if [ $? -ne 0 ]; then + exit $((exit_code)) + fi +elif [ "$fail_if_not_present" = "y" ]; then + >&2 echo "script not found: $script" + exit 127 +fi diff --git a/bitnami/percona-xtrabackup/8.2/debian-11/tags-info.yaml b/bitnami/percona-xtrabackup/8.2/debian-11/tags-info.yaml new file mode 100644 index 0000000000000..0854722cef748 --- /dev/null +++ b/bitnami/percona-xtrabackup/8.2/debian-11/tags-info.yaml @@ -0,0 +1,5 @@ +rolling-tags: +- "8.2" +- 8.2-debian-11 +- 8.2.0-1 +- latest diff --git a/bitnami/percona-xtrabackup/8/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/percona-xtrabackup/8/debian-11/prebuildfs/usr/sbin/run-script deleted file mode 100755 index 4ca0f897277eb..0000000000000 --- a/bitnami/percona-xtrabackup/8/debian-11/prebuildfs/usr/sbin/run-script +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -set -u - -if [ $# -eq 0 ]; then - >&2 echo "No arguments provided" - exit 1 -fi - -script=$1 -exit_code="${2:-96}" -fail_if_not_present="${3:-n}" - -if test -f "$script"; then - sh $script - - if [ $? -ne 0 ]; then - exit $((exit_code)) - fi -elif [ "$fail_if_not_present" = "y" ]; then - >&2 echo "script not found: $script" - exit 127 -fi diff --git a/bitnami/percona-xtrabackup/README.md b/bitnami/percona-xtrabackup/README.md index ebc2618388fd0..395794793fa28 100644 --- a/bitnami/percona-xtrabackup/README.md +++ b/bitnami/percona-xtrabackup/README.md @@ -1,4 +1,4 @@ -# Percona XtraBackup packaged by Bitnami +# Bitnami package for Percona XtraBackup ## What is Percona XtraBackup? @@ -18,7 +18,7 @@ docker run --name percona-xtrabackup bitnami/percona-xtrabackup:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/percona-xtrabackup/docker-compose.yml b/bitnami/percona-xtrabackup/docker-compose.yml index 843029839e8ed..85c1145b24ce3 100644 --- a/bitnami/percona-xtrabackup/docker-compose.yml +++ b/bitnami/percona-xtrabackup/docker-compose.yml @@ -4,5 +4,5 @@ version: '2' services: percona-xtrabackup: - image: docker.io/bitnami/percona-xtrabackup:8 + image: docker.io/bitnami/percona-xtrabackup:8.2 entrypoint: sleep infinity diff --git a/bitnami/pgbouncer/1/debian-11/Dockerfile b/bitnami/pgbouncer/1/debian-11/Dockerfile index aace0507ff18e..f96ef3032f7d7 100644 --- a/bitnami/pgbouncer/1/debian-11/Dockerfile +++ b/bitnami/pgbouncer/1/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-20T10:00:06Z" \ + org.opencontainers.image.created="2023-12-06T09:33:12Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.21.0-debian-11-r4" \ + org.opencontainers.image.ref.name="1.21.0-debian-11-r6" \ org.opencontainers.image.title="pgbouncer" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.21.0" @@ -21,23 +21,23 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libaudit1 libbsd0 libc-ares2 libcap-ng0 libedit2 libevent-2.1-7 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblzma5 libmd0 libnettle8 libp11-kit0 libpam0g libsasl2-2 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 locales procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "postgresql-client-14.9.0-1-linux-${OS_ARCH}-debian-11" \ - "ini-file-1.4.6-2-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-3-linux-${OS_ARCH}-debian-11" \ + "postgresql-client-14.10.0-0-linux-${OS_ARCH}-debian-11" \ + "ini-file-1.4.6-3-linux-${OS_ARCH}-debian-11" \ "pgbouncer-1.21.0-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 42544b9bc409e..22d29efe14bf6 100644 --- a/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-2" + "version": "1.4.6-3" }, "pgbouncer": { "arch": "amd64", @@ -15,12 +15,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "14.9.0-1" + "version": "14.10.0-0" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-3" } } \ No newline at end of file diff --git a/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/pgbouncer/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/pgbouncer/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/pgbouncer/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/pgbouncer/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh index c80cdf37a8a67..2f52b7dbfb404 100644 --- a/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh +++ b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh @@ -234,14 +234,29 @@ pgbouncer_initialize() { ini-file set --ignore-inline-comments --section "databases" --key "$PGBOUNCER_DATABASE" --value "$database_value" "$PGBOUNCER_CONF_FILE" i=0; - while true; VAR_NAME="PGBOUNCER_DSN_${i}"; + while true; VAR_NAME="PGBOUNCER_DSN_${i}"; FILE_VAR_NAME="PGBOUNCER_DSN_${i}_FILE"; do - if [ -z "${!VAR_NAME+x}" ]; then - break; - else + if [ -n "${!FILE_VAR_NAME+x}" ]; then + debug "reading \$$VAR_NAME from file, via \$$FILE_VAR_NAME (${!FILE_VAR_NAME})" + if [[ -r "${!FILE_VAR_NAME:-}" ]]; then + export "${VAR_NAME}=$(< "${!FILE_VAR_NAME}")" + unset "${FILE_VAR_NAME}" + else + if [[ "$PGBOUNCER_FAIL_ON_INVALID_DSN_FILE" == "false" ]]; then + warn "Skipping export of '${VAR_NAME}'. '${!FILE_VAR_NAME:-}' is not readable." + else + error "Failed to export \$$VAR_NAME. '${!FILE_VAR_NAME:-}' is not readable." + exit 1 + fi + fi + fi + + if [ -n "${!VAR_NAME:-}" ]; then dsn=${!VAR_NAME}; ini-file set --ignore-inline-comments --section databases --key "$(echo "$dsn" | cut -d = -f 1)" --value "$(echo "$dsn" | cut -d = -f 2-)" "$PGBOUNCER_CONF_FILE"; i=$(( "$i" + 1 )); + else + break; fi; done; diff --git a/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/pgbouncer-env.sh b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/pgbouncer-env.sh index f1090b6fdf0da..e17b76121fb0a 100644 --- a/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/pgbouncer-env.sh +++ b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/pgbouncer-env.sh @@ -50,6 +50,7 @@ pgbouncer_env_vars=( PGBOUNCER_STATS_PERIOD PGBOUNCER_MAX_PREPARED_STATEMENTS PGBOUNCER_EXTRA_FLAGS + PGBOUNCER_FAIL_ON_INVALID_DSN_FILE PGBOUNCER_CLIENT_TLS_SSLMODE PGBOUNCER_CLIENT_TLS_CA_FILE PGBOUNCER_CLIENT_TLS_CERT_FILE @@ -136,10 +137,11 @@ export PGBOUNCER_DEFAULT_POOL_SIZE="${PGBOUNCER_DEFAULT_POOL_SIZE:-}" export PGBOUNCER_MIN_POOL_SIZE="${PGBOUNCER_MIN_POOL_SIZE:-}" export PGBOUNCER_RESERVE_POOL_SIZE="${PGBOUNCER_RESERVE_POOL_SIZE:-}" export PGBOUNCER_RESERVE_POOL_TIMEOUT="${PGBOUNCER_RESERVE_POOL_TIMEOUT:-}" -export PGBOUNCER_IGNORE_STARTUP_PARAMETERS="${PGBOUNCER_IGNORE_STARTUP_PARAMETERS:-}" +export PGBOUNCER_IGNORE_STARTUP_PARAMETERS="${PGBOUNCER_IGNORE_STARTUP_PARAMETERS:-extra_float_digits}" export PGBOUNCER_STATS_PERIOD="${PGBOUNCER_STATS_PERIOD:-60}" export PGBOUNCER_MAX_PREPARED_STATEMENTS="${PGBOUNCER_MAX_PREPARED_STATEMENTS:-}" export PGBOUNCER_EXTRA_FLAGS="${PGBOUNCER_EXTRA_FLAGS:-}" +export PGBOUNCER_FAIL_ON_INVALID_DSN_FILE="${PGBOUNCER_FAIL_ON_INVALID_DSN_FILE:-false}" # Client TLS settings export PGBOUNCER_CLIENT_TLS_SSLMODE="${PGBOUNCER_CLIENT_TLS_SSLMODE:-disable}" diff --git a/bitnami/pgbouncer/README.md b/bitnami/pgbouncer/README.md index 8ebc48a37e99c..2ae36ffb99711 100644 --- a/bitnami/pgbouncer/README.md +++ b/bitnami/pgbouncer/README.md @@ -1,4 +1,4 @@ -# PgBouncer packaged by Bitnami +# Bitnami package for PgBouncer ## What is PgBouncer? @@ -27,7 +27,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. @@ -90,6 +90,7 @@ The Bitnami PgBouncer container requires a running PostgreSQL installation to co * `PGBOUNCER_SET_DATABASE_PASSWORD`: Whether to include the backend PostgreSQL password in the database string. Default **no**. * `PGBOUNCER_CONNECT_QUERY`: Query which will be executed after a connection is established. No Defaults. * `PGBOUNCER_DSN_${i}`: PgBouncer configuration string for extra PostgreSQL server, where `i` is a number starting at zero (`0`). +* `PGBOUNCER_DSN_${i}_FILE`: As an alternative to specifying extra PostgreSQL servers *directly* using `PGBOUNCER_DSN_${i}` (see above), specify file paths containing the values, one file per PostgreSQL server. This is in line how other variables get read from `$…_FILE` if it is provided. – By default, when a file is missing, a warning will be printed, and all others will be used. If you set `$PGBOUNCER_FAIL_ON_INVALID_DSN_FILE` to `true`, the initialisation process will instead abort with an error. * `PGBOUNCER_USERLIST_FILE`: Custom PgBouncer userlists file with connection credentials for any extra PostgreSQL backend. Required line format (including quotes): `"" ""`. ### Port and address binding @@ -115,6 +116,7 @@ docker run --name pgbouncer \ In case you'd like pgbouncer to expose your database with a different name, you can use the `PGBOUNCER_DATABASE` variable. To expose the same database name as the backend, set `PGBOUNCER_DATABASE="$POSTGRESQL_DATABASE"`. +To expose a ["fallback database" (wildcard that matches any)](https://www.pgbouncer.org/config.html#section-databases)), set `PGBOUNCER_DATABASE="*"`. ### Other options diff --git a/bitnami/pgpool/4/debian-11/Dockerfile b/bitnami/pgpool/4/debian-11/Dockerfile index 3ad4c7069450a..1d06efed18c3b 100644 --- a/bitnami/pgpool/4/debian-11/Dockerfile +++ b/bitnami/pgpool/4/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T17:45:33Z" \ + org.opencontainers.image.created="2023-12-12T16:31:08Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.4.4-debian-11-r45" \ + org.opencontainers.image.ref.name="4.5.0-debian-11-r0" \ org.opencontainers.image.title="pgpool" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="4.4.4" + org.opencontainers.image.version="4.5.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,22 +21,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl ldap-utils libaudit1 libbsd0 libcap-ng0 libcom-err2 libcrypt1 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 libldap-common liblzma5 libmd0 libnettle8 libnss-ldapd libp11-kit0 libpam-ldapd libpam0g libpq5 libsasl2-2 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 nslcd procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "postgresql-client-14.9.0-1-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.7-1-linux-${OS_ARCH}-debian-11" \ - "pgpool-4.4.4-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "postgresql-client-14.10.0-0-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "pgpool-4.5.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/pgpool/postunpack.sh -ENV APP_VERSION="4.4.4" \ +ENV APP_VERSION="4.5.0" \ BITNAMI_APP_NAME="pgpool" \ LD_LIBRARY_PATH="/opt/bitnami/common/lib:/opt/bitnami/common/lib64:$LD_LIBRARY_PATH" \ PATH="/opt/bitnami/postgresql/bin:/opt/bitnami/common/bin:/opt/bitnami/common/sbin:/opt/bitnami/pgpool/bin:$PATH" diff --git a/bitnami/pgpool/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/pgpool/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index b23caede11566..b754688a9f46d 100644 --- a/bitnami/pgpool/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/pgpool/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.4.4-1" + "version": "4.5.0-0" }, "postgresql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "14.9.0-1" + "version": "14.10.0-0" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-1" + "version": "1.0.7-4" } } \ No newline at end of file diff --git a/bitnami/pgpool/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/pgpool/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/pgpool/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/pgpool/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/pgpool/4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/pgpool/4/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/pgpool/4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/pgpool/4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/pgpool/4/debian-11/tags-info.yaml b/bitnami/pgpool/4/debian-11/tags-info.yaml index 7416b9249b917..50c5cb1464105 100644 --- a/bitnami/pgpool/4/debian-11/tags-info.yaml +++ b/bitnami/pgpool/4/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "4" - 4-debian-11 -- 4.4.4 +- 4.5.0 - latest diff --git a/bitnami/pgpool/README.md b/bitnami/pgpool/README.md index 23ef4d4c8fd7e..dafd51e41d974 100644 --- a/bitnami/pgpool/README.md +++ b/bitnami/pgpool/README.md @@ -1,4 +1,4 @@ -# Pgpool-II packaged by Bitnami +# Bitnami package for Pgpool-II ## What is Pgpool-II? @@ -23,7 +23,7 @@ You can find the default credentials and available configuration options in the * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/php-fpm/8.0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/php-fpm/8.0/debian-11/prebuildfs/usr/sbin/run-script deleted file mode 100755 index 4ca0f897277eb..0000000000000 --- a/bitnami/php-fpm/8.0/debian-11/prebuildfs/usr/sbin/run-script +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -set -u - -if [ $# -eq 0 ]; then - >&2 echo "No arguments provided" - exit 1 -fi - -script=$1 -exit_code="${2:-96}" -fail_if_not_present="${3:-n}" - -if test -f "$script"; then - sh $script - - if [ $? -ne 0 ]; then - exit $((exit_code)) - fi -elif [ "$fail_if_not_present" = "y" ]; then - >&2 echo "script not found: $script" - exit 127 -fi diff --git a/bitnami/php-fpm/8.1/debian-11/Dockerfile b/bitnami/php-fpm/8.1/debian-11/Dockerfile index cdf9faa568195..99ae4388b4682 100644 --- a/bitnami/php-fpm/8.1/debian-11/Dockerfile +++ b/bitnami/php-fpm/8.1/debian-11/Dockerfile @@ -7,33 +7,33 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T01:50:06Z" \ + org.opencontainers.image.created="2023-12-15T06:12:28Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.1.25-debian-11-r0" \ + org.opencontainers.image.ref.name="8.1.26-debian-11-r13" \ org.opencontainers.image.title="php-fpm" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="8.1.25" + org.opencontainers.image.version="8.1.26" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbrotli1 libbsd0 libbz2-1.0 libcom-err2 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.1.25-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "php-8.1.26-11-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -42,7 +42,7 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ sed -i 's/^PASS_MIN_DAYS.*/PASS_MIN_DAYS 0/' /etc/login.defs && \ sed -i 's/sha512/sha512 minlen=8/' /etc/pam.d/common-password -ENV APP_VERSION="8.1.25" \ +ENV APP_VERSION="8.1.26" \ BITNAMI_APP_NAME="php-fpm" \ PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:$PATH" diff --git a/bitnami/php-fpm/8.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/php-fpm/8.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c0b960b25610d..2d1059d71f703 100644 --- a/bitnami/php-fpm/8.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/php-fpm/8.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.25-0" + "version": "8.1.26-11" } } \ No newline at end of file diff --git a/bitnami/php-fpm/8.1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/php-fpm/8.1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/php-fpm/8.1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/php-fpm/8.1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/php-fpm/8.1/debian-11/tags-info.yaml b/bitnami/php-fpm/8.1/debian-11/tags-info.yaml index 4d0d2e0c136e3..6c214964d19e1 100644 --- a/bitnami/php-fpm/8.1/debian-11/tags-info.yaml +++ b/bitnami/php-fpm/8.1/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "8.1" - 8.1-debian-11 -- 8.1.25 +- 8.1.26 diff --git a/bitnami/php-fpm/8.2/debian-11/Dockerfile b/bitnami/php-fpm/8.2/debian-11/Dockerfile index bf223344ba22f..a84182b78c83f 100644 --- a/bitnami/php-fpm/8.2/debian-11/Dockerfile +++ b/bitnami/php-fpm/8.2/debian-11/Dockerfile @@ -7,33 +7,33 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T23:12:18Z" \ + org.opencontainers.image.created="2023-12-15T05:10:40Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.2.12-debian-11-r0" \ + org.opencontainers.image.ref.name="8.2.13-debian-11-r13" \ org.opencontainers.image.title="php-fpm" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="8.2.12" + org.opencontainers.image.version="8.2.13" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbrotli1 libbsd0 libbz2-1.0 libcom-err2 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.2.12-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "php-8.2.13-11-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -42,7 +42,7 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ sed -i 's/^PASS_MIN_DAYS.*/PASS_MIN_DAYS 0/' /etc/login.defs && \ sed -i 's/sha512/sha512 minlen=8/' /etc/pam.d/common-password -ENV APP_VERSION="8.2.12" \ +ENV APP_VERSION="8.2.13" \ BITNAMI_APP_NAME="php-fpm" \ PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:$PATH" diff --git a/bitnami/php-fpm/8.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/php-fpm/8.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 5d697c3e768ac..ee756c255c7c1 100644 --- a/bitnami/php-fpm/8.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/php-fpm/8.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.12-0" + "version": "8.2.13-11" } } \ No newline at end of file diff --git a/bitnami/php-fpm/8.2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/php-fpm/8.2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/php-fpm/8.2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/php-fpm/8.2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/php-fpm/8.2/debian-11/tags-info.yaml b/bitnami/php-fpm/8.2/debian-11/tags-info.yaml index 08379a604fda5..ab59c0bed28a1 100644 --- a/bitnami/php-fpm/8.2/debian-11/tags-info.yaml +++ b/bitnami/php-fpm/8.2/debian-11/tags-info.yaml @@ -1,5 +1,4 @@ rolling-tags: - "8.2" - 8.2-debian-11 -- 8.2.12 -- latest +- 8.2.13 diff --git a/bitnami/php-fpm/8.0/debian-11/Dockerfile b/bitnami/php-fpm/8.3/debian-11/Dockerfile similarity index 82% rename from bitnami/php-fpm/8.0/debian-11/Dockerfile rename to bitnami/php-fpm/8.3/debian-11/Dockerfile index d642d54726712..d103a1282a803 100644 --- a/bitnami/php-fpm/8.0/debian-11/Dockerfile +++ b/bitnami/php-fpm/8.3/debian-11/Dockerfile @@ -7,33 +7,33 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:09:20Z" \ + org.opencontainers.image.created="2023-12-09T05:23:39Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.0.30-debian-11-r61" \ + org.opencontainers.image.ref.name="8.3.0-debian-11-r5" \ org.opencontainers.image.title="php-fpm" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="8.0.30" + org.opencontainers.image.version="8.3.0" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbrotli1 libbsd0 libbz2-1.0 libcom-err2 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.0.30-13-linux-${OS_ARCH}-debian-11" \ - ) && \ + "php-8.3.0-5-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -42,7 +42,7 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ sed -i 's/^PASS_MIN_DAYS.*/PASS_MIN_DAYS 0/' /etc/login.defs && \ sed -i 's/sha512/sha512 minlen=8/' /etc/pam.d/common-password -ENV APP_VERSION="8.0.30" \ +ENV APP_VERSION="8.3.0" \ BITNAMI_APP_NAME="php-fpm" \ PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:$PATH" diff --git a/bitnami/php-fpm/8.0/debian-11/docker-compose.yml b/bitnami/php-fpm/8.3/debian-11/docker-compose.yml similarity index 84% rename from bitnami/php-fpm/8.0/debian-11/docker-compose.yml rename to bitnami/php-fpm/8.3/debian-11/docker-compose.yml index 5ec7b9757012f..fb066af7598c3 100644 --- a/bitnami/php-fpm/8.0/debian-11/docker-compose.yml +++ b/bitnami/php-fpm/8.3/debian-11/docker-compose.yml @@ -6,7 +6,7 @@ version: '2' services: php: tty: true # Enables debugging capabilities when attached to this container. - image: docker.io/bitnami/php-fpm:8.0 + image: docker.io/bitnami/php-fpm:8.3 ports: - 9000:9000 volumes: diff --git a/bitnami/php-fpm/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/php-fpm/8.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json similarity index 76% rename from bitnami/php-fpm/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json rename to bitnami/php-fpm/8.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index baa6f6447e087..91cc72f2c1923 100644 --- a/bitnami/php-fpm/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/php-fpm/8.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.0.30-13" + "version": "8.3.0-5" } } \ No newline at end of file diff --git a/bitnami/php-fpm/8.3/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/php-fpm/8.3/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt new file mode 100644 index 0000000000000..76956b38e82c6 --- /dev/null +++ b/bitnami/php-fpm/8.3/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt @@ -0,0 +1,2 @@ +Bitnami containers ship with software bundles. You can find the licenses under: +/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/php-fpm/8.3/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/php-fpm/8.3/debian-11/prebuildfs/usr/sbin/install_packages new file mode 100755 index 0000000000000..acbc3173208c0 --- /dev/null +++ b/bitnami/php-fpm/8.3/debian-11/prebuildfs/usr/sbin/install_packages @@ -0,0 +1,27 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -eu + +n=0 +max=2 +export DEBIAN_FRONTEND=noninteractive + +until [ $n -gt $max ]; do + set +e + ( + apt-get update -qq && + apt-get install -y --no-install-recommends "$@" + ) + CODE=$? + set -e + if [ $CODE -eq 0 ]; then + break + fi + if [ $n -eq $max ]; then + exit $CODE + fi + echo "apt failed, retrying" + n=$(($n + 1)) +done +apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/php-fpm/8.3/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/php-fpm/8.3/debian-11/prebuildfs/usr/sbin/run-script new file mode 100755 index 0000000000000..b7a5bf1e50bff --- /dev/null +++ b/bitnami/php-fpm/8.3/debian-11/prebuildfs/usr/sbin/run-script @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -u + +if [ $# -eq 0 ]; then + >&2 echo "No arguments provided" + exit 1 +fi + +script=$1 +exit_code="${2:-96}" +fail_if_not_present="${3:-y}" + +if test -f "$script"; then + sh $script + + if [ $? -ne 0 ]; then + exit $((exit_code)) + fi +elif [ "$fail_if_not_present" = "y" ]; then + >&2 echo "script not found: $script" + exit 127 +fi diff --git a/bitnami/php-fpm/8.3/debian-11/tags-info.yaml b/bitnami/php-fpm/8.3/debian-11/tags-info.yaml new file mode 100644 index 0000000000000..1f458fe75ec15 --- /dev/null +++ b/bitnami/php-fpm/8.3/debian-11/tags-info.yaml @@ -0,0 +1,5 @@ +rolling-tags: +- "8.3" +- 8.3-debian-11 +- 8.3.0 +- latest diff --git a/bitnami/php-fpm/README.md b/bitnami/php-fpm/README.md index 60ead52489536..018f615d3d7ea 100644 --- a/bitnami/php-fpm/README.md +++ b/bitnami/php-fpm/README.md @@ -1,4 +1,4 @@ -# PHP-FPM packaged by Bitnami +# Bitnami package for PHP-FPM ## What is PHP-FPM? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/php-fpm/docker-compose.yml b/bitnami/php-fpm/docker-compose.yml index 1b8bb5d7a6c31..fb066af7598c3 100644 --- a/bitnami/php-fpm/docker-compose.yml +++ b/bitnami/php-fpm/docker-compose.yml @@ -6,7 +6,7 @@ version: '2' services: php: tty: true # Enables debugging capabilities when attached to this container. - image: docker.io/bitnami/php-fpm:8.2 + image: docker.io/bitnami/php-fpm:8.3 ports: - 9000:9000 volumes: diff --git a/bitnami/phpbb/3/debian-11/Dockerfile b/bitnami/phpbb/3/debian-11/Dockerfile index 363c906add592..b41c4fa29f3f1 100644 --- a/bitnami/phpbb/3/debian-11/Dockerfile +++ b/bitnami/phpbb/3/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-22T16:27:17Z" \ + org.opencontainers.image.created="2023-12-02T09:20:48Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.3.11-debian-11-r0" \ + org.opencontainers.image.ref.name="3.3.11-debian-11-r3" \ org.opencontainers.image.title="phpbb" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.3.11" @@ -21,25 +21,25 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl jq libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.2.11-3-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.58-0-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.11.5-1-linux-${OS_ARCH}-debian-11" \ - "libphp-8.2.11-1-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ + "php-8.2.13-6-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.58-1-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.11.6-0-linux-${OS_ARCH}-debian-11" \ + "libphp-8.2.13-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-3-linux-${OS_ARCH}-debian-11" \ "phpbb-3.3.11-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/phpbb/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/phpbb/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 6868baec82b38..a796404240a27 100644 --- a/bitnami/phpbb/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/phpbb/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,25 +3,25 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.58-0" + "version": "2.4.58-1" }, "libphp": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.11-1" + "version": "8.2.13-0" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.11.5-1" + "version": "10.11.6-0" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.11-3" + "version": "8.2.13-6" }, "phpbb": { "arch": "amd64", @@ -33,6 +33,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-3" } } \ No newline at end of file diff --git a/bitnami/phpbb/3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/phpbb/3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/phpbb/3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/phpbb/3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/phpbb/3/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/phpbb/3/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/phpbb/3/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/phpbb/3/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/phpbb/3/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/phpbb/3/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh index 765d1d8ce1ed5..6a480ad4ddde9 100755 --- a/bitnami/phpbb/3/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh +++ b/bitnami/phpbb/3/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh @@ -46,6 +46,7 @@ apache_setup_bitnami_config() { local -a modules_to_disable=( "http2_module" "proxy_hcheck_module" + "proxy_html_module" "proxy_http2_module" ) for module in "${modules_to_disable[@]}"; do diff --git a/bitnami/phpbb/README.md b/bitnami/phpbb/README.md index 327a950ec0f60..6cee1661ccd9a 100644 --- a/bitnami/phpbb/README.md +++ b/bitnami/phpbb/README.md @@ -1,4 +1,4 @@ -# phpBB packaged by Bitnami +# Bitnami package for phpBB ## What is phpBB? @@ -21,7 +21,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/phpmyadmin/5/debian-11/Dockerfile b/bitnami/phpmyadmin/5/debian-11/Dockerfile index bcca6a93b79eb..ff64ef6a06bfc 100644 --- a/bitnami/phpmyadmin/5/debian-11/Dockerfile +++ b/bitnami/phpmyadmin/5/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T20:39:27Z" \ + org.opencontainers.image.created="2023-12-02T07:24:26Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.2.1-debian-11-r124" \ + org.opencontainers.image.ref.name="5.2.1-debian-11-r127" \ org.opencontainers.image.title="phpmyadmin" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="5.2.1" @@ -21,25 +21,25 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.2.11-3-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.57-12-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.11.5-1-linux-${OS_ARCH}-debian-11" \ - "libphp-8.2.11-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ + "php-8.2.13-6-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.58-1-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.11.6-0-linux-${OS_ARCH}-debian-11" \ + "libphp-8.2.13-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-3-linux-${OS_ARCH}-debian-11" \ "phpmyadmin-5.2.1-7-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/phpmyadmin/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/phpmyadmin/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index b8d9ea3721e82..5750bcfb277e6 100644 --- a/bitnami/phpmyadmin/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/phpmyadmin/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,25 +3,25 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.57-12" + "version": "2.4.58-1" }, "libphp": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.11-0" + "version": "8.2.13-0" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.11.5-1" + "version": "10.11.6-0" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.11-3" + "version": "8.2.13-6" }, "phpmyadmin": { "arch": "amd64", @@ -33,6 +33,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-3" } } \ No newline at end of file diff --git a/bitnami/phpmyadmin/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/phpmyadmin/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/phpmyadmin/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/phpmyadmin/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/phpmyadmin/5/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/phpmyadmin/5/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/phpmyadmin/5/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/phpmyadmin/5/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/phpmyadmin/5/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/phpmyadmin/5/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh index 765d1d8ce1ed5..6a480ad4ddde9 100755 --- a/bitnami/phpmyadmin/5/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh +++ b/bitnami/phpmyadmin/5/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh @@ -46,6 +46,7 @@ apache_setup_bitnami_config() { local -a modules_to_disable=( "http2_module" "proxy_hcheck_module" + "proxy_html_module" "proxy_http2_module" ) for module in "${modules_to_disable[@]}"; do diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md index 4b32f6fdc0369..86ee6396390ec 100644 --- a/bitnami/phpmyadmin/README.md +++ b/bitnami/phpmyadmin/README.md @@ -1,4 +1,4 @@ -# phpMyAdmin packaged by Bitnami +# Bitnami package for phpMyAdmin ## What is phpMyAdmin? @@ -23,7 +23,7 @@ You can find the default credentials and available configuration options in the * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/pinniped-cli/0/debian-11/Dockerfile b/bitnami/pinniped-cli/0/debian-11/Dockerfile index 5c23be86e1fe0..c8d8040efcacb 100644 --- a/bitnami/pinniped-cli/0/debian-11/Dockerfile +++ b/bitnami/pinniped-cli/0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T16:46:18Z" \ + org.opencontainers.image.created="2023-12-16T04:39:02Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.27.0-debian-11-r0" \ + org.opencontainers.image.ref.name="0.28.0-debian-11-r0" \ org.opencontainers.image.title="pinniped-cli" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.27.0" + org.opencontainers.image.version="0.28.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,27 +21,27 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "pinniped-cli-0.27.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "pinniped-cli-0.28.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN useradd -r -u 1001 -g root pinniped-cli -ENV APP_VERSION="0.27.0" \ +ENV APP_VERSION="0.28.0" \ BITNAMI_APP_NAME="pinniped-cli" \ PATH="/opt/bitnami/pinniped-cli/bin:$PATH" diff --git a/bitnami/pinniped-cli/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/pinniped-cli/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 755446b908835..0a0bed6dbf50d 100644 --- a/bitnami/pinniped-cli/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/pinniped-cli/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.27.0-0" + "version": "0.28.0-0" } } \ No newline at end of file diff --git a/bitnami/pinniped-cli/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/pinniped-cli/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/pinniped-cli/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/pinniped-cli/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/pinniped-cli/0/debian-11/tags-info.yaml b/bitnami/pinniped-cli/0/debian-11/tags-info.yaml index 7851e3a3c1a19..bb16cd516c627 100644 --- a/bitnami/pinniped-cli/0/debian-11/tags-info.yaml +++ b/bitnami/pinniped-cli/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.27.0 +- 0.28.0 - latest diff --git a/bitnami/pinniped-cli/README.md b/bitnami/pinniped-cli/README.md index 5889e00761671..c40d0c9b2ef90 100644 --- a/bitnami/pinniped-cli/README.md +++ b/bitnami/pinniped-cli/README.md @@ -1,4 +1,4 @@ -# Pinniped CLI packaged by Bitnami +# Bitnami package for Pinniped CLI ## What is Pinniped CLI? @@ -22,12 +22,12 @@ docker-compose up -d ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use Pinniped CLI in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/pinniped/0/debian-11/Dockerfile b/bitnami/pinniped/0/debian-11/Dockerfile index 43aba3795fa85..02e04b0cdee92 100644 --- a/bitnami/pinniped/0/debian-11/Dockerfile +++ b/bitnami/pinniped/0/debian-11/Dockerfile @@ -8,21 +8,21 @@ ARG TARGETARCH ENV OS_ARCH="${TARGETARCH:-amd64}" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "pinniped-0.27.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "pinniped-0.28.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done @@ -36,19 +36,19 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="scratch" \ - org.opencontainers.image.created="2023-10-11T07:42:42Z" \ + org.opencontainers.image.created="2023-12-16T04:50:34Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.27.0-debian-11-r0" \ + org.opencontainers.image.ref.name="0.28.0-debian-11-r0" \ org.opencontainers.image.title="pinniped" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.27.0" + org.opencontainers.image.version="0.28.0" COPY prebuildfs / COPY rootfs / COPY --from=builder /opt/bitnami/pinniped/bin / -ENV APP_VERSION="0.27.0" \ +ENV APP_VERSION="0.28.0" \ BITNAMI_APP_NAME="pinniped" \ PATH="/" diff --git a/bitnami/pinniped/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/pinniped/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index fc8f5ad73cace..bd716e93cb249 100644 --- a/bitnami/pinniped/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/pinniped/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.27.0-0" + "version": "0.28.0-0" } } \ No newline at end of file diff --git a/bitnami/pinniped/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/pinniped/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/pinniped/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/pinniped/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/pinniped/0/debian-11/tags-info.yaml b/bitnami/pinniped/0/debian-11/tags-info.yaml index 7851e3a3c1a19..bb16cd516c627 100644 --- a/bitnami/pinniped/0/debian-11/tags-info.yaml +++ b/bitnami/pinniped/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.27.0 +- 0.28.0 - latest diff --git a/bitnami/pinniped/README.md b/bitnami/pinniped/README.md index 65e190a6c2669..a0324c616b0a2 100644 --- a/bitnami/pinniped/README.md +++ b/bitnami/pinniped/README.md @@ -1,4 +1,4 @@ -# Pinniped packaged by Bitnami +# Bitnami package for Pinniped ## What is Pinniped? @@ -15,12 +15,12 @@ docker run --name pinniped bitnami/pinniped:latest ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use Pinniped in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/postgres-exporter/0/debian-11/Dockerfile b/bitnami/postgres-exporter/0/debian-11/Dockerfile index d42e9afcb35c2..c77747a6ebf7c 100644 --- a/bitnami/postgres-exporter/0/debian-11/Dockerfile +++ b/bitnami/postgres-exporter/0/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-27T16:39:00Z" \ + org.opencontainers.image.created="2023-12-06T23:09:28Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.15.0-debian-11-r0" \ + org.opencontainers.image.ref.name="0.15.0-debian-11-r3" \ org.opencontainers.image.title="postgres-exporter" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="0.15.0" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "postgres-exporter-0.15.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "postgres-exporter-0.15.0-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/postgres-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgres-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index ce1b4d71de389..c230d40110ede 100644 --- a/bitnami/postgres-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/postgres-exporter/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.15.0-0" + "version": "0.15.0-2" } } \ No newline at end of file diff --git a/bitnami/postgres-exporter/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/postgres-exporter/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/postgres-exporter/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/postgres-exporter/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/postgres-exporter/README.md b/bitnami/postgres-exporter/README.md index 82952b5e626d1..582878f2f218d 100644 --- a/bitnami/postgres-exporter/README.md +++ b/bitnami/postgres-exporter/README.md @@ -1,4 +1,4 @@ -# PostgreSQL Exporter packaged by Bitnami +# Bitnami package for PostgreSQL Exporter ## What is PostgreSQL Exporter? @@ -18,7 +18,7 @@ docker run --name postgres-exporter bitnami/postgres-exporter:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/postgresql-repmgr/11/debian-11/Dockerfile b/bitnami/postgresql-repmgr/11/debian-11/Dockerfile deleted file mode 100644 index 7324a37b9c291..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/Dockerfile +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -FROM docker.io/bitnami/minideb:bullseye - -ARG TARGETARCH - -LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ - org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-12T23:18:27Z" \ - org.opencontainers.image.description="Application packaged by VMware, Inc" \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="11.21.0-debian-11-r52" \ - org.opencontainers.image.title="postgresql-repmgr" \ - org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="11.21.0" - -ENV HOME="/" \ - OS_ARCH="${TARGETARCH:-amd64}" \ - OS_FLAVOUR="debian-11" \ - OS_NAME="linux" - -COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] -# Install required system packages and dependencies -RUN install_packages ca-certificates curl libbsd0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblzma5 libmd0 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 locales procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - COMPONENTS=( \ - "postgresql-repmgr-11.21.0-7-linux-${OS_ARCH}-debian-11" \ - ) && \ - for COMPONENT in "${COMPONENTS[@]}"; do \ - if [ ! -f "${COMPONENT}.tar.gz" ]; then \ - curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ - curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ - done -RUN apt-get autoremove --purge -y curl && \ - apt-get update && apt-get upgrade -y && \ - apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives -RUN chmod g+rwX /opt/bitnami -RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8 -RUN update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX && \ - DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales -RUN echo 'en_GB.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen -RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen - -COPY rootfs / -RUN /opt/bitnami/scripts/postgresql-repmgr/postunpack.sh -RUN /opt/bitnami/scripts/locales/add-extra-locales.sh -ENV APP_VERSION="11.21.0" \ - BITNAMI_APP_NAME="postgresql-repmgr" \ - LANG="en_US.UTF-8" \ - LANGUAGE="en_US:en" \ - NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \ - PATH="/opt/bitnami/postgresql/bin:/opt/bitnami/repmgr/bin:$PATH" - -EXPOSE 5432 - -USER 1001 -ENTRYPOINT [ "/opt/bitnami/scripts/postgresql-repmgr/entrypoint.sh" ] -CMD [ "/opt/bitnami/scripts/postgresql-repmgr/run.sh" ] diff --git a/bitnami/postgresql-repmgr/11/debian-11/docker-compose.yml b/bitnami/postgresql-repmgr/11/debian-11/docker-compose.yml deleted file mode 100644 index a76b63a33af55..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/docker-compose.yml +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -version: '2' -services: - pg-0: - image: docker.io/bitnami/postgresql-repmgr:11 - ports: - - 5432 - volumes: - - pg_0_data:/bitnami/postgresql - environment: - - POSTGRESQL_POSTGRES_PASSWORD=adminpassword - - POSTGRESQL_USERNAME=customuser - - POSTGRESQL_PASSWORD=custompassword - - POSTGRESQL_DATABASE=customdatabase - - REPMGR_PASSWORD=repmgrpassword - - REPMGR_PRIMARY_HOST=pg-0 - - REPMGR_PRIMARY_PORT=5432 - - REPMGR_PARTNER_NODES=pg-0,pg-1:5432 - - REPMGR_NODE_NAME=pg-0 - - REPMGR_NODE_NETWORK_NAME=pg-0 - - REPMGR_PORT_NUMBER=5432 - pg-1: - image: docker.io/bitnami/postgresql-repmgr:11 - ports: - - 5432 - volumes: - - pg_1_data:/bitnami/postgresql - environment: - - POSTGRESQL_POSTGRES_PASSWORD=adminpassword - - POSTGRESQL_USERNAME=customuser - - POSTGRESQL_PASSWORD=custompassword - - POSTGRESQL_DATABASE=customdatabase - - REPMGR_PASSWORD=repmgrpassword - - REPMGR_PRIMARY_HOST=pg-0 - - REPMGR_PRIMARY_PORT=5432 - - REPMGR_PARTNER_NODES=pg-0,pg-1:5432 - - REPMGR_NODE_NAME=pg-1 - - REPMGR_NODE_NETWORK_NAME=pg-1 - - REPMGR_PORT_NUMBER=5432 -volumes: - pg_0_data: - driver: local - pg_1_data: - driver: local diff --git a/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json deleted file mode 100644 index eff4be9fa5a92..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "postgresql-repmgr": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "11.21.0-7" - } -} \ No newline at end of file diff --git a/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh deleted file mode 100644 index 184de8a117e28..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Bitnami custom library - -# shellcheck disable=SC1091 - -# Load Generic Libraries -. /opt/bitnami/scripts/liblog.sh - -# Constants -BOLD='\033[1m' - -# Functions - -######################## -# Print the welcome page -# Globals: -# DISABLE_WELCOME_MESSAGE -# BITNAMI_APP_NAME -# Arguments: -# None -# Returns: -# None -######################### -print_welcome_page() { - if [[ -z "${DISABLE_WELCOME_MESSAGE:-}" ]]; then - if [[ -n "$BITNAMI_APP_NAME" ]]; then - print_image_welcome_page - fi - fi -} - -######################## -# Print the welcome page for a Bitnami Docker image -# Globals: -# BITNAMI_APP_NAME -# Arguments: -# None -# Returns: -# None -######################### -print_image_welcome_page() { - local github_url="https://github.com/bitnami/containers" - - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" -} - diff --git a/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/usr/sbin/run-script deleted file mode 100755 index 4ca0f897277eb..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/usr/sbin/run-script +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -set -u - -if [ $# -eq 0 ]; then - >&2 echo "No arguments provided" - exit 1 -fi - -script=$1 -exit_code="${2:-96}" -fail_if_not_present="${3:-n}" - -if test -f "$script"; then - sh $script - - if [ $? -ne 0 ]; then - exit $((exit_code)) - fi -elif [ "$fail_if_not_present" = "y" ]; then - >&2 echo "script not found: $script" - exit 127 -fi diff --git a/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/includes/anotate_event_processing.sh b/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/includes/anotate_event_processing.sh deleted file mode 100755 index 8e48230cebbee..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/includes/anotate_event_processing.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -header="[REPMGR EVENT::$2]" -export header -echo "$header Node id: $1; Event type: $2; Success [1|0]: $3; Time: $4; Details: $5" - -if [[ $3 -ne 1 ]];then - echo "$header The event failed! No need to do anything." - exit 1 -fi - -if [[ $1 -ne $(repmgr_get_node_id) ]]; then - echo "$header The event did not happen on me! No need to do anything." - exit 1 -fi diff --git a/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/includes/lock_primary.sh b/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/includes/lock_primary.sh deleted file mode 100755 index c627f25ee2760..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/includes/lock_primary.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# shellcheck disable=SC2154 -echo "$header Locking primary..." -echo "$4" >> "$REPMGR_PRIMARY_ROLE_LOCK_FILE_NAME" diff --git a/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/includes/lock_standby.sh b/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/includes/lock_standby.sh deleted file mode 100755 index 83f0f848413bc..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/includes/lock_standby.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -query="SELECT upstream_node_id FROM repmgr.nodes WHERE node_id=$(repmgr_get_node_id)" -new_upstream_node_id="$(echo "$query" | BITNAMI_DEBUG=true postgresql_execute "$REPMGR_DATABASE" "$POSTGRESQL_REPLICATION_USER" "$POSTGRESQL_REPLICATION_PASSWORD" "" "" "-tA")" -if [[ -n "$new_upstream_node_id" ]]; then - # shellcheck disable=SC2154 - echo "$header Locking standby (new_upstream_node_id=$new_upstream_node_id)..." - echo "$new_upstream_node_id" > "$REPMGR_STANDBY_ROLE_LOCK_FILE_NAME" -fi diff --git a/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/includes/unlock_primary.sh b/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/includes/unlock_primary.sh deleted file mode 100755 index b8f7bec670b3e..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/includes/unlock_primary.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# shellcheck disable=SC2154 -echo "$header Unlocking primary..." -rm -f "$REPMGR_PRIMARY_ROLE_LOCK_FILE_NAME" diff --git a/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/includes/unlock_standby.sh b/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/includes/unlock_standby.sh deleted file mode 100755 index 285e9385813f3..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/includes/unlock_standby.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# shellcheck disable=SC2154 -echo "$header Unlocking standby..." -rm -f "$REPMGR_STANDBY_ROLE_LOCK_FILE_NAME" diff --git a/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/primary_register.sh b/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/primary_register.sh deleted file mode 100755 index 602db1b7fed1c..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/primary_register.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1090,SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -. "$REPMGR_EVENTS_DIR/execs/includes/anotate_event_processing.sh" -. "$REPMGR_EVENTS_DIR/execs/includes/lock_primary.sh" -. "$REPMGR_EVENTS_DIR/execs/includes/unlock_standby.sh" diff --git a/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/repmgrd_failover_follow.sh b/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/repmgrd_failover_follow.sh deleted file mode 100755 index c14ff7a27beaa..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/repmgrd_failover_follow.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1090,SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -. "$REPMGR_EVENTS_DIR/execs/includes/anotate_event_processing.sh" -. "$REPMGR_EVENTS_DIR/execs/includes/lock_standby.sh" diff --git a/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/standby_follow.sh b/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/standby_follow.sh deleted file mode 100755 index f41b110c7731b..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/standby_follow.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1090,SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -. "$REPMGR_EVENTS_DIR/execs/includes/anotate_event_processing.sh" -. "$REPMGR_EVENTS_DIR/execs/includes/unlock_primary.sh" diff --git a/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/standby_promote.sh b/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/standby_promote.sh deleted file mode 100755 index 602db1b7fed1c..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/execs/standby_promote.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1090,SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -. "$REPMGR_EVENTS_DIR/execs/includes/anotate_event_processing.sh" -. "$REPMGR_EVENTS_DIR/execs/includes/lock_primary.sh" -. "$REPMGR_EVENTS_DIR/execs/includes/unlock_standby.sh" diff --git a/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/router.sh b/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/router.sh deleted file mode 100755 index 17ccda234a3f6..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/rootfs/events/router.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1090,SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load libraries -. /opt/bitnami/scripts/librepmgr.sh -. /opt/bitnami/scripts/libpostgresql.sh - -. /opt/bitnami/scripts/postgresql-env.sh - -echo "[REPMGR EVENT] Node id: $1; Event type: $2; Success [1|0]: $3; Time: $4; Details: $5" -event_script="$REPMGR_EVENTS_DIR/execs/$2.sh" -echo "Looking for the script: $event_script" -if [[ -f "$event_script" ]]; then - echo "[REPMGR EVENT] will execute script '$event_script' for the event" - . "$event_script" -else - echo "[REPMGR EVENT] no script '$event_script' found. Skipping..." -fi diff --git a/bitnami/postgresql-repmgr/11/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh b/bitnami/postgresql-repmgr/11/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh deleted file mode 100644 index b66e8c5a581e1..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh +++ /dev/null @@ -1,1323 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Bitnami PostgreSQL library - -# shellcheck disable=SC1090,SC1091 - -# Load Generic Libraries -. /opt/bitnami/scripts/libfile.sh -. /opt/bitnami/scripts/libfs.sh -. /opt/bitnami/scripts/liblog.sh -. /opt/bitnami/scripts/libos.sh -. /opt/bitnami/scripts/libservice.sh -. /opt/bitnami/scripts/libvalidations.sh -. /opt/bitnami/scripts/libnet.sh - -######################## -# Configure libnss_wrapper so PostgreSQL commands work with a random user. -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_enable_nss_wrapper() { - if ! getent passwd "$(id -u)" &>/dev/null && [ -e "$NSS_WRAPPER_LIB" ]; then - debug "Configuring libnss_wrapper..." - export LD_PRELOAD="$NSS_WRAPPER_LIB" - # shellcheck disable=SC2155 - export NSS_WRAPPER_PASSWD="$(mktemp)" - # shellcheck disable=SC2155 - export NSS_WRAPPER_GROUP="$(mktemp)" - echo "postgres:x:$(id -u):$(id -g):PostgreSQL:$POSTGRESQL_DATA_DIR:/bin/false" >"$NSS_WRAPPER_PASSWD" - echo "postgres:x:$(id -g):" >"$NSS_WRAPPER_GROUP" - fi -} - -######################## -# Validate settings in POSTGRESQL_* environment variables -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_validate() { - info "Validating settings in POSTGRESQL_* env vars.." - local error_code=0 - - # Auxiliary functions - print_validation_error() { - error "$1" - error_code=1 - } - - check_multi_value() { - if [[ " ${2} " != *" ${!1} "* ]]; then - print_validation_error "The allowed values for ${1} are: ${2}" - fi - } - - empty_password_enabled_warn() { - warn "You set the environment variable ALLOW_EMPTY_PASSWORD=${ALLOW_EMPTY_PASSWORD}. For safety reasons, do not use this flag in a production environment." - } - empty_password_error() { - print_validation_error "The $1 environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow the container to be started with blank passwords. This is recommended only for development." - } - if is_boolean_yes "$ALLOW_EMPTY_PASSWORD"; then - empty_password_enabled_warn - else - if [[ -z "$POSTGRESQL_PASSWORD" ]]; then - empty_password_error "POSTGRESQL_PASSWORD" - fi - if ((${#POSTGRESQL_PASSWORD} > 100)); then - print_validation_error "The password cannot be longer than 100 characters. Set the environment variable POSTGRESQL_PASSWORD with a shorter value" - fi - if [[ -n "$POSTGRESQL_USERNAME" ]] && [[ -z "$POSTGRESQL_PASSWORD" ]]; then - empty_password_error "POSTGRESQL_PASSWORD" - fi - if [[ -n "$POSTGRESQL_USERNAME" ]] && [[ "$POSTGRESQL_USERNAME" != "postgres" ]] && [[ -n "$POSTGRESQL_PASSWORD" ]] && [[ -z "$POSTGRESQL_DATABASE" ]]; then - print_validation_error "In order to use a custom PostgreSQL user you need to set the environment variable POSTGRESQL_DATABASE as well" - fi - fi - if [[ -n "$POSTGRESQL_REPLICATION_MODE" ]]; then - if [[ "$POSTGRESQL_REPLICATION_MODE" = "master" ]]; then - if ((POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS < 0)); then - print_validation_error "The number of synchronous replicas cannot be less than 0. Set the environment variable POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS" - fi - elif [[ "$POSTGRESQL_REPLICATION_MODE" = "slave" ]]; then - if [[ -z "$POSTGRESQL_MASTER_HOST" ]]; then - print_validation_error "Slave replication mode chosen without setting the environment variable POSTGRESQL_MASTER_HOST. Use it to indicate where the Master node is running" - fi - if [[ -z "$POSTGRESQL_REPLICATION_USER" ]]; then - print_validation_error "Slave replication mode chosen without setting the environment variable POSTGRESQL_REPLICATION_USER. Make sure that the master also has this parameter set" - fi - else - print_validation_error "Invalid replication mode. Available options are 'master/slave'" - fi - # Common replication checks - if [[ -n "$POSTGRESQL_REPLICATION_USER" ]] && [[ -z "$POSTGRESQL_REPLICATION_PASSWORD" ]]; then - empty_password_error "POSTGRESQL_REPLICATION_PASSWORD" - fi - else - if is_boolean_yes "$ALLOW_EMPTY_PASSWORD"; then - empty_password_enabled_warn - else - if [[ -z "$POSTGRESQL_PASSWORD" ]]; then - empty_password_error "POSTGRESQL_PASSWORD" - fi - if [[ -n "$POSTGRESQL_USERNAME" ]] && [[ -z "$POSTGRESQL_PASSWORD" ]]; then - empty_password_error "POSTGRESQL_PASSWORD" - fi - fi - fi - - if ! is_yes_no_value "$POSTGRESQL_ENABLE_LDAP"; then - empty_password_error "The values allowed for POSTGRESQL_ENABLE_LDAP are: yes or no" - fi - - if is_boolean_yes "$POSTGRESQL_ENABLE_LDAP" && [[ -n "$POSTGRESQL_LDAP_URL" ]] && [[ -n "$POSTGRESQL_LDAP_SERVER" ]]; then - empty_password_error "You can not set POSTGRESQL_LDAP_URL and POSTGRESQL_LDAP_SERVER at the same time. Check your LDAP configuration." - fi - - if ! is_yes_no_value "$POSTGRESQL_ENABLE_TLS"; then - print_validation_error "The values allowed for POSTGRESQL_ENABLE_TLS are: yes or no" - elif is_boolean_yes "$POSTGRESQL_ENABLE_TLS"; then - # TLS Checks - if [[ -z "$POSTGRESQL_TLS_CERT_FILE" ]]; then - print_validation_error "You must provide a X.509 certificate in order to use TLS" - elif [[ ! -f "$POSTGRESQL_TLS_CERT_FILE" ]]; then - print_validation_error "The X.509 certificate file in the specified path ${POSTGRESQL_TLS_CERT_FILE} does not exist" - fi - if [[ -z "$POSTGRESQL_TLS_KEY_FILE" ]]; then - print_validation_error "You must provide a private key in order to use TLS" - elif [[ ! -f "$POSTGRESQL_TLS_KEY_FILE" ]]; then - print_validation_error "The private key file in the specified path ${POSTGRESQL_TLS_KEY_FILE} does not exist" - fi - if [[ -z "$POSTGRESQL_TLS_CA_FILE" ]]; then - warn "A CA X.509 certificate was not provided. Client verification will not be performed in TLS connections" - elif [[ ! -f "$POSTGRESQL_TLS_CA_FILE" ]]; then - print_validation_error "The CA X.509 certificate file in the specified path ${POSTGRESQL_TLS_CA_FILE} does not exist" - fi - if [[ -n "$POSTGRESQL_TLS_CRL_FILE" ]] && [[ ! -f "$POSTGRESQL_TLS_CRL_FILE" ]]; then - print_validation_error "The CRL file in the specified path ${POSTGRESQL_TLS_CRL_FILE} does not exist" - fi - if ! is_yes_no_value "$POSTGRESQL_TLS_PREFER_SERVER_CIPHERS"; then - print_validation_error "The values allowed for POSTGRESQL_TLS_PREFER_SERVER_CIPHERS are: yes or no" - fi - fi - - if [[ -n "$POSTGRESQL_SYNCHRONOUS_REPLICAS_MODE" ]]; then - check_multi_value "POSTGRESQL_SYNCHRONOUS_REPLICAS_MODE" "FIRST ANY" - fi - - [[ "$error_code" -eq 0 ]] || exit "$error_code" -} - -######################## -# Create basic postgresql.conf file using the example provided in the share/ folder -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_create_config() { - info "postgresql.conf file not detected. Generating it..." - cp "$POSTGRESQL_BASE_DIR/share/postgresql.conf.sample" "$POSTGRESQL_CONF_FILE" - # Update default value for 'include_dir' directive - # ref: https://github.com/postgres/postgres/commit/fb9c475597c245562a28d1e916b575ac4ec5c19f#diff-f5544d9b6d218cc9677524b454b41c60 - if ! grep include_dir "$POSTGRESQL_CONF_FILE" >/dev/null; then - error "include_dir line is not present in $POSTGRESQL_CONF_FILE. This may be due to a changes in a new version of PostgreSQL. Please check" - exit 1 - fi - local psql_conf - psql_conf="$(sed -E "/#include_dir/i include_dir = 'conf.d'" "$POSTGRESQL_CONF_FILE")" - echo "$psql_conf" >"$POSTGRESQL_CONF_FILE" -} - -######################## -# Create ldap auth configuration in pg_hba, -# but keeps postgres user to authenticate locally -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_ldap_auth_configuration() { - info "Generating LDAP authentication configuration" - local ldap_configuration="" - - if [[ -n "$POSTGRESQL_LDAP_URL" ]]; then - ldap_configuration="ldapurl=\"$POSTGRESQL_LDAP_URL\"" - else - ldap_configuration="ldapserver=${POSTGRESQL_LDAP_SERVER}" - - [[ -n "$POSTGRESQL_LDAP_PREFIX" ]] && ldap_configuration+=" ldapprefix=\"${POSTGRESQL_LDAP_PREFIX}\"" - [[ -n "$POSTGRESQL_LDAP_SUFFIX" ]] && ldap_configuration+=" ldapsuffix=\"${POSTGRESQL_LDAP_SUFFIX}\"" - [[ -n "$POSTGRESQL_LDAP_PORT" ]] && ldap_configuration+=" ldapport=${POSTGRESQL_LDAP_PORT}" - [[ -n "$POSTGRESQL_LDAP_BASE_DN" ]] && ldap_configuration+=" ldapbasedn=\"${POSTGRESQL_LDAP_BASE_DN}\"" - [[ -n "$POSTGRESQL_LDAP_BIND_DN" ]] && ldap_configuration+=" ldapbinddn=\"${POSTGRESQL_LDAP_BIND_DN}\"" - [[ -n "$POSTGRESQL_LDAP_BIND_PASSWORD" ]] && ldap_configuration+=" ldapbindpasswd=${POSTGRESQL_LDAP_BIND_PASSWORD}" - [[ -n "$POSTGRESQL_LDAP_SEARCH_ATTR" ]] && ldap_configuration+=" ldapsearchattribute=${POSTGRESQL_LDAP_SEARCH_ATTR}" - [[ -n "$POSTGRESQL_LDAP_SEARCH_FILTER" ]] && ldap_configuration+=" ldapsearchfilter=\"${POSTGRESQL_LDAP_SEARCH_FILTER}\"" - [[ -n "$POSTGRESQL_LDAP_TLS" ]] && ldap_configuration+=" ldaptls=${POSTGRESQL_LDAP_TLS}" - [[ -n "$POSTGRESQL_LDAP_SCHEME" ]] && ldap_configuration+=" ldapscheme=${POSTGRESQL_LDAP_SCHEME}" - fi - - cat <"$POSTGRESQL_PGHBA_FILE" -host all postgres 0.0.0.0/0 trust -host all postgres ::/0 trust -host all all 0.0.0.0/0 ldap $ldap_configuration -host all all ::/0 ldap $ldap_configuration -EOF -} - -######################## -# Create local auth configuration in pg_hba -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_password_auth_configuration() { - info "Generating local authentication configuration" - cat <"$POSTGRESQL_PGHBA_FILE" -host all all 0.0.0.0/0 trust -host all all ::/0 trust -EOF -} - -######################## -# Enforce Certificate client authentication -# for TLS connections in pg_hba -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_tls_auth_configuration() { - info "Enabling TLS Client authentication" - local previous_content - [[ -f "$POSTGRESQL_PGHBA_FILE" ]] && previous_content=$(<"$POSTGRESQL_PGHBA_FILE") - - cat <"$POSTGRESQL_PGHBA_FILE" -hostssl all all 0.0.0.0/0 cert -hostssl all all ::/0 cert -${previous_content:-} -EOF -} - -######################## -# Create basic pg_hba.conf file -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_create_pghba() { - info "pg_hba.conf file not detected. Generating it..." - - if is_boolean_yes "$POSTGRESQL_ENABLE_LDAP"; then - postgresql_ldap_auth_configuration - else - postgresql_password_auth_configuration - fi -} - -######################## -# Change pg_hba.conf so it allows local UNIX socket-based connections -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_allow_local_connection() { - cat <>"$POSTGRESQL_PGHBA_FILE" -local all all trust -host all all 127.0.0.1/32 trust -host all all ::1/128 trust -EOF -} - -######################## -# Change pg_hba.conf so only password-based authentication is allowed -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_restrict_pghba() { - if [[ -n "$POSTGRESQL_PASSWORD" ]]; then - replace_in_file "$POSTGRESQL_PGHBA_FILE" "trust" "md5" false - fi -} - -######################## -# Change pg_hba.conf so it allows access from replication users -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_add_replication_to_pghba() { - local replication_auth="trust" - if [[ -n "$POSTGRESQL_REPLICATION_PASSWORD" ]]; then - replication_auth="md5" - fi - cat <>"$POSTGRESQL_PGHBA_FILE" -host replication all 0.0.0.0/0 ${replication_auth} -host replication all ::/0 ${replication_auth} -EOF -} - -######################## -# Change a PostgreSQL configuration file by setting a property -# Globals: -# POSTGRESQL_* -# Arguments: -# $1 - property -# $2 - value -# $3 - Path to configuration file (default: $POSTGRESQL_CONF_FILE) -# Returns: -# None -######################### -postgresql_set_property() { - local -r property="${1:?missing property}" - local -r value="${2:?missing value}" - local -r conf_file="${3:-$POSTGRESQL_CONF_FILE}" - local psql_conf - if grep -qE "^#*\s*${property}" "$conf_file" >/dev/null; then - replace_in_file "$conf_file" "^#*\s*${property}\s*=.*" "${property} = '${value}'" false - else - echo "${property} = '${value}'" >>"$conf_file" - fi -} - -######################## -# Create a user for master-slave replication -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_create_replication_user() { - local -r escaped_password="${POSTGRESQL_REPLICATION_PASSWORD//\'/\'\'}" - info "Creating replication user $POSTGRESQL_REPLICATION_USER" - echo "CREATE ROLE \"$POSTGRESQL_REPLICATION_USER\" REPLICATION LOGIN ENCRYPTED PASSWORD '$escaped_password'" | postgresql_execute -} - -######################## -# Change postgresql.conf by setting replication parameters -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_configure_replication_parameters() { - local -r psql_major_version="$(postgresql_get_major_version)" - info "Configuring replication parameters" - postgresql_set_property "wal_level" "$POSTGRESQL_WAL_LEVEL" - postgresql_set_property "max_wal_size" "400MB" - postgresql_set_property "max_wal_senders" "16" - if ((psql_major_version >= 13)); then - postgresql_set_property "wal_keep_size" "128MB" - else - postgresql_set_property "wal_keep_segments" "12" - fi - postgresql_set_property "hot_standby" "on" -} - -######################## -# Change postgresql.conf by setting parameters for synchronous replication -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_configure_synchronous_replication() { - local replication_nodes="" - local synchronous_standby_names="" - info "Configuring synchronous_replication" - - # Check for comma separate values - # When using repmgr, POSTGRESQL_CLUSTER_APP_NAME will contain the list of nodes to be synchronous - # This list need to cleaned from other things but node names. - if [[ "$POSTGRESQL_CLUSTER_APP_NAME" == *","* ]]; then - read -r -a nodes <<<"$(tr ',;' ' ' <<<"${POSTGRESQL_CLUSTER_APP_NAME}")" - for node in "${nodes[@]}"; do - [[ "$node" =~ ^(([^:/?#]+):)?// ]] || node="tcp://${node}" - - # repmgr is only using the first segment of the FQDN as the application name - host="$(parse_uri "$node" 'host' | awk -F. '{print $1}')" - replication_nodes="${replication_nodes}${replication_nodes:+,}\"${host}\"" - done - else - replication_nodes="\"${POSTGRESQL_CLUSTER_APP_NAME}\"" - fi - - if ((POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS > 0)); then - synchronous_standby_names="${POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS} (${replication_nodes})" - if [[ -n "$POSTGRESQL_SYNCHRONOUS_REPLICAS_MODE" ]]; then - synchronous_standby_names="${POSTGRESQL_SYNCHRONOUS_REPLICAS_MODE} ${synchronous_standby_names}" - fi - - postgresql_set_property "synchronous_commit" "$POSTGRESQL_SYNCHRONOUS_COMMIT_MODE" - postgresql_set_property "synchronous_standby_names" "$synchronous_standby_names" - fi -} - -######################## -# Change postgresql.conf by setting TLS properies -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_configure_tls() { - info "Configuring TLS" - chmod 600 "$POSTGRESQL_TLS_KEY_FILE" || warn "Could not set compulsory permissions (600) on file ${POSTGRESQL_TLS_KEY_FILE}" - postgresql_set_property "ssl" "on" - # Server ciphers are preferred by default - ! is_boolean_yes "$POSTGRESQL_TLS_PREFER_SERVER_CIPHERS" && postgresql_set_property "ssl_prefer_server_ciphers" "off" - [[ -n $POSTGRESQL_TLS_CA_FILE ]] && postgresql_set_property "ssl_ca_file" "$POSTGRESQL_TLS_CA_FILE" - [[ -n $POSTGRESQL_TLS_CRL_FILE ]] && postgresql_set_property "ssl_crl_file" "$POSTGRESQL_TLS_CRL_FILE" - postgresql_set_property "ssl_cert_file" "$POSTGRESQL_TLS_CERT_FILE" - postgresql_set_property "ssl_key_file" "$POSTGRESQL_TLS_KEY_FILE" -} - -######################## -# Change postgresql.conf by setting fsync -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_configure_fsync() { - info "Configuring fsync" - postgresql_set_property "fsync" "$POSTGRESQL_FSYNC" -} - -######################## -# Alter password of the postgres user -# Globals: -# POSTGRESQL_* -# Arguments: -# Password -# Returns: -# None -######################### -postgresql_alter_postgres_user() { - local -r escaped_password="${1//\'/\'\'}" - info "Changing password of postgres" - echo "ALTER ROLE postgres WITH PASSWORD '$escaped_password';" | postgresql_execute - if [[ -n "$POSTGRESQL_POSTGRES_CONNECTION_LIMIT" ]]; then - echo "ALTER ROLE postgres WITH CONNECTION LIMIT ${POSTGRESQL_POSTGRES_CONNECTION_LIMIT};" | postgresql_execute - fi -} - -######################## -# Create an admin user with all privileges in POSTGRESQL_DATABASE -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_create_admin_user() { - local -r escaped_password="${POSTGRESQL_PASSWORD//\'/\'\'}" - info "Creating user ${POSTGRESQL_USERNAME}" - local connlimit_string="" - if [[ -n "$POSTGRESQL_USERNAME_CONNECTION_LIMIT" ]]; then - connlimit_string="CONNECTION LIMIT ${POSTGRESQL_USERNAME_CONNECTION_LIMIT}" - fi - echo "CREATE ROLE \"${POSTGRESQL_USERNAME}\" WITH LOGIN ${connlimit_string} CREATEDB PASSWORD '${escaped_password}';" | postgresql_execute - info "Granting access to \"${POSTGRESQL_USERNAME}\" to the database \"${POSTGRESQL_DATABASE}\"" - echo "GRANT ALL PRIVILEGES ON DATABASE \"${POSTGRESQL_DATABASE}\" TO \"${POSTGRESQL_USERNAME}\"\;" | postgresql_execute "" "postgres" "$POSTGRESQL_PASSWORD" - echo "ALTER DATABASE \"${POSTGRESQL_DATABASE}\" OWNER TO \"${POSTGRESQL_USERNAME}\"\;" | postgresql_execute "" "postgres" "$POSTGRESQL_PASSWORD" - info "Setting ownership for the 'public' schema database \"${POSTGRESQL_DATABASE}\" to \"${POSTGRESQL_USERNAME}\"" - echo "ALTER SCHEMA public OWNER TO \"${POSTGRESQL_USERNAME}\"\;" | postgresql_execute "$POSTGRESQL_DATABASE" "postgres" "$POSTGRESQL_PASSWORD" -} - -######################## -# Create a database with name $POSTGRESQL_DATABASE -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_create_custom_database() { - echo "CREATE DATABASE \"$POSTGRESQL_DATABASE\"" | postgresql_execute "" "postgres" "" -} - -######################## -# Change postgresql.conf to listen in 0.0.0.0 -# Arguments: -# None -# Returns: -# None -######################### -postgresql_enable_remote_connections() { - postgresql_set_property "listen_addresses" "*" -} - -######################## -# Check if a given configuration file was mounted externally -# Globals: -# POSTGRESQL_* -# Arguments: -# $1 - Filename -# Returns: -# 1 if the file was mounted externally, 0 otherwise -######################### -postgresql_is_file_external() { - local -r filename=$1 - if [[ -d "$POSTGRESQL_MOUNTED_CONF_DIR" ]] && [[ -f "$POSTGRESQL_MOUNTED_CONF_DIR"/"$filename" ]]; then - return 0 - else - return 1 - fi -} - -######################## -# Remove flags and postmaster files from a previous run (case of container restart) -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_clean_from_restart() { - local -r -a files=( - "$POSTGRESQL_DATA_DIR"/postmaster.pid - "$POSTGRESQL_DATA_DIR"/standby.signal - "$POSTGRESQL_DATA_DIR"/recovery.signal - ) - - for file in "${files[@]}"; do - if [[ -f "$file" ]]; then - info "Cleaning stale $file file" - rm "$file" - fi - done -} - -######################## -# Ensure PostgreSQL is initialized -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_initialize() { - info "Initializing PostgreSQL database..." - - # This fixes an issue where the trap would kill the entrypoint.sh, if a PID was left over from a previous run - # Exec replaces the process without creating a new one, and when the container is restarted it may have the same PID - rm -f "$POSTGRESQL_PID_FILE" - - # User injected custom configuration - if [[ -d "$POSTGRESQL_MOUNTED_CONF_DIR" ]] && compgen -G "$POSTGRESQL_MOUNTED_CONF_DIR"/* >/dev/null; then - debug "Copying files from $POSTGRESQL_MOUNTED_CONF_DIR to $POSTGRESQL_CONF_DIR" - cp -fr "$POSTGRESQL_MOUNTED_CONF_DIR"/. "$POSTGRESQL_CONF_DIR" - fi - local create_conf_file=yes - local create_pghba_file=yes - - if postgresql_is_file_external "postgresql.conf"; then - info "Custom configuration $POSTGRESQL_CONF_FILE detected" - create_conf_file=no - fi - - if postgresql_is_file_external "pg_hba.conf"; then - info "Custom configuration $POSTGRESQL_PGHBA_FILE detected" - create_pghba_file=no - fi - - debug "Ensuring expected directories/files exist..." - for dir in "$POSTGRESQL_TMP_DIR" "$POSTGRESQL_LOG_DIR" "$POSTGRESQL_DATA_DIR"; do - ensure_dir_exists "$dir" - am_i_root && chown "$POSTGRESQL_DAEMON_USER:$POSTGRESQL_DAEMON_GROUP" "$dir" - done - am_i_root && find "$POSTGRESQL_DATA_DIR" -mindepth 1 -maxdepth 1 -not -name ".snapshot" -not -name "lost+found" -exec chown -R "$POSTGRESQL_DAEMON_USER:$POSTGRESQL_DAEMON_GROUP" {} \; - chmod u+rwx "$POSTGRESQL_DATA_DIR" || warn "Lack of permissions on data directory!" - chmod go-rwx "$POSTGRESQL_DATA_DIR" || warn "Lack of permissions on data directory!" - - is_boolean_yes "$POSTGRESQL_ALLOW_REMOTE_CONNECTIONS" && is_boolean_yes "$create_pghba_file" && postgresql_create_pghba && postgresql_allow_local_connection - # Configure port - postgresql_set_property "port" "$POSTGRESQL_PORT_NUMBER" - is_empty_value "$POSTGRESQL_DEFAULT_TOAST_COMPRESSION" || postgresql_set_property "default_toast_compression" "$POSTGRESQL_DEFAULT_TOAST_COMPRESSION" - is_empty_value "$POSTGRESQL_PASSWORD_ENCRYPTION" || postgresql_set_property "password_encryption" "$POSTGRESQL_PASSWORD_ENCRYPTION" - if ! is_dir_empty "$POSTGRESQL_DATA_DIR"; then - info "Deploying PostgreSQL with persisted data..." - export POSTGRESQL_FIRST_BOOT="no" - is_boolean_yes "$create_pghba_file" && postgresql_restrict_pghba - is_boolean_yes "$create_conf_file" && postgresql_configure_replication_parameters - is_boolean_yes "$create_conf_file" && postgresql_configure_fsync - is_boolean_yes "$create_conf_file" && is_boolean_yes "$POSTGRESQL_ENABLE_TLS" && postgresql_configure_tls - [[ "$POSTGRESQL_REPLICATION_MODE" = "master" ]] && [[ -n "$POSTGRESQL_REPLICATION_USER" ]] && is_boolean_yes "$create_pghba_file" && postgresql_add_replication_to_pghba - [[ "$POSTGRESQL_REPLICATION_MODE" = "master" ]] && is_boolean_yes "$create_pghba_file" && postgresql_configure_synchronous_replication - [[ "$POSTGRESQL_REPLICATION_MODE" = "slave" ]] && postgresql_configure_recovery - else - if [[ "$POSTGRESQL_REPLICATION_MODE" = "master" ]]; then - postgresql_master_init_db - postgresql_start_bg "false" - [[ -n "${POSTGRESQL_DATABASE}" ]] && [[ "$POSTGRESQL_DATABASE" != "postgres" ]] && postgresql_create_custom_database - if [[ "$POSTGRESQL_USERNAME" = "postgres" ]]; then - postgresql_alter_postgres_user "$POSTGRESQL_PASSWORD" - else - if [[ -n "$POSTGRESQL_POSTGRES_PASSWORD" ]]; then - postgresql_alter_postgres_user "$POSTGRESQL_POSTGRES_PASSWORD" - fi - postgresql_create_admin_user - fi - is_boolean_yes "$create_pghba_file" && postgresql_restrict_pghba - [[ -n "$POSTGRESQL_REPLICATION_USER" ]] && postgresql_create_replication_user - is_boolean_yes "$create_conf_file" && postgresql_configure_replication_parameters - is_boolean_yes "$create_pghba_file" && postgresql_configure_synchronous_replication - is_boolean_yes "$create_conf_file" && postgresql_configure_fsync - is_boolean_yes "$create_conf_file" && is_boolean_yes "$POSTGRESQL_ENABLE_TLS" && postgresql_configure_tls - [[ -n "$POSTGRESQL_REPLICATION_USER" ]] && is_boolean_yes "$create_pghba_file" && postgresql_add_replication_to_pghba - else - postgresql_slave_init_db - is_boolean_yes "$create_pghba_file" && postgresql_restrict_pghba - is_boolean_yes "$create_conf_file" && postgresql_configure_replication_parameters - is_boolean_yes "$create_conf_file" && postgresql_configure_fsync - is_boolean_yes "$create_conf_file" && is_boolean_yes "$POSTGRESQL_ENABLE_TLS" && postgresql_configure_tls - postgresql_configure_recovery - fi - fi - # TLS Modifications on pghba need to be performed after properly configuring postgresql.conf file - is_boolean_yes "$create_pghba_file" && is_boolean_yes "$POSTGRESQL_ENABLE_TLS" && [[ -n $POSTGRESQL_TLS_CA_FILE ]] && postgresql_tls_auth_configuration - - is_boolean_yes "$create_conf_file" && [[ -n "$POSTGRESQL_SHARED_PRELOAD_LIBRARIES" ]] && postgresql_set_property "shared_preload_libraries" "$POSTGRESQL_SHARED_PRELOAD_LIBRARIES" - is_boolean_yes "$create_conf_file" && postgresql_configure_logging - is_boolean_yes "$create_conf_file" && postgresql_configure_connections - is_boolean_yes "$create_conf_file" && postgresql_configure_timezone - - # Delete conf files generated on first run - rm -f "$POSTGRESQL_DATA_DIR"/postgresql.conf "$POSTGRESQL_DATA_DIR"/pg_hba.conf - - # Stop postgresql - postgresql_stop -} - -######################## -# Run custom pre-initialization scripts -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_custom_pre_init_scripts() { - info "Loading custom pre-init scripts..." - if [[ -d "$POSTGRESQL_PREINITSCRIPTS_DIR" ]] && [[ -n $(find "$POSTGRESQL_PREINITSCRIPTS_DIR/" -type f -name "*.sh") ]]; then - info "Loading user's custom files from $POSTGRESQL_PREINITSCRIPTS_DIR ..." - find "$POSTGRESQL_PREINITSCRIPTS_DIR/" -type f -name "*.sh" | sort | while read -r f; do - if [[ -x "$f" ]]; then - debug "Executing $f" - "$f" - else - debug "Sourcing $f" - . "$f" - fi - done - fi -} - -######################## -# Run custom initialization scripts -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_custom_init_scripts() { - info "Loading custom scripts..." - if [[ -d "$POSTGRESQL_INITSCRIPTS_DIR" ]] && [[ -n $(find "$POSTGRESQL_INITSCRIPTS_DIR/" -type f -regex ".*\.\(sh\|sql\|sql.gz\)") ]] && [[ ! -f "$POSTGRESQL_VOLUME_DIR/.user_scripts_initialized" ]]; then - info "Loading user's custom files from $POSTGRESQL_INITSCRIPTS_DIR ..." - postgresql_start_bg "false" - find "$POSTGRESQL_INITSCRIPTS_DIR/" -type f -regex ".*\.\(sh\|sql\|sql.gz\)" | sort | while read -r f; do - case "$f" in - *.sh) - if [[ -x "$f" ]]; then - debug "Executing $f" - "$f" - else - debug "Sourcing $f" - . "$f" - fi - ;; - *.sql) - debug "Executing $f" - postgresql_execute "$POSTGRESQL_DATABASE" "$POSTGRESQL_INITSCRIPTS_USERNAME" "$POSTGRESQL_INITSCRIPTS_PASSWORD" <"$f" - ;; - *.sql.gz) - debug "Executing $f" - gunzip -c "$f" | postgresql_execute "$POSTGRESQL_DATABASE" "$POSTGRESQL_INITSCRIPTS_USERNAME" "$POSTGRESQL_INITSCRIPTS_PASSWORD" - ;; - *) debug "Ignoring $f" ;; - esac - done - touch "$POSTGRESQL_VOLUME_DIR"/.user_scripts_initialized - fi -} - -######################## -# Stop PostgreSQL -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_stop() { - local -r -a cmd=("pg_ctl" "stop" "-w" "-D" "$POSTGRESQL_DATA_DIR" "-m" "$POSTGRESQL_SHUTDOWN_MODE" "-t" "$POSTGRESQL_PGCTLTIMEOUT") - if [[ -f "$POSTGRESQL_PID_FILE" ]]; then - info "Stopping PostgreSQL..." - if am_i_root; then - run_as_user "$POSTGRESQL_DAEMON_USER" "${cmd[@]}" - else - "${cmd[@]}" - fi - fi -} - -######################## -# Start PostgreSQL and wait until it is ready -# Globals: -# POSTGRESQL_* -# Arguments: -# $1 - Enable logs for PostgreSQL. Default: false -# Returns: -# None -######################### -postgresql_start_bg() { - local -r pg_logs=${1:-false} - local -r pg_ctl_flags=("-w" "-D" "$POSTGRESQL_DATA_DIR" "-l" "$POSTGRESQL_LOG_FILE" "-o" "--config-file=$POSTGRESQL_CONF_FILE --external_pid_file=$POSTGRESQL_PID_FILE --hba_file=$POSTGRESQL_PGHBA_FILE") - info "Starting PostgreSQL in background..." - if is_postgresql_running; then - return 0 - fi - local pg_ctl_cmd=() - if am_i_root; then - pg_ctl_cmd+=("run_as_user" "$POSTGRESQL_DAEMON_USER") - fi - pg_ctl_cmd+=("$POSTGRESQL_BIN_DIR"/pg_ctl) - if [[ "${BITNAMI_DEBUG:-false}" = true ]] || [[ $pg_logs = true ]]; then - "${pg_ctl_cmd[@]}" "start" "${pg_ctl_flags[@]}" - else - "${pg_ctl_cmd[@]}" "start" "${pg_ctl_flags[@]}" >/dev/null 2>&1 - fi - local pg_isready_args=("-U" "postgres" "-p" "$POSTGRESQL_PORT_NUMBER") - local counter=$POSTGRESQL_INIT_MAX_TIMEOUT - while ! "$POSTGRESQL_BIN_DIR"/pg_isready "${pg_isready_args[@]}" >/dev/null 2>&1; do - sleep 1 - counter=$((counter - 1)) - if ((counter <= 0)); then - error "PostgreSQL is not ready after $POSTGRESQL_INIT_MAX_TIMEOUT seconds" - exit 1 - fi - done -} - -######################## -# Check if PostgreSQL is running -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# Boolean -######################### -is_postgresql_running() { - local pid - pid="$(get_pid_from_file "$POSTGRESQL_PID_FILE")" - - if [[ -z "$pid" ]]; then - false - else - is_service_running "$pid" - fi -} - -######################## -# Check if PostgreSQL is not running -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# Boolean -######################### -is_postgresql_not_running() { - ! is_postgresql_running -} - -######################## -# Initialize master node database by running initdb -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# Boolean -######################### -postgresql_master_init_db() { - local envExtraFlags=() - local initdb_args=() - if [[ -n "${POSTGRESQL_INITDB_ARGS}" ]]; then - read -r -a envExtraFlags <<<"$POSTGRESQL_INITDB_ARGS" - initdb_args+=("${envExtraFlags[@]}") - fi - if [[ -n "$POSTGRESQL_INITDB_WAL_DIR" ]]; then - ensure_dir_exists "$POSTGRESQL_INITDB_WAL_DIR" - am_i_root && chown "$POSTGRESQL_DAEMON_USER:$POSTGRESQL_DAEMON_GROUP" "$POSTGRESQL_INITDB_WAL_DIR" - initdb_args+=("--waldir" "$POSTGRESQL_INITDB_WAL_DIR") - fi - local initdb_cmd=() - if am_i_root; then - initdb_cmd+=("run_as_user" "$POSTGRESQL_DAEMON_USER") - fi - initdb_cmd+=("$POSTGRESQL_BIN_DIR/initdb") - if [[ -n "${initdb_args[*]:-}" ]]; then - info "Initializing PostgreSQL with ${initdb_args[*]} extra initdb arguments" - if [[ "${BITNAMI_DEBUG:-false}" = true ]]; then - "${initdb_cmd[@]}" -E UTF8 -D "$POSTGRESQL_DATA_DIR" -U "postgres" "${initdb_args[@]}" - else - "${initdb_cmd[@]}" -E UTF8 -D "$POSTGRESQL_DATA_DIR" -U "postgres" "${initdb_args[@]}" >/dev/null 2>&1 - fi - elif [[ "${BITNAMI_DEBUG:-false}" = true ]]; then - "${initdb_cmd[@]}" -E UTF8 -D "$POSTGRESQL_DATA_DIR" -U "postgres" - else - "${initdb_cmd[@]}" -E UTF8 -D "$POSTGRESQL_DATA_DIR" -U "postgres" >/dev/null 2>&1 - fi -} - -######################## -# Initialize slave node by running pg_basebackup -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# Boolean -######################### -postgresql_slave_init_db() { - info "Waiting for replication master to accept connections (${POSTGRESQL_INIT_MAX_TIMEOUT} timeout)..." - local -r check_args=("-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-p" "$POSTGRESQL_MASTER_PORT_NUMBER" "-d" "postgres") - local check_cmd=() - if am_i_root; then - check_cmd=("run_as_user" "$POSTGRESQL_DAEMON_USER") - fi - check_cmd+=("$POSTGRESQL_BIN_DIR"/pg_isready) - local ready_counter=$POSTGRESQL_INIT_MAX_TIMEOUT - - while ! PGPASSWORD=$POSTGRESQL_REPLICATION_PASSWORD "${check_cmd[@]}" "${check_args[@]}"; do - sleep 1 - ready_counter=$((ready_counter - 1)) - if ((ready_counter <= 0)); then - error "PostgreSQL master is not ready after $POSTGRESQL_INIT_MAX_TIMEOUT seconds" - exit 1 - fi - - done - info "Replicating the initial database" - local -r backup_args=("-D" "$POSTGRESQL_DATA_DIR" "-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-p" "$POSTGRESQL_MASTER_PORT_NUMBER" "-X" "stream" "-w" "-v" "-P") - local backup_cmd=() - if am_i_root; then - backup_cmd+=("run_as_user" "$POSTGRESQL_DAEMON_USER") - fi - backup_cmd+=("$POSTGRESQL_BIN_DIR"/pg_basebackup) - local replication_counter=$POSTGRESQL_INIT_MAX_TIMEOUT - while ! PGPASSWORD=$POSTGRESQL_REPLICATION_PASSWORD "${backup_cmd[@]}" "${backup_args[@]}"; do - debug "Backup command failed. Sleeping and trying again" - sleep 1 - replication_counter=$((replication_counter - 1)) - if ((replication_counter <= 0)); then - error "Slave replication failed after trying for $POSTGRESQL_INIT_MAX_TIMEOUT seconds" - exit 1 - fi - done -} - -######################## -# Create recovery.conf in slave node -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# Boolean -######################### -postgresql_configure_recovery() { - info "Setting up streaming replication slave..." - - local -r escaped_password="${POSTGRESQL_REPLICATION_PASSWORD//\&/\\&}" - local -r psql_major_version="$(postgresql_get_major_version)" - if ((psql_major_version >= 12)); then - postgresql_set_property "primary_conninfo" "host=${POSTGRESQL_MASTER_HOST} port=${POSTGRESQL_MASTER_PORT_NUMBER} user=${POSTGRESQL_REPLICATION_USER} password=${escaped_password} application_name=${POSTGRESQL_CLUSTER_APP_NAME}" "$POSTGRESQL_CONF_FILE" - ((psql_major_version < 16)) && postgresql_set_property "promote_trigger_file" "/tmp/postgresql.trigger.${POSTGRESQL_MASTER_PORT_NUMBER}" "$POSTGRESQL_CONF_FILE" - touch "$POSTGRESQL_DATA_DIR"/standby.signal - else - cp -f "$POSTGRESQL_BASE_DIR/share/recovery.conf.sample" "$POSTGRESQL_RECOVERY_FILE" - chmod 600 "$POSTGRESQL_RECOVERY_FILE" - am_i_root && chown "$POSTGRESQL_DAEMON_USER:$POSTGRESQL_DAEMON_GROUP" "$POSTGRESQL_RECOVERY_FILE" - postgresql_set_property "standby_mode" "on" "$POSTGRESQL_RECOVERY_FILE" - postgresql_set_property "primary_conninfo" "host=${POSTGRESQL_MASTER_HOST} port=${POSTGRESQL_MASTER_PORT_NUMBER} user=${POSTGRESQL_REPLICATION_USER} password=${escaped_password} application_name=${POSTGRESQL_CLUSTER_APP_NAME}" "$POSTGRESQL_RECOVERY_FILE" - postgresql_set_property "trigger_file" "/tmp/postgresql.trigger.${POSTGRESQL_MASTER_PORT_NUMBER}" "$POSTGRESQL_RECOVERY_FILE" - fi -} - -######################## -# Configure logging parameters -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# Boolean -######################### -postgresql_configure_logging() { - [[ -n "$POSTGRESQL_PGAUDIT_LOG" ]] && postgresql_set_property "pgaudit.log" "$POSTGRESQL_PGAUDIT_LOG" - [[ -n "$POSTGRESQL_PGAUDIT_LOG_CATALOG" ]] && postgresql_set_property "pgaudit.log_catalog" "$POSTGRESQL_PGAUDIT_LOG_CATALOG" - [[ -n "$POSTGRESQL_PGAUDIT_LOG_PARAMETER" ]] && postgresql_set_property "pgaudit.log_parameter" "$POSTGRESQL_PGAUDIT_LOG_PARAMETER" - [[ -n "$POSTGRESQL_LOG_CONNECTIONS" ]] && postgresql_set_property "log_connections" "$POSTGRESQL_LOG_CONNECTIONS" - [[ -n "$POSTGRESQL_LOG_DISCONNECTIONS" ]] && postgresql_set_property "log_disconnections" "$POSTGRESQL_LOG_DISCONNECTIONS" - [[ -n "$POSTGRESQL_LOG_HOSTNAME" ]] && postgresql_set_property "log_hostname" "$POSTGRESQL_LOG_HOSTNAME" - [[ -n "$POSTGRESQL_CLIENT_MIN_MESSAGES" ]] && postgresql_set_property "client_min_messages" "$POSTGRESQL_CLIENT_MIN_MESSAGES" - [[ -n "$POSTGRESQL_LOG_LINE_PREFIX" ]] && postgresql_set_property "log_line_prefix" "$POSTGRESQL_LOG_LINE_PREFIX" - ([[ -n "$POSTGRESQL_LOG_TIMEZONE" ]] && postgresql_set_property "log_timezone" "$POSTGRESQL_LOG_TIMEZONE") || true -} - -######################## -# Configure connection parameters -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# Boolean -######################### -postgresql_configure_connections() { - [[ -n "$POSTGRESQL_MAX_CONNECTIONS" ]] && postgresql_set_property "max_connections" "$POSTGRESQL_MAX_CONNECTIONS" - [[ -n "$POSTGRESQL_TCP_KEEPALIVES_IDLE" ]] && postgresql_set_property "tcp_keepalives_idle" "$POSTGRESQL_TCP_KEEPALIVES_IDLE" - [[ -n "$POSTGRESQL_TCP_KEEPALIVES_INTERVAL" ]] && postgresql_set_property "tcp_keepalives_interval" "$POSTGRESQL_TCP_KEEPALIVES_INTERVAL" - [[ -n "$POSTGRESQL_TCP_KEEPALIVES_COUNT" ]] && postgresql_set_property "tcp_keepalives_count" "$POSTGRESQL_TCP_KEEPALIVES_COUNT" - ([[ -n "$POSTGRESQL_STATEMENT_TIMEOUT" ]] && postgresql_set_property "statement_timeout" "$POSTGRESQL_STATEMENT_TIMEOUT") || true -} - -######################## -# Configure timezone -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# Boolean -######################### -postgresql_configure_timezone() { - ([[ -n "$POSTGRESQL_TIMEZONE" ]] && postgresql_set_property "timezone" "$POSTGRESQL_TIMEZONE") || true -} - -######################## -# Remove pg_hba.conf lines based on filter -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# Boolean -######################### -postgresql_remove_pghba_lines() { - for filter in ${POSTGRESQL_PGHBA_REMOVE_FILTERS//,/ }; do - result="$(sed -E "/${filter}/d" "$POSTGRESQL_PGHBA_FILE")" - echo "$result" >"$POSTGRESQL_PGHBA_FILE" - done -} - -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC2148 - -######################## -# Return PostgreSQL major version -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# String -######################### -postgresql_get_major_version() { - psql --version | grep -oE "[0-9]+\.[0-9]+" | grep -oE "^[0-9]+" -} - -######################## -# Gets an environment variable name based on the suffix -# Arguments: -# $1 - environment variable suffix -# Returns: -# environment variable name -######################### -get_env_var_value() { - local env_var_suffix="${1:?missing suffix}" - local env_var_name - for env_var_prefix in POSTGRESQL POSTGRESQL_CLIENT; do - env_var_name="${env_var_prefix}_${env_var_suffix}" - if [[ -n "${!env_var_name:-}" ]]; then - echo "${!env_var_name}" - break - fi - done -} - -######################## -# Execute an arbitrary query/queries against the running PostgreSQL service and print the output -# Stdin: -# Query/queries to execute -# Globals: -# BITNAMI_DEBUG -# POSTGRESQL_* -# Arguments: -# $1 - Database where to run the queries -# $2 - User to run queries -# $3 - Password -# $4 - Extra options (eg. -tA) -# Returns: -# None -######################### -postgresql_execute_print_output() { - local -r db="${1:-}" - local -r user="${2:-postgres}" - local -r pass="${3:-}" - local opts - read -r -a opts <<<"${@:4}" - - local args=("-U" "$user" "-p" "${POSTGRESQL_PORT_NUMBER:-5432}") - [[ -n "$db" ]] && args+=("-d" "$db") - [[ "${#opts[@]}" -gt 0 ]] && args+=("${opts[@]}") - - # Execute the Query/queries from stdin - PGPASSWORD=$pass psql "${args[@]}" -} - -######################## -# Execute an arbitrary query/queries against the running PostgreSQL service -# Stdin: -# Query/queries to execute -# Globals: -# BITNAMI_DEBUG -# POSTGRESQL_* -# Arguments: -# $1 - Database where to run the queries -# $2 - User to run queries -# $3 - Password -# $4 - Extra options (eg. -tA) -# Returns: -# None -######################### -postgresql_execute() { - if [[ "${BITNAMI_DEBUG:-false}" = true ]]; then - "postgresql_execute_print_output" "$@" - elif [[ "${NO_ERRORS:-false}" = true ]]; then - "postgresql_execute_print_output" "$@" 2>/dev/null - else - "postgresql_execute_print_output" "$@" >/dev/null 2>&1 - fi -} - -######################## -# Execute an arbitrary query/queries against a remote PostgreSQL service and print to stdout -# Stdin: -# Query/queries to execute -# Globals: -# BITNAMI_DEBUG -# DB_* -# Arguments: -# $1 - Remote PostgreSQL service hostname -# $2 - Remote PostgreSQL service port -# $3 - Database where to run the queries -# $4 - User to run queries -# $5 - Password -# $6 - Extra options (eg. -tA) -# Returns: -# None -postgresql_remote_execute_print_output() { - local -r hostname="${1:?hostname is required}" - local -r port="${2:?port is required}" - local -a args=("-h" "$hostname" "-p" "$port") - shift 2 - "postgresql_execute_print_output" "$@" "${args[@]}" -} - -######################## -# Execute an arbitrary query/queries against a remote PostgreSQL service -# Stdin: -# Query/queries to execute -# Globals: -# BITNAMI_DEBUG -# DB_* -# Arguments: -# $1 - Remote PostgreSQL service hostname -# $2 - Remote PostgreSQL service port -# $3 - Database where to run the queries -# $4 - User to run queries -# $5 - Password -# $6 - Extra options (eg. -tA) -# Returns: -# None -postgresql_remote_execute() { - if [[ "${BITNAMI_DEBUG:-false}" = true ]]; then - "postgresql_remote_execute_print_output" "$@" - elif [[ "${NO_ERRORS:-false}" = true ]]; then - "postgresql_remote_execute_print_output" "$@" 2>/dev/null - else - "postgresql_remote_execute_print_output" "$@" >/dev/null 2>&1 - fi -} - -######################## -# Optionally create the given database user -# Flags: -# -p|--password - database password -# --host - database host -# --port - database port -# Arguments: -# $1 - user -# Returns: -# None -######################### -postgresql_ensure_user_exists() { - local -r user="${1:?user is missing}" - local password="" - # For accessing an external database - local db_host="" - local db_port="" - - # Validate arguments - shift 1 - while [ "$#" -gt 0 ]; do - case "$1" in - -p | --password) - shift - password="${1:?missing password}" - ;; - --host) - shift - db_host="${1:?missing database host}" - ;; - --port) - shift - db_port="${1:?missing database port}" - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - - local -a postgresql_execute_cmd=("postgresql_execute") - [[ -n "$db_host" && -n "$db_port" ]] && postgresql_execute_cmd=("postgresql_remote_execute" "$db_host" "$db_port") - local -a postgresql_execute_flags=("postgres" "$(get_env_var_value POSTGRES_USER)" "$(get_env_var_value POSTGRES_PASSWORD)") - - "${postgresql_execute_cmd[@]}" "${postgresql_execute_flags[@]}" <&2 - return 1 - ;; - esac - shift - done - - local -a postgresql_execute_cmd=("postgresql_execute") - [[ -n "$db_host" && -n "$db_port" ]] && postgresql_execute_cmd=("postgresql_remote_execute" "$db_host" "$db_port") - local -a postgresql_execute_flags=("postgres" "$(get_env_var_value POSTGRES_USER)" "$(get_env_var_value POSTGRES_PASSWORD)") - - "${postgresql_execute_cmd[@]}" "${postgresql_execute_flags[@]}" <"${POSTGRESQL_MOUNTED_CONF_DIR}/pg_hba.conf" </dev/null; then - debug "User injected custom configuration detected!" - fi - ensure_dir_exists "$POSTGRESQL_MOUNTED_CONF_DIR" - if repmgr_is_file_external "postgresql.conf"; then - cp "${REPMGR_MOUNTED_CONF_DIR}/postgresql.conf" "${POSTGRESQL_MOUNTED_CONF_DIR}/postgresql.conf" - else - repmgr_inject_postgresql_configuration - fi - if repmgr_is_file_external "pg_hba.conf"; then - cp "${REPMGR_MOUNTED_CONF_DIR}/pg_hba.conf" "${POSTGRESQL_MOUNTED_CONF_DIR}/pg_hba.conf" - else - repmgr_inject_pghba_configuration - fi - if [[ "$REPMGR_USE_PASSFILE" = "true" ]] && [[ ! -f "${REPMGR_PASSFILE_PATH}" ]]; then - echo "*:*:*:${REPMGR_USERNAME}:${REPMGR_PASSWORD}" >"${REPMGR_PASSFILE_PATH}" - chmod 600 "${REPMGR_PASSFILE_PATH}" - fi -} - -######################## -# Generates repmgr config files -# Globals: -# REPMGR_* -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -repmgr_generate_repmgr_config() { - info "Preparing repmgr configuration..." - - # If using a distinct WAL directory (${POSTGRESQL_DATA_DIR}/pg_wal is a symlink to an existing dir or $POSTGRESQL_INITDB_WAL_DIR is set a custom value during 1st boot), - # set the "--waldir" option accordingly - local -r waldir=$(postgresql_get_waldir) - local -r waldir_option=$([[ -n "$waldir" ]] && echo "--waldir=$waldir") - - cat <>"${REPMGR_CONF_FILE}.tmp" -event_notification_command='${REPMGR_EVENTS_DIR}/router.sh %n %e %s "%t" "%d"' -ssh_options='-o "StrictHostKeyChecking no" -v' -use_replication_slots='${REPMGR_USE_REPLICATION_SLOTS}' -pg_bindir='${POSTGRESQL_BIN_DIR}' - -# FIXME: these 2 parameter should work -node_id=$(repmgr_get_node_id) -node_name='${REPMGR_NODE_NAME}' -location='${REPMGR_NODE_LOCATION}' -conninfo='user=${REPMGR_USERNAME} $(repmgr_get_conninfo_password) host=${REPMGR_NODE_NETWORK_NAME} dbname=${REPMGR_DATABASE} port=${REPMGR_PORT_NUMBER} connect_timeout=${REPMGR_CONNECT_TIMEOUT}' -failover='${REPMGR_FAILOVER}' -promote_command='$(repmgr_get_env_password) repmgr standby promote -f "${REPMGR_CONF_FILE}" --log-level DEBUG --verbose' -follow_command='$(repmgr_get_env_password) repmgr standby follow -f "${REPMGR_CONF_FILE}" -W --log-level DEBUG --verbose' -reconnect_attempts='${REPMGR_RECONNECT_ATTEMPTS}' -reconnect_interval='${REPMGR_RECONNECT_INTERVAL}' -log_level='${REPMGR_LOG_LEVEL}' -priority='${REPMGR_NODE_PRIORITY}' -degraded_monitoring_timeout='${REPMGR_DEGRADED_MONITORING_TIMEOUT}' -data_directory='${POSTGRESQL_DATA_DIR}' -async_query_timeout='${REPMGR_MASTER_RESPONSE_TIMEOUT}' -pg_ctl_options='-o "--config-file=\"${POSTGRESQL_CONF_FILE}\" --external_pid_file=\"${POSTGRESQL_PID_FILE}\" --hba_file=\"${POSTGRESQL_PGHBA_FILE}\""' -pg_basebackup_options='$waldir_option' -EOF - - if is_boolean_yes "$REPMGR_FENCE_OLD_PRIMARY"; then - cat <>"${REPMGR_CONF_FILE}.tmp" -child_nodes_disconnect_command='/bin/bash -c ". /opt/bitnami/scripts/libpostgresql.sh && . /opt/bitnami/scripts/postgresql-env.sh && postgresql_stop && kill -TERM 1"' -EOF - if [[ -v REPMGR_CHILD_NODES_CHECK_INTERVAL ]]; then - cat <>"${REPMGR_CONF_FILE}.tmp" -child_nodes_check_interval=${REPMGR_CHILD_NODES_CHECK_INTERVAL} -EOF - fi - if [[ -v REPMGR_CHILD_NODES_CONNECTED_MIN_COUNT ]]; then - cat <>"${REPMGR_CONF_FILE}.tmp" -child_nodes_connected_min_count=${REPMGR_CHILD_NODES_CONNECTED_MIN_COUNT} -EOF - fi - if [[ -v REPMGR_CHILD_NODES_DISCONNECT_TIMEOUT ]]; then - cat <>"${REPMGR_CONF_FILE}.tmp" -child_nodes_disconnect_timeout=${REPMGR_CHILD_NODES_DISCONNECT_TIMEOUT} -EOF - fi - fi - - if [[ "$REPMGR_FENCE_OLD_PRIMARY" == "true" ]]; then - cat <>"${REPMGR_CONF_FILE}.tmp" -child_nodes_disconnect_command='/bin/bash -c ". /opt/bitnami/scripts/libpostgresql.sh && . /opt/bitnami/scripts/postgresql-env.sh && postgresql_stop && kill -TERM 1"' -EOF - if [[ -v REPMGR_CHILD_NODES_CHECK_INTERVAL ]]; then - cat <>"${REPMGR_CONF_FILE}.tmp" -child_nodes_check_interval=${REPMGR_CHILD_NODES_CHECK_INTERVAL} -EOF - fi - if [[ -v REPMGR_CHILD_NODES_CONNECTED_MIN_COUNT ]]; then - cat <>"${REPMGR_CONF_FILE}.tmp" -child_nodes_connected_min_count=${REPMGR_CHILD_NODES_CONNECTED_MIN_COUNT} -EOF - fi - if [[ -v REPMGR_CHILD_NODES_DISCONNECT_TIMEOUT ]]; then - cat <>"${REPMGR_CONF_FILE}.tmp" -child_nodes_disconnect_timeout=${REPMGR_CHILD_NODES_DISCONNECT_TIMEOUT} -EOF - fi - fi - - if [[ -f "${REPMGR_MOUNTED_CONF_DIR}/repmgr.conf" ]]; then - # remove from default the overrided keys, and append the desired conf - grep -xvFf "${REPMGR_CONF_FILE}.tmp" "${REPMGR_MOUNTED_CONF_DIR}/repmgr.conf" | awk -F"=" '{print $1;}' >"${REPMGR_CONF_FILE}.keys" && grep -v -f "${REPMGR_CONF_FILE}.keys" "${REPMGR_CONF_FILE}.tmp" >"$REPMGR_CONF_FILE" && cat "${REPMGR_MOUNTED_CONF_DIR}/repmgr.conf" >>"$REPMGR_CONF_FILE" - else - cp "${REPMGR_CONF_FILE}.tmp" "${REPMGR_CONF_FILE}" - fi - - if [[ "$REPMGR_USE_PASSFILE" = "true" ]]; then - echo "passfile='${REPMGR_PASSFILE_PATH}'" >>"$REPMGR_CONF_FILE" - fi -} - -######################## -# Waits until the primary node responds -# Globals: -# REPMGR_* -# Arguments: -# None -# Returns: -# None -######################### -repmgr_wait_primary_node() { - local return_value=1 - local -i timeout=60 - local -i step=10 - local -i max_tries=$((timeout / step)) - local schemata - info "Waiting for primary node..." - debug "Wait for schema $REPMGR_DATABASE.repmgr on '${REPMGR_CURRENT_PRIMARY_HOST}:${REPMGR_CURRENT_PRIMARY_PORT}', will try $max_tries times with $step delay seconds (TIMEOUT=$timeout)" - for ((i = 0; i <= timeout; i += step)); do - local query="SELECT 1 FROM information_schema.schemata WHERE catalog_name='$REPMGR_DATABASE' AND schema_name='repmgr'" - if ! schemata="$(echo "$query" | NO_ERRORS=true postgresql_remote_execute "$REPMGR_CURRENT_PRIMARY_HOST" "$REPMGR_CURRENT_PRIMARY_PORT" "$REPMGR_DATABASE" "$REPMGR_USERNAME" "$REPMGR_PASSWORD" "-tA")"; then - debug "Host '${REPMGR_CURRENT_PRIMARY_HOST}:${REPMGR_CURRENT_PRIMARY_PORT}' is not accessible" - else - if [[ $schemata -ne 1 ]]; then - debug "Schema $REPMGR_DATABASE.repmgr is still not accessible" - else - debug "Schema $REPMGR_DATABASE.repmgr exists!" - return_value=0 && break - fi - fi - sleep "$step" - done - return $return_value -} - -######################## -# Clones data from primary node -# Globals: -# REPMGR_* -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -repmgr_clone_primary() { - # Clears WAL directory if existing (pg_basebackup requires the WAL dir to be empty) - local -r waldir=$(postgresql_get_waldir) - if [[ -d "$waldir" ]]; then - info "Deleting existing WAL directory $waldir..." - rm -rf "$waldir" && ensure_dir_exists "$waldir" - fi - - info "Cloning data from primary node..." - local -r flags=("-f" "$REPMGR_CONF_FILE" "-h" "$REPMGR_CURRENT_PRIMARY_HOST" "-p" "$REPMGR_CURRENT_PRIMARY_PORT" "-U" "$REPMGR_USERNAME" "-d" "$REPMGR_DATABASE" "-D" "$POSTGRESQL_DATA_DIR" "standby" "clone" "--fast-checkpoint" "--force") - - if [[ "$REPMGR_USE_PASSFILE" = "true" ]]; then - PGPASSFILE="$REPMGR_PASSFILE_PATH" debug_execute "${REPMGR_BIN_DIR}/repmgr" "${flags[@]}" - else - PGPASSWORD="$REPMGR_PASSWORD" debug_execute "${REPMGR_BIN_DIR}/repmgr" "${flags[@]}" - fi - -} - -######################## -# Execute pg_rewind to get data from the primary node -# Globals: -# REPMGR_* -# Arguments: -# None -# Returns: -# None -######################### -repmgr_pgrewind() { - info "Running pg_rewind data to primary node..." - local -r flags=("-D" "$POSTGRESQL_DATA_DIR" "--source-server" "host=${REPMGR_CURRENT_PRIMARY_HOST} port=${REPMGR_CURRENT_PRIMARY_PORT} user=${REPMGR_USERNAME} dbname=${REPMGR_DATABASE}") - - if [[ "$REPMGR_USE_PASSFILE" = "true" ]]; then - PGPASSFILE="$REPMGR_PASSFILE_PATH" debug_execute "${POSTGRESQL_BIN_DIR}/pg_rewind" "${flags[@]}" - else - PGPASSWORD="$REPMGR_PASSWORD" debug_execute "${POSTGRESQL_BIN_DIR}/pg_rewind" "${flags[@]}" - fi -} - -######################## -# Rejoin node -# Globals: -# REPMGR_* -# Arguments: -# None -# Returns: -# None -######################### -repmgr_rewind() { - info "Rejoining node..." - - ensure_dir_exists "$POSTGRESQL_DATA_DIR" - if is_boolean_yes "$REPMGR_USE_PGREWIND"; then - info "Using pg_rewind to primary node..." - if ! repmgr_pgrewind; then - warn "pg_rewind failed, resorting to data cloning" - repmgr_clone_primary - fi - else - repmgr_clone_primary - fi -} - -######################## -# Register a node as primary -# Globals: -# REPMGR_* -# Arguments: -# None -# Returns: -# None -######################### -repmgr_register_primary() { - info "Registering Primary..." - local -r flags=("-f" "$REPMGR_CONF_FILE" "master" "register" "--force") - - debug_execute "${REPMGR_BIN_DIR}/repmgr" "${flags[@]}" -} - -######################## -# Unregister standby node -# Globals: -# REPMGR_* -# Arguments: -# None -# Returns: -# None -######################### -repmgr_unregister_standby() { - info "Unregistering standby node..." - - local -r flags=("standby" "unregister" "-f" "$REPMGR_CONF_FILE" "--node-id=$(repmgr_get_node_id)") - - # The command below can fail when the node doesn't exist yet - debug_execute "${REPMGR_BIN_DIR}/repmgr" "${flags[@]}" || true -} - -######################## -# Unregister witness -# Globals: -# REPMGR_* -# Arguments: -# None -# Returns: -# None -######################### -repmgr_unregister_witness() { - info "Unregistering witness node..." - local -r flags=("-f" "$REPMGR_CONF_FILE" "witness" "unregister" "-h" "$REPMGR_CURRENT_PRIMARY_HOST" "--verbose") - - # The command below can fail when the node doesn't exist yet - if [[ "$REPMGR_USE_PASSFILE" = "true" ]]; then - PGPASSFILE="$REPMGR_PASSFILE_PATH" debug_execute "${REPMGR_BIN_DIR}/repmgr" "${flags[@]}" || true - else - PGPASSWORD="$REPMGR_PASSWORD" debug_execute "${REPMGR_BIN_DIR}/repmgr" "${flags[@]}" || true - fi -} - -######################## -# Register witness -# Globals: -# REPMGR_* -# Arguments: -# None -# Returns: -# None -######################### -repmgr_register_witness() { - info "Registering witness node..." - local -r flags=("-f" "$REPMGR_CONF_FILE" "witness" "register" "-h" "$REPMGR_CURRENT_PRIMARY_HOST" "--force" "--verbose") - - repmgr_wait_primary_node - - if [[ "$REPMGR_USE_PASSFILE" = "true" ]]; then - PGPASSFILE="$REPMGR_PASSFILE_PATH" debug_execute "${REPMGR_BIN_DIR}/repmgr" "${flags[@]}" - else - PGPASSWORD="$REPMGR_PASSWORD" debug_execute "${REPMGR_BIN_DIR}/repmgr" "${flags[@]}" - fi -} - -######################## -# Standby follow. -# Globals: -# REPMGR_* -# Arguments: -# None -# Returns: -# None -######################### -repmgr_standby_follow() { - info "Running standby follow..." - local -r flags=("standby" "follow" "-f" "$REPMGR_CONF_FILE" "-W" "--log-level" "DEBUG" "--verbose") - - if [[ "$REPMGR_USE_PASSFILE" = "true" ]]; then - PGPASSFILE="$REPMGR_PASSFILE_PATH" debug_execute "${REPMGR_BIN_DIR}/repmgr" "${flags[@]}" - else - PGPASSWORD="$REPMGR_PASSWORD" debug_execute "${REPMGR_BIN_DIR}/repmgr" "${flags[@]}" - fi - -} - -######################## -# Resgister a node as standby -# Globals: -# REPMGR_* -# Arguments: -# None -# Returns: -# None -######################### -repmgr_register_standby() { - info "Registering Standby node..." - local -r flags=("standby" "register" "-f" "$REPMGR_CONF_FILE" "--force" "--verbose") - - debug_execute "${REPMGR_BIN_DIR}/repmgr" "${flags[@]}" -} - -######################## -# Upgrade repmgr extension -# Globals: -# REPMGR_* -# Arguments: -# None -# Returns: -# None -######################### -repmgr_upgrade_extension() { - info "Upgrading repmgr extension..." - - echo "ALTER EXTENSION repmgr UPDATE" | postgresql_execute "$REPMGR_DATABASE" "$REPMGR_USERNAME" "$REPMGR_PASSWORD" -} - -######################## -# Initialize repmgr service -# Globals: -# REPMGR_* -# Arguments: -# None -# Returns: -# None -######################### -repmgr_initialize() { - debug "Node ID: '$(repmgr_get_node_id)', Rol: '$REPMGR_ROLE', Primary Node: '${REPMGR_CURRENT_PRIMARY_HOST}:${REPMGR_CURRENT_PRIMARY_PORT}'" - info "Initializing Repmgr..." - - ensure_dir_exists "$REPMGR_LOCK_DIR" - am_i_root && chown "$POSTGRESQL_DAEMON_USER:$POSTGRESQL_DAEMON_GROUP" "$REPMGR_LOCK_DIR" - - if [[ "$REPMGR_ROLE" = "standby" ]]; then - repmgr_wait_primary_node || exit 1 - repmgr_rewind - fi - postgresql_initialize - if ! repmgr_is_file_external "postgresql.conf"; then - # Allow remote connections, required to register primary and standby nodes - postgresql_enable_remote_connections - # Configure port and restrict access to PostgreSQL (MD5) - postgresql_set_property "port" "$POSTGRESQL_PORT_NUMBER" - - postgresql_configure_replication_parameters - postgresql_configure_fsync - fi - if ! repmgr_is_file_external "pg_hba.conf"; then - is_boolean_yes "$REPMGR_PGHBA_TRUST_ALL" || postgresql_restrict_pghba - fi - if [[ "$REPMGR_ROLE" = "primary" ]]; then - if is_boolean_yes "$POSTGRESQL_FIRST_BOOT"; then - postgresql_start_bg - repmgr_create_repmgr_user - repmgr_create_repmgr_db - # Restart PostgreSQL - postgresql_stop - postgresql_start_bg - repmgr_register_primary - # Allow running custom initialization scripts - postgresql_custom_init_scripts - # Set synchronous replication - POSTGRESQL_CLUSTER_APP_NAME="$REPMGR_PARTNER_NODES" - export POSTGRESQL_CLUSTER_APP_NAME - postgresql_configure_synchronous_replication - elif is_boolean_yes "$REPMGR_UPGRADE_EXTENSION"; then - # Upgrade repmgr extension - postgresql_start_bg - repmgr_upgrade_extension - else - debug "Skipping repmgr configuration..." - fi - elif [[ "$REPMGR_ROLE" = "standby" ]]; then - local -r psql_major_version="$(postgresql_get_major_version)" - - POSTGRESQL_MASTER_PORT_NUMBER="$REPMGR_CURRENT_PRIMARY_PORT" - export POSTGRESQL_MASTER_PORT_NUMBER - POSTGRESQL_MASTER_HOST="$REPMGR_CURRENT_PRIMARY_HOST" - export POSTGRESQL_MASTER_HOST - - postgresql_configure_recovery - postgresql_start_bg - repmgr_unregister_standby - repmgr_register_standby - - if [[ "$psql_major_version" -lt "12" ]]; then - info "Check if primary running..." - repmgr_wait_primary_node - repmgr_standby_follow - fi - elif [[ "$REPMGR_ROLE" = "witness" ]]; then - postgresql_start_bg - repmgr_create_repmgr_user - repmgr_create_repmgr_db - repmgr_unregister_witness - repmgr_register_witness - fi -} diff --git a/bitnami/postgresql-repmgr/11/debian-11/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh b/bitnami/postgresql-repmgr/11/debian-11/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh deleted file mode 100755 index c937a8fa4b183..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purpose - -# Defaults -WITH_ALL_LOCALES="${WITH_ALL_LOCALES:-no}" -EXTRA_LOCALES="${EXTRA_LOCALES:-}" - -# Constants -LOCALES_FILE="/etc/locale.gen" -SUPPORTED_LOCALES_FILE="/usr/share/i18n/SUPPORTED" - -# Helper function for enabling locale only when it was not added before -enable_locale() { - local -r locale="${1:?missing locale}" - if ! grep -q -E "^${locale}$" "$SUPPORTED_LOCALES_FILE"; then - echo "Locale ${locale} is not supported in this system" - return 1 - fi - if ! grep -q -E "^${locale}" "$LOCALES_FILE"; then - echo "$locale" >> "$LOCALES_FILE" - else - echo "Locale ${locale} is already enabled" - fi -} - -if [[ "$WITH_ALL_LOCALES" =~ ^(yes|true|1)$ ]]; then - echo "Enabling all locales" - cp "$SUPPORTED_LOCALES_FILE" "$LOCALES_FILE" -else - # shellcheck disable=SC2001 - LOCALES_TO_ADD="$(sed 's/[,;]\s*/\n/g' <<< "$EXTRA_LOCALES")" - while [[ -n "$LOCALES_TO_ADD" ]] && read -r locale; do - echo "Enabling locale ${locale}" - enable_locale "$locale" - done <<< "$LOCALES_TO_ADD" -fi - -locale-gen diff --git a/bitnami/postgresql-repmgr/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh b/bitnami/postgresql-repmgr/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh deleted file mode 100644 index 265b8a96f9fb8..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh +++ /dev/null @@ -1,452 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Environment configuration for postgresql - -# The values for all environment variables will be set in the below order of precedence -# 1. Custom environment variables defined below after Bitnami defaults -# 2. Constants defined in this file (environment variables with no default), i.e. BITNAMI_ROOT_DIR -# 3. Environment variables overridden via external files using *_FILE variables (see below) -# 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata) - -# Load logging library -# shellcheck disable=SC1090,SC1091 -. /opt/bitnami/scripts/liblog.sh - -export BITNAMI_ROOT_DIR="/opt/bitnami" -export BITNAMI_VOLUME_DIR="/bitnami" - -# Logging configuration -export MODULE="${MODULE:-postgresql}" -export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}" - -# By setting an environment variable matching *_FILE to a file path, the prefixed environment -# variable will be overridden with the value specified in that file -postgresql_env_vars=( - POSTGRESQL_VOLUME_DIR - POSTGRESQL_DATA_DIR - POSTGRESQL_EXTRA_FLAGS - POSTGRESQL_INIT_MAX_TIMEOUT - POSTGRESQL_PGCTLTIMEOUT - POSTGRESQL_SHUTDOWN_MODE - POSTGRESQL_CLUSTER_APP_NAME - POSTGRESQL_DATABASE - POSTGRESQL_INITDB_ARGS - ALLOW_EMPTY_PASSWORD - POSTGRESQL_INITDB_WAL_DIR - POSTGRESQL_MASTER_HOST - POSTGRESQL_MASTER_PORT_NUMBER - POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS - POSTGRESQL_SYNCHRONOUS_REPLICAS_MODE - POSTGRESQL_PORT_NUMBER - POSTGRESQL_ALLOW_REMOTE_CONNECTIONS - POSTGRESQL_REPLICATION_MODE - POSTGRESQL_REPLICATION_USER - POSTGRESQL_SYNCHRONOUS_COMMIT_MODE - POSTGRESQL_FSYNC - POSTGRESQL_USERNAME - POSTGRESQL_ENABLE_LDAP - POSTGRESQL_LDAP_URL - POSTGRESQL_LDAP_PREFIX - POSTGRESQL_LDAP_SUFFIX - POSTGRESQL_LDAP_SERVER - POSTGRESQL_LDAP_PORT - POSTGRESQL_LDAP_SCHEME - POSTGRESQL_LDAP_TLS - POSTGRESQL_LDAP_BASE_DN - POSTGRESQL_LDAP_BIND_DN - POSTGRESQL_LDAP_BIND_PASSWORD - POSTGRESQL_LDAP_SEARCH_ATTR - POSTGRESQL_LDAP_SEARCH_FILTER - POSTGRESQL_INITSCRIPTS_USERNAME - POSTGRESQL_PASSWORD - POSTGRESQL_POSTGRES_PASSWORD - POSTGRESQL_REPLICATION_PASSWORD - POSTGRESQL_INITSCRIPTS_PASSWORD - POSTGRESQL_ENABLE_TLS - POSTGRESQL_TLS_CERT_FILE - POSTGRESQL_TLS_KEY_FILE - POSTGRESQL_TLS_CA_FILE - POSTGRESQL_TLS_CRL_FILE - POSTGRESQL_TLS_PREFER_SERVER_CIPHERS - POSTGRESQL_SHARED_PRELOAD_LIBRARIES - POSTGRESQL_PGAUDIT_LOG - POSTGRESQL_PGAUDIT_LOG_CATALOG - POSTGRESQL_PGAUDIT_LOG_PARAMETER - POSTGRESQL_LOG_CONNECTIONS - POSTGRESQL_LOG_DISCONNECTIONS - POSTGRESQL_LOG_HOSTNAME - POSTGRESQL_CLIENT_MIN_MESSAGES - POSTGRESQL_LOG_LINE_PREFIX - POSTGRESQL_LOG_TIMEZONE - POSTGRESQL_TIMEZONE - POSTGRESQL_MAX_CONNECTIONS - POSTGRESQL_TCP_KEEPALIVES_IDLE - POSTGRESQL_TCP_KEEPALIVES_INTERVAL - POSTGRESQL_TCP_KEEPALIVES_COUNT - POSTGRESQL_STATEMENT_TIMEOUT - POSTGRESQL_PGHBA_REMOVE_FILTERS - POSTGRESQL_USERNAME_CONNECTION_LIMIT - POSTGRESQL_POSTGRES_CONNECTION_LIMIT - POSTGRESQL_WAL_LEVEL - POSTGRESQL_DEFAULT_TOAST_COMPRESSION - POSTGRESQL_PASSWORD_ENCRYPTION - POSTGRESQL_DEFAULT_TRANSACTION_ISOLATION - POSTGRESQL_AUTOCTL_CONF_DIR - POSTGRESQL_AUTOCTL_MODE - POSTGRESQL_AUTOCTL_MONITOR_HOST - POSTGRESQL_AUTOCTL_HOSTNAME - REPMGR_DATA_DIR - REPMGR_NODE_ID - REPMGR_NODE_ID_START_SEED - REPMGR_NODE_NAME - REPMGR_NODE_NETWORK_NAME - REPMGR_NODE_PRIORITY - REPMGR_NODE_LOCATION - REPMGR_NODE_TYPE - REPMGR_PORT_NUMBER - REPMGR_LOG_LEVEL - REPMGR_USE_PGREWIND - REPMGR_START_OPTIONS - REPMGR_CONNECT_TIMEOUT - REPMGR_RECONNECT_ATTEMPTS - REPMGR_RECONNECT_INTERVAL - REPMGR_PARTNER_NODES - REPMGR_PRIMARY_HOST - REPMGR_PRIMARY_PORT - REPMGR_USE_REPLICATION_SLOTS - REPMGR_MASTER_RESPONSE_TIMEOUT - REPMGR_DEGRADED_MONITORING_TIMEOUT - REPMGR_UPGRADE_EXTENSION - REPMGR_FENCE_OLD_PRIMARY - REPMGR_FAILOVER - REPMGR_CHILD_NODES_CHECK_INTERVAL - REPMGR_CHILD_NODES_CONNECTED_MIN_COUNT - REPMGR_CHILD_NODES_DISCONNECT_TIMEOUT - REPMGR_SWITCH_ROLE - REPMGR_USERNAME - REPMGR_DATABASE - REPMGR_PGHBA_TRUST_ALL - REPMGR_PASSWORD - REPMGR_USE_PASSFILE - REPMGR_PASSFILE_PATH - PGCONNECT_TIMEOUT - POSTGRESQL_REPLICATION_PASSFILE_PATH - POSTGRES_DATA_DIR - PGDATA - POSTGRES_SHUTDOWN_MODE - POSTGRES_CLUSTER_APP_NAME - POSTGRES_DATABASE - POSTGRES_DB - POSTGRES_INITDB_ARGS - POSTGRES_INITDB_WAL_DIR - POSTGRES_MASTER_HOST - POSTGRES_MASTER_PORT_NUMBER - POSTGRES_NUM_SYNCHRONOUS_REPLICAS - POSTGRES_SYNCHRONOUS_REPLICAS_MODE - POSTGRES_PORT_NUMBER - POSTGRES_ALLOW_REMOTE_CONNECTIONS - POSTGRES_REPLICATION_MODE - POSTGRES_REPLICATION_USER - POSTGRES_SYNCHRONOUS_COMMIT_MODE - POSTGRES_FSYNC - POSTGRES_USERNAME - POSTGRES_USER - POSTGRESQL_USER - POSTGRES_ENABLE_LDAP - POSTGRES_LDAP_URL - POSTGRES_LDAP_PREFIX - POSTGRES_LDAP_SUFFIX - POSTGRES_LDAP_SERVER - POSTGRES_LDAP_PORT - POSTGRES_LDAP_SCHEME - POSTGRES_LDAP_TLS - POSTGRES_LDAP_BASE_DN - POSTGRES_LDAP_BIND_DN - POSTGRES_LDAP_BIND_PASSWORD - POSTGRES_LDAP_SEARCH_ATTR - POSTGRES_LDAP_SEARCH_FILTER - POSTGRES_INITSCRIPTS_USERNAME - POSTGRES_PASSWORD - POSTGRES_POSTGRES_PASSWORD - POSTGRES_REPLICATION_PASSWORD - POSTGRES_INITSCRIPTS_PASSWORD - POSTGRES_ENABLE_TLS - POSTGRES_TLS_CERT_FILE - POSTGRES_TLS_KEY_FILE - POSTGRES_TLS_CA_FILE - POSTGRES_TLS_CRL_FILE - POSTGRES_TLS_PREFER_SERVER_CIPHERS - POSTGRES_SHARED_PRELOAD_LIBRARIES - POSTGRES_PGAUDIT_LOG - POSTGRES_PGAUDIT_LOG_CATALOG - POSTGRES_PGAUDIT_LOG_PARAMETER - POSTGRES_LOG_CONNECTIONS - POSTGRES_LOG_DISCONNECTIONS - POSTGRES_LOG_HOSTNAME - POSTGRES_CLIENT_MIN_MESSAGES - POSTGRES_LOG_LINE_PREFIX - POSTGRES_LOG_TIMEZONE - POSTGRES_TIMEZONE - POSTGRES_MAX_CONNECTIONS - POSTGRES_TCP_KEEPALIVES_IDLE - POSTGRES_TCP_KEEPALIVES_INTERVAL - POSTGRES_TCP_KEEPALIVES_COUNT - POSTGRES_STATEMENT_TIMEOUT - POSTGRES_PGHBA_REMOVE_FILTERS - POSTGRES_USER_CONNECTION_LIMIT - POSTGRES_POSTGRES_CONNECTION_LIMIT -) -for env_var in "${postgresql_env_vars[@]}"; do - file_env_var="${env_var}_FILE" - if [[ -n "${!file_env_var:-}" ]]; then - if [[ -r "${!file_env_var:-}" ]]; then - export "${env_var}=$(< "${!file_env_var}")" - unset "${file_env_var}" - else - warn "Skipping export of '${env_var}'. '${!file_env_var:-}' is not readable." - fi - fi -done -unset postgresql_env_vars - -# Paths -export POSTGRESQL_VOLUME_DIR="${POSTGRESQL_VOLUME_DIR:-/bitnami/postgresql}" -export POSTGRESQL_BASE_DIR="/opt/bitnami/postgresql" -POSTGRESQL_DATA_DIR="${POSTGRESQL_DATA_DIR:-"${POSTGRES_DATA_DIR:-}"}" -POSTGRESQL_DATA_DIR="${POSTGRESQL_DATA_DIR:-"${PGDATA:-}"}" -export POSTGRESQL_DATA_DIR="${POSTGRESQL_DATA_DIR:-${POSTGRESQL_VOLUME_DIR}/data}" -export POSTGRESQL_CONF_DIR="$POSTGRESQL_BASE_DIR/conf" -export POSTGRESQL_MOUNTED_CONF_DIR="$POSTGRESQL_VOLUME_DIR/conf" -export POSTGRESQL_CONF_FILE="$POSTGRESQL_CONF_DIR/postgresql.conf" -export POSTGRESQL_PGHBA_FILE="$POSTGRESQL_CONF_DIR/pg_hba.conf" -export POSTGRESQL_RECOVERY_FILE="$POSTGRESQL_DATA_DIR/recovery.conf" -export POSTGRESQL_LOG_DIR="$POSTGRESQL_BASE_DIR/logs" -export POSTGRESQL_LOG_FILE="$POSTGRESQL_LOG_DIR/postgresql.log" -export POSTGRESQL_TMP_DIR="$POSTGRESQL_BASE_DIR/tmp" -export POSTGRESQL_PID_FILE="$POSTGRESQL_TMP_DIR/postgresql.pid" -export POSTGRESQL_BIN_DIR="$POSTGRESQL_BASE_DIR/bin" -export POSTGRESQL_INITSCRIPTS_DIR="/docker-entrypoint-initdb.d" -export POSTGRESQL_PREINITSCRIPTS_DIR="/docker-entrypoint-preinitdb.d" -export PATH="${POSTGRESQL_BIN_DIR}:${BITNAMI_ROOT_DIR}/common/bin:${PATH}" - -# System users (when running with a privileged user) -export POSTGRESQL_DAEMON_USER="postgres" -export POSTGRESQL_DAEMON_GROUP="postgres" - -# PostgreSQL settings -export POSTGRESQL_EXTRA_FLAGS="${POSTGRESQL_EXTRA_FLAGS:-}" -export POSTGRESQL_INIT_MAX_TIMEOUT="${POSTGRESQL_INIT_MAX_TIMEOUT:-60}" -export POSTGRESQL_PGCTLTIMEOUT="${POSTGRESQL_PGCTLTIMEOUT:-60}" -POSTGRESQL_SHUTDOWN_MODE="${POSTGRESQL_SHUTDOWN_MODE:-"${POSTGRES_SHUTDOWN_MODE:-}"}" -export POSTGRESQL_SHUTDOWN_MODE="${POSTGRESQL_SHUTDOWN_MODE:-fast}" -POSTGRESQL_CLUSTER_APP_NAME="${POSTGRESQL_CLUSTER_APP_NAME:-"${POSTGRES_CLUSTER_APP_NAME:-}"}" -export POSTGRESQL_CLUSTER_APP_NAME="${POSTGRESQL_CLUSTER_APP_NAME:-walreceiver}" -POSTGRESQL_DATABASE="${POSTGRESQL_DATABASE:-"${POSTGRES_DATABASE:-}"}" -POSTGRESQL_DATABASE="${POSTGRESQL_DATABASE:-"${POSTGRES_DB:-}"}" -export POSTGRESQL_DATABASE="${POSTGRESQL_DATABASE:-postgres}" -POSTGRESQL_INITDB_ARGS="${POSTGRESQL_INITDB_ARGS:-"${POSTGRES_INITDB_ARGS:-}"}" -export POSTGRESQL_INITDB_ARGS="${POSTGRESQL_INITDB_ARGS:-}" -export ALLOW_EMPTY_PASSWORD="${ALLOW_EMPTY_PASSWORD:-no}" -POSTGRESQL_INITDB_WAL_DIR="${POSTGRESQL_INITDB_WAL_DIR:-"${POSTGRES_INITDB_WAL_DIR:-}"}" -export POSTGRESQL_INITDB_WAL_DIR="${POSTGRESQL_INITDB_WAL_DIR:-}" -POSTGRESQL_MASTER_HOST="${POSTGRESQL_MASTER_HOST:-"${POSTGRES_MASTER_HOST:-}"}" -export POSTGRESQL_MASTER_HOST="${POSTGRESQL_MASTER_HOST:-}" -POSTGRESQL_MASTER_PORT_NUMBER="${POSTGRESQL_MASTER_PORT_NUMBER:-"${POSTGRES_MASTER_PORT_NUMBER:-}"}" -export POSTGRESQL_MASTER_PORT_NUMBER="${POSTGRESQL_MASTER_PORT_NUMBER:-5432}" -POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS="${POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS:-"${POSTGRES_NUM_SYNCHRONOUS_REPLICAS:-}"}" -export POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS="${POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS:-0}" -POSTGRESQL_SYNCHRONOUS_REPLICAS_MODE="${POSTGRESQL_SYNCHRONOUS_REPLICAS_MODE:-"${POSTGRES_SYNCHRONOUS_REPLICAS_MODE:-}"}" -export POSTGRESQL_SYNCHRONOUS_REPLICAS_MODE="${POSTGRESQL_SYNCHRONOUS_REPLICAS_MODE:-}" -POSTGRESQL_PORT_NUMBER="${POSTGRESQL_PORT_NUMBER:-"${POSTGRES_PORT_NUMBER:-}"}" -export POSTGRESQL_PORT_NUMBER="${POSTGRESQL_PORT_NUMBER:-5432}" -POSTGRESQL_ALLOW_REMOTE_CONNECTIONS="${POSTGRESQL_ALLOW_REMOTE_CONNECTIONS:-"${POSTGRES_ALLOW_REMOTE_CONNECTIONS:-}"}" -export POSTGRESQL_ALLOW_REMOTE_CONNECTIONS="${POSTGRESQL_ALLOW_REMOTE_CONNECTIONS:-yes}" -POSTGRESQL_REPLICATION_MODE="${POSTGRESQL_REPLICATION_MODE:-"${POSTGRES_REPLICATION_MODE:-}"}" -export POSTGRESQL_REPLICATION_MODE="${POSTGRESQL_REPLICATION_MODE:-master}" -POSTGRESQL_REPLICATION_USER="${POSTGRESQL_REPLICATION_USER:-"${POSTGRES_REPLICATION_USER:-}"}" -export POSTGRESQL_REPLICATION_USER="${POSTGRESQL_REPLICATION_USER:-}" -POSTGRESQL_SYNCHRONOUS_COMMIT_MODE="${POSTGRESQL_SYNCHRONOUS_COMMIT_MODE:-"${POSTGRES_SYNCHRONOUS_COMMIT_MODE:-}"}" -export POSTGRESQL_SYNCHRONOUS_COMMIT_MODE="${POSTGRESQL_SYNCHRONOUS_COMMIT_MODE:-on}" -POSTGRESQL_FSYNC="${POSTGRESQL_FSYNC:-"${POSTGRES_FSYNC:-}"}" -export POSTGRESQL_FSYNC="${POSTGRESQL_FSYNC:-on}" -POSTGRESQL_USERNAME="${POSTGRESQL_USERNAME:-"${POSTGRES_USERNAME:-}"}" -POSTGRESQL_USERNAME="${POSTGRESQL_USERNAME:-"${POSTGRES_USER:-}"}" -POSTGRESQL_USERNAME="${POSTGRESQL_USERNAME:-"${POSTGRESQL_USER:-}"}" -export POSTGRESQL_USERNAME="${POSTGRESQL_USERNAME:-postgres}" -POSTGRESQL_ENABLE_LDAP="${POSTGRESQL_ENABLE_LDAP:-"${POSTGRES_ENABLE_LDAP:-}"}" -export POSTGRESQL_ENABLE_LDAP="${POSTGRESQL_ENABLE_LDAP:-no}" -POSTGRESQL_LDAP_URL="${POSTGRESQL_LDAP_URL:-"${POSTGRES_LDAP_URL:-}"}" -export POSTGRESQL_LDAP_URL="${POSTGRESQL_LDAP_URL:-}" -POSTGRESQL_LDAP_PREFIX="${POSTGRESQL_LDAP_PREFIX:-"${POSTGRES_LDAP_PREFIX:-}"}" -export POSTGRESQL_LDAP_PREFIX="${POSTGRESQL_LDAP_PREFIX:-}" -POSTGRESQL_LDAP_SUFFIX="${POSTGRESQL_LDAP_SUFFIX:-"${POSTGRES_LDAP_SUFFIX:-}"}" -export POSTGRESQL_LDAP_SUFFIX="${POSTGRESQL_LDAP_SUFFIX:-}" -POSTGRESQL_LDAP_SERVER="${POSTGRESQL_LDAP_SERVER:-"${POSTGRES_LDAP_SERVER:-}"}" -export POSTGRESQL_LDAP_SERVER="${POSTGRESQL_LDAP_SERVER:-}" -POSTGRESQL_LDAP_PORT="${POSTGRESQL_LDAP_PORT:-"${POSTGRES_LDAP_PORT:-}"}" -export POSTGRESQL_LDAP_PORT="${POSTGRESQL_LDAP_PORT:-}" -POSTGRESQL_LDAP_SCHEME="${POSTGRESQL_LDAP_SCHEME:-"${POSTGRES_LDAP_SCHEME:-}"}" -export POSTGRESQL_LDAP_SCHEME="${POSTGRESQL_LDAP_SCHEME:-}" -POSTGRESQL_LDAP_TLS="${POSTGRESQL_LDAP_TLS:-"${POSTGRES_LDAP_TLS:-}"}" -export POSTGRESQL_LDAP_TLS="${POSTGRESQL_LDAP_TLS:-}" -POSTGRESQL_LDAP_BASE_DN="${POSTGRESQL_LDAP_BASE_DN:-"${POSTGRES_LDAP_BASE_DN:-}"}" -export POSTGRESQL_LDAP_BASE_DN="${POSTGRESQL_LDAP_BASE_DN:-}" -POSTGRESQL_LDAP_BIND_DN="${POSTGRESQL_LDAP_BIND_DN:-"${POSTGRES_LDAP_BIND_DN:-}"}" -export POSTGRESQL_LDAP_BIND_DN="${POSTGRESQL_LDAP_BIND_DN:-}" -POSTGRESQL_LDAP_BIND_PASSWORD="${POSTGRESQL_LDAP_BIND_PASSWORD:-"${POSTGRES_LDAP_BIND_PASSWORD:-}"}" -export POSTGRESQL_LDAP_BIND_PASSWORD="${POSTGRESQL_LDAP_BIND_PASSWORD:-}" -POSTGRESQL_LDAP_SEARCH_ATTR="${POSTGRESQL_LDAP_SEARCH_ATTR:-"${POSTGRES_LDAP_SEARCH_ATTR:-}"}" -export POSTGRESQL_LDAP_SEARCH_ATTR="${POSTGRESQL_LDAP_SEARCH_ATTR:-}" -POSTGRESQL_LDAP_SEARCH_FILTER="${POSTGRESQL_LDAP_SEARCH_FILTER:-"${POSTGRES_LDAP_SEARCH_FILTER:-}"}" -export POSTGRESQL_LDAP_SEARCH_FILTER="${POSTGRESQL_LDAP_SEARCH_FILTER:-}" -POSTGRESQL_INITSCRIPTS_USERNAME="${POSTGRESQL_INITSCRIPTS_USERNAME:-"${POSTGRES_INITSCRIPTS_USERNAME:-}"}" -export POSTGRESQL_INITSCRIPTS_USERNAME="${POSTGRESQL_INITSCRIPTS_USERNAME:-$POSTGRESQL_USERNAME}" -POSTGRESQL_PASSWORD="${POSTGRESQL_PASSWORD:-"${POSTGRES_PASSWORD:-}"}" -export POSTGRESQL_PASSWORD="${POSTGRESQL_PASSWORD:-}" -POSTGRESQL_POSTGRES_PASSWORD="${POSTGRESQL_POSTGRES_PASSWORD:-"${POSTGRES_POSTGRES_PASSWORD:-}"}" -export POSTGRESQL_POSTGRES_PASSWORD="${POSTGRESQL_POSTGRES_PASSWORD:-}" -POSTGRESQL_REPLICATION_PASSWORD="${POSTGRESQL_REPLICATION_PASSWORD:-"${POSTGRES_REPLICATION_PASSWORD:-}"}" -export POSTGRESQL_REPLICATION_PASSWORD="${POSTGRESQL_REPLICATION_PASSWORD:-}" -POSTGRESQL_INITSCRIPTS_PASSWORD="${POSTGRESQL_INITSCRIPTS_PASSWORD:-"${POSTGRES_INITSCRIPTS_PASSWORD:-}"}" -export POSTGRESQL_INITSCRIPTS_PASSWORD="${POSTGRESQL_INITSCRIPTS_PASSWORD:-$POSTGRESQL_PASSWORD}" -POSTGRESQL_ENABLE_TLS="${POSTGRESQL_ENABLE_TLS:-"${POSTGRES_ENABLE_TLS:-}"}" -export POSTGRESQL_ENABLE_TLS="${POSTGRESQL_ENABLE_TLS:-no}" -POSTGRESQL_TLS_CERT_FILE="${POSTGRESQL_TLS_CERT_FILE:-"${POSTGRES_TLS_CERT_FILE:-}"}" -export POSTGRESQL_TLS_CERT_FILE="${POSTGRESQL_TLS_CERT_FILE:-}" -POSTGRESQL_TLS_KEY_FILE="${POSTGRESQL_TLS_KEY_FILE:-"${POSTGRES_TLS_KEY_FILE:-}"}" -export POSTGRESQL_TLS_KEY_FILE="${POSTGRESQL_TLS_KEY_FILE:-}" -POSTGRESQL_TLS_CA_FILE="${POSTGRESQL_TLS_CA_FILE:-"${POSTGRES_TLS_CA_FILE:-}"}" -export POSTGRESQL_TLS_CA_FILE="${POSTGRESQL_TLS_CA_FILE:-}" -POSTGRESQL_TLS_CRL_FILE="${POSTGRESQL_TLS_CRL_FILE:-"${POSTGRES_TLS_CRL_FILE:-}"}" -export POSTGRESQL_TLS_CRL_FILE="${POSTGRESQL_TLS_CRL_FILE:-}" -POSTGRESQL_TLS_PREFER_SERVER_CIPHERS="${POSTGRESQL_TLS_PREFER_SERVER_CIPHERS:-"${POSTGRES_TLS_PREFER_SERVER_CIPHERS:-}"}" -export POSTGRESQL_TLS_PREFER_SERVER_CIPHERS="${POSTGRESQL_TLS_PREFER_SERVER_CIPHERS:-yes}" -POSTGRESQL_SHARED_PRELOAD_LIBRARIES="${POSTGRESQL_SHARED_PRELOAD_LIBRARIES:-"${POSTGRES_SHARED_PRELOAD_LIBRARIES:-}"}" -export POSTGRESQL_SHARED_PRELOAD_LIBRARIES="${POSTGRESQL_SHARED_PRELOAD_LIBRARIES:-pgaudit}" -POSTGRESQL_PGAUDIT_LOG="${POSTGRESQL_PGAUDIT_LOG:-"${POSTGRES_PGAUDIT_LOG:-}"}" -export POSTGRESQL_PGAUDIT_LOG="${POSTGRESQL_PGAUDIT_LOG:-}" -POSTGRESQL_PGAUDIT_LOG_CATALOG="${POSTGRESQL_PGAUDIT_LOG_CATALOG:-"${POSTGRES_PGAUDIT_LOG_CATALOG:-}"}" -export POSTGRESQL_PGAUDIT_LOG_CATALOG="${POSTGRESQL_PGAUDIT_LOG_CATALOG:-}" -POSTGRESQL_PGAUDIT_LOG_PARAMETER="${POSTGRESQL_PGAUDIT_LOG_PARAMETER:-"${POSTGRES_PGAUDIT_LOG_PARAMETER:-}"}" -export POSTGRESQL_PGAUDIT_LOG_PARAMETER="${POSTGRESQL_PGAUDIT_LOG_PARAMETER:-}" -POSTGRESQL_LOG_CONNECTIONS="${POSTGRESQL_LOG_CONNECTIONS:-"${POSTGRES_LOG_CONNECTIONS:-}"}" -export POSTGRESQL_LOG_CONNECTIONS="${POSTGRESQL_LOG_CONNECTIONS:-}" -POSTGRESQL_LOG_DISCONNECTIONS="${POSTGRESQL_LOG_DISCONNECTIONS:-"${POSTGRES_LOG_DISCONNECTIONS:-}"}" -export POSTGRESQL_LOG_DISCONNECTIONS="${POSTGRESQL_LOG_DISCONNECTIONS:-}" -POSTGRESQL_LOG_HOSTNAME="${POSTGRESQL_LOG_HOSTNAME:-"${POSTGRES_LOG_HOSTNAME:-}"}" -export POSTGRESQL_LOG_HOSTNAME="${POSTGRESQL_LOG_HOSTNAME:-}" -POSTGRESQL_CLIENT_MIN_MESSAGES="${POSTGRESQL_CLIENT_MIN_MESSAGES:-"${POSTGRES_CLIENT_MIN_MESSAGES:-}"}" -export POSTGRESQL_CLIENT_MIN_MESSAGES="${POSTGRESQL_CLIENT_MIN_MESSAGES:-error}" -POSTGRESQL_LOG_LINE_PREFIX="${POSTGRESQL_LOG_LINE_PREFIX:-"${POSTGRES_LOG_LINE_PREFIX:-}"}" -export POSTGRESQL_LOG_LINE_PREFIX="${POSTGRESQL_LOG_LINE_PREFIX:-}" -POSTGRESQL_LOG_TIMEZONE="${POSTGRESQL_LOG_TIMEZONE:-"${POSTGRES_LOG_TIMEZONE:-}"}" -export POSTGRESQL_LOG_TIMEZONE="${POSTGRESQL_LOG_TIMEZONE:-}" -POSTGRESQL_TIMEZONE="${POSTGRESQL_TIMEZONE:-"${POSTGRES_TIMEZONE:-}"}" -export POSTGRESQL_TIMEZONE="${POSTGRESQL_TIMEZONE:-}" -POSTGRESQL_MAX_CONNECTIONS="${POSTGRESQL_MAX_CONNECTIONS:-"${POSTGRES_MAX_CONNECTIONS:-}"}" -export POSTGRESQL_MAX_CONNECTIONS="${POSTGRESQL_MAX_CONNECTIONS:-}" -POSTGRESQL_TCP_KEEPALIVES_IDLE="${POSTGRESQL_TCP_KEEPALIVES_IDLE:-"${POSTGRES_TCP_KEEPALIVES_IDLE:-}"}" -export POSTGRESQL_TCP_KEEPALIVES_IDLE="${POSTGRESQL_TCP_KEEPALIVES_IDLE:-}" -POSTGRESQL_TCP_KEEPALIVES_INTERVAL="${POSTGRESQL_TCP_KEEPALIVES_INTERVAL:-"${POSTGRES_TCP_KEEPALIVES_INTERVAL:-}"}" -export POSTGRESQL_TCP_KEEPALIVES_INTERVAL="${POSTGRESQL_TCP_KEEPALIVES_INTERVAL:-}" -POSTGRESQL_TCP_KEEPALIVES_COUNT="${POSTGRESQL_TCP_KEEPALIVES_COUNT:-"${POSTGRES_TCP_KEEPALIVES_COUNT:-}"}" -export POSTGRESQL_TCP_KEEPALIVES_COUNT="${POSTGRESQL_TCP_KEEPALIVES_COUNT:-}" -POSTGRESQL_STATEMENT_TIMEOUT="${POSTGRESQL_STATEMENT_TIMEOUT:-"${POSTGRES_STATEMENT_TIMEOUT:-}"}" -export POSTGRESQL_STATEMENT_TIMEOUT="${POSTGRESQL_STATEMENT_TIMEOUT:-}" -POSTGRESQL_PGHBA_REMOVE_FILTERS="${POSTGRESQL_PGHBA_REMOVE_FILTERS:-"${POSTGRES_PGHBA_REMOVE_FILTERS:-}"}" -export POSTGRESQL_PGHBA_REMOVE_FILTERS="${POSTGRESQL_PGHBA_REMOVE_FILTERS:-}" -POSTGRESQL_USERNAME_CONNECTION_LIMIT="${POSTGRESQL_USERNAME_CONNECTION_LIMIT:-"${POSTGRES_USER_CONNECTION_LIMIT:-}"}" -export POSTGRESQL_USERNAME_CONNECTION_LIMIT="${POSTGRESQL_USERNAME_CONNECTION_LIMIT:-}" -POSTGRESQL_POSTGRES_CONNECTION_LIMIT="${POSTGRESQL_POSTGRES_CONNECTION_LIMIT:-"${POSTGRES_POSTGRES_CONNECTION_LIMIT:-}"}" -export POSTGRESQL_POSTGRES_CONNECTION_LIMIT="${POSTGRESQL_POSTGRES_CONNECTION_LIMIT:-}" -export POSTGRESQL_WAL_LEVEL="${POSTGRESQL_WAL_LEVEL:-replica}" -export POSTGRESQL_DEFAULT_TOAST_COMPRESSION="${POSTGRESQL_DEFAULT_TOAST_COMPRESSION:-}" -export POSTGRESQL_PASSWORD_ENCRYPTION="${POSTGRESQL_PASSWORD_ENCRYPTION:-}" -export POSTGRESQL_DEFAULT_TRANSACTION_ISOLATION="${POSTGRESQL_DEFAULT_TRANSACTION_ISOLATION:-}" - -# pgAutoFailover settings -export POSTGRESQL_AUTOCTL_VOLUME_DIR="${POSTGRESQL_VOLUME_DIR}/pgautoctl" -export POSTGRESQL_AUTOCTL_CONF_DIR="${POSTGRESQL_AUTOCTL_CONF_DIR:-${POSTGRESQL_AUTOCTL_VOLUME_DIR}/.config}" -export POSTGRESQL_AUTOCTL_MODE="${POSTGRESQL_AUTOCTL_MODE:-postgres}" -export POSTGRESQL_AUTOCTL_MONITOR_HOST="${POSTGRESQL_AUTOCTL_MONITOR_HOST:-monitor}" -export POSTGRESQL_AUTOCTL_HOSTNAME="${POSTGRESQL_AUTOCTL_HOSTNAME:-$(hostname --fqdn)}" - -# pgBackRest settings -export POSTGRESQL_PGBACKREST_VOLUME_DIR="${POSTGRESQL_VOLUME_DIR}/pgbackrest" -export POSTGRESQL_PGBACKREST_LOGS_DIR="${POSTGRESQL_PGBACKREST_VOLUME_DIR}/logs" -export POSTGRESQL_PGBACKREST_BACKUPS_DIR="${POSTGRESQL_PGBACKREST_VOLUME_DIR}/backups" -export POSTGRESQL_PGBACKREST_SPOOL_DIR="${POSTGRESQL_PGBACKREST_VOLUME_DIR}/spool" -export POSTGRESQL_PGBACKREST_CONF_FILE="${POSTGRESQL_DATA_DIR}/pgbackrest.conf" - -# Internal -export POSTGRESQL_FIRST_BOOT="yes" -export NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" - -# Paths (Replication Manager) -export PATH="/opt/bitnami/repmgr/bin:/opt/bitnami/common/bin:$PATH" -export REPMGR_BASE_DIR="/opt/bitnami/repmgr" -export REPMGR_CONF_DIR="$REPMGR_BASE_DIR/conf" -export REPMGR_VOLUME_DIR="/bitnami/repmgr" -export REPMGR_MOUNTED_CONF_DIR="$REPMGR_VOLUME_DIR/conf" -export REPMGR_TMP_DIR="$REPMGR_BASE_DIR/tmp" -export REPMGR_EVENTS_DIR="$REPMGR_BASE_DIR/events" -export REPMGR_LOCK_DIR="$POSTGRESQL_VOLUME_DIR/lock" -export REPMGR_PRIMARY_ROLE_LOCK_FILE_NAME="$REPMGR_LOCK_DIR/master.lock" -export REPMGR_STANDBY_ROLE_LOCK_FILE_NAME="$REPMGR_LOCK_DIR/standby.lock" -export REPMGR_BIN_DIR="$REPMGR_BASE_DIR/bin" -export REPMGR_CONF_FILE="$REPMGR_CONF_DIR/repmgr.conf" -export REPMGR_DATA_DIR="${REPMGR_DATA_DIR:-${REPMGR_VOLUME_DIR}/repmgr/data}" - -# Settings (Replication Manager) -export REPMGR_NODE_ID="${REPMGR_NODE_ID:-}" -export REPMGR_NODE_ID_START_SEED="${REPMGR_NODE_ID_START_SEED:-1000}" -export REPMGR_NODE_NAME="${REPMGR_NODE_NAME:-$(hostname)}" -export REPMGR_NODE_NETWORK_NAME="${REPMGR_NODE_NETWORK_NAME:-}" -export REPMGR_NODE_PRIORITY="${REPMGR_NODE_PRIORITY:-100}" -export REPMGR_NODE_LOCATION="${REPMGR_NODE_LOCATION:-default}" -export REPMGR_NODE_TYPE="${REPMGR_NODE_TYPE:-data}" -export REPMGR_PORT_NUMBER="${REPMGR_PORT_NUMBER:-5432}" -export REPMGR_LOG_LEVEL="${REPMGR_LOG_LEVEL:-NOTICE}" -export REPMGR_USE_PGREWIND="${REPMGR_USE_PGREWIND:-no}" -export REPMGR_START_OPTIONS="${REPMGR_START_OPTIONS:-}" -export REPMGR_CONNECT_TIMEOUT="${REPMGR_CONNECT_TIMEOUT:-5}" -export REPMGR_RECONNECT_ATTEMPTS="${REPMGR_RECONNECT_ATTEMPTS:-3}" -export REPMGR_RECONNECT_INTERVAL="${REPMGR_RECONNECT_INTERVAL:-5}" -export REPMGR_PARTNER_NODES="${REPMGR_PARTNER_NODES:-}" -export REPMGR_PRIMARY_HOST="${REPMGR_PRIMARY_HOST:-}" -export REPMGR_PRIMARY_PORT="${REPMGR_PRIMARY_PORT:-5432}" -export REPMGR_USE_REPLICATION_SLOTS="${REPMGR_USE_REPLICATION_SLOTS:-1}" -export REPMGR_MASTER_RESPONSE_TIMEOUT="${REPMGR_MASTER_RESPONSE_TIMEOUT:-20}" -export REPMGR_DEGRADED_MONITORING_TIMEOUT="${REPMGR_DEGRADED_MONITORING_TIMEOUT:-5}" -export REPMGR_UPGRADE_EXTENSION="${REPMGR_UPGRADE_EXTENSION:-no}" -export REPMGR_FENCE_OLD_PRIMARY="${REPMGR_FENCE_OLD_PRIMARY:-no}" -export REPMGR_FAILOVER="${REPMGR_FAILOVER:-automatic}" -export REPMGR_CHILD_NODES_CHECK_INTERVAL="${REPMGR_CHILD_NODES_CHECK_INTERVAL:-5}" -export REPMGR_CHILD_NODES_CONNECTED_MIN_COUNT="${REPMGR_CHILD_NODES_CONNECTED_MIN_COUNT:-1}" -export REPMGR_CHILD_NODES_DISCONNECT_TIMEOUT="${REPMGR_CHILD_NODES_DISCONNECT_TIMEOUT:-30}" - -# Internal (Replication Manager) -export REPMGR_SWITCH_ROLE="${REPMGR_SWITCH_ROLE:-no}" -export REPMGR_CURRENT_PRIMARY_HOST="" -export REPMGR_CURRENT_PRIMARY_PORT="$REPMGR_PRIMARY_PORT" - -# Credentials (Replication Manager) -export REPMGR_USERNAME="${REPMGR_USERNAME:-repmgr}" -export REPMGR_DATABASE="${REPMGR_DATABASE:-repmgr}" -export REPMGR_PGHBA_TRUST_ALL="${REPMGR_PGHBA_TRUST_ALL:-no}" -export REPMGR_PASSWORD="${REPMGR_PASSWORD:-}" -export REPMGR_USE_PASSFILE="${REPMGR_USE_PASSFILE:-}" -export REPMGR_PASSFILE_PATH="${REPMGR_PASSFILE_PATH:-$REPMGR_CONF_DIR/.pgpass}" - -# PostgreSQL env var (Replication Manager) -export PGCONNECT_TIMEOUT="${PGCONNECT_TIMEOUT:-10}" -export POSTGRESQL_REPLICATION_USER="$REPMGR_USERNAME" -export POSTGRESQL_REPLICATION_PASSWORD="$REPMGR_PASSWORD" -export POSTGRESQL_REPLICATION_USE_PASSFILE="$REPMGR_USE_PASSFILE" -export POSTGRESQL_REPLICATION_PASSFILE_PATH="${POSTGRESQL_REPLICATION_PASSFILE_PATH:-$REPMGR_PASSFILE_PATH}" -export POSTGRESQL_MASTER_HOST="$REPMGR_PRIMARY_HOST" -export POSTGRESQL_MASTER_PORT_NUMBER="$REPMGR_PRIMARY_PORT" - -# Custom environment variables may be defined below diff --git a/bitnami/postgresql-repmgr/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-repmgr/entrypoint.sh b/bitnami/postgresql-repmgr/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-repmgr/entrypoint.sh deleted file mode 100755 index 4ed25e56dc772..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-repmgr/entrypoint.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -#set -o xtrace - -# Load libraries -. /opt/bitnami/scripts/liblog.sh -. /opt/bitnami/scripts/libbitnami.sh -. /opt/bitnami/scripts/libpostgresql.sh -. /opt/bitnami/scripts/librepmgr.sh - -# Load PostgreSQL & repmgr environment variables -. /opt/bitnami/scripts/postgresql-env.sh -export MODULE=postgresql-repmgr - -print_welcome_page - -# Enable the nss_wrapper settings -postgresql_enable_nss_wrapper - -if [[ "$*" = *"/opt/bitnami/scripts/postgresql-repmgr/run.sh"* ]]; then - info "** Starting PostgreSQL with Replication Manager setup **" - /opt/bitnami/scripts/postgresql-repmgr/setup.sh - touch "$POSTGRESQL_TMP_DIR"/.initialized - info "** PostgreSQL with Replication Manager setup finished! **" -fi - -echo "" -exec "$@" diff --git a/bitnami/postgresql-repmgr/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-repmgr/postunpack.sh b/bitnami/postgresql-repmgr/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-repmgr/postunpack.sh deleted file mode 100755 index 11fa8a0f1edcd..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-repmgr/postunpack.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -# Load libraries -. /opt/bitnami/scripts/libfs.sh -. /opt/bitnami/scripts/libpostgresql.sh - -. /opt/bitnami/scripts/librepmgr.sh - -# Load PostgreSQL & repmgr environment variables -. /opt/bitnami/scripts/postgresql-env.sh - -for dir in "$POSTGRESQL_INITSCRIPTS_DIR" "$POSTGRESQL_TMP_DIR" "$POSTGRESQL_LOG_DIR" "$POSTGRESQL_CONF_DIR" "${POSTGRESQL_CONF_DIR}/conf.d" "$POSTGRESQL_MOUNTED_CONF_DIR" "${POSTGRESQL_MOUNTED_CONF_DIR}/conf.d" "$POSTGRESQL_VOLUME_DIR" "$REPMGR_CONF_DIR" "$REPMGR_TMP_DIR"; do - ensure_dir_exists "$dir" - chmod -R g+rwX "$dir" -done - - -# Copying events handlers -mv /events "$REPMGR_EVENTS_DIR" -chmod +x "$REPMGR_EVENTS_DIR"/router.sh "$REPMGR_EVENTS_DIR"/execs/*sh "$REPMGR_EVENTS_DIR"/execs/includes/*sh - -# Redirect all logging to stdout -ln -sf /dev/stdout "$POSTGRESQL_LOG_FILE" diff --git a/bitnami/postgresql-repmgr/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-repmgr/run.sh b/bitnami/postgresql-repmgr/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-repmgr/run.sh deleted file mode 100755 index c505050e16fad..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-repmgr/run.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load libraries -. /opt/bitnami/scripts/liblog.sh -. /opt/bitnami/scripts/libpostgresql.sh -. /opt/bitnami/scripts/librepmgr.sh - -# Load PostgreSQL & repmgr environment variables -. /opt/bitnami/scripts/postgresql-env.sh - -readonly repmgr_flags=("-f" "$REPMGR_CONF_FILE" "--daemonize=false") -# shellcheck disable=SC2155 -readonly repmgr_cmd=$(command -v repmgrd) - -postgresql_start_bg true -info "** Starting repmgrd **" -# TODO: properly test running the container as root -if am_i_root; then - exec_as_user "$POSTGRESQL_DAEMON_USER" "$repmgr_cmd" "${repmgr_flags[@]}" -else - exec "$repmgr_cmd" "${repmgr_flags[@]}" -fi diff --git a/bitnami/postgresql-repmgr/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-repmgr/setup.sh b/bitnami/postgresql-repmgr/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-repmgr/setup.sh deleted file mode 100755 index b8bd61401d67d..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-repmgr/setup.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Bitnami PostgreSQL setup - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -#set -o xtrace - -# Load Libraries -. /opt/bitnami/scripts/libpostgresql.sh -. /opt/bitnami/scripts/librepmgr.sh - -# Load PostgreSQL & repmgr environment variables -. /opt/bitnami/scripts/postgresql-env.sh - -# Ensure PostgreSQL & repmgr environment variables settings are valid -repmgr_validate -postgresql_validate - -# Set the environment variables for the node's role -eval "$(repmgr_set_role)" - -# Ensure PostgreSQL is stopped when this script ends. -trap "postgresql_stop" EXIT -# Ensure 'daemon' user exists when running as 'root' -am_i_root && ensure_user_exists "$POSTGRESQL_DAEMON_USER" --group "$POSTGRESQL_DAEMON_GROUP" -# Prepare PostgreSQL default configuration -repmgr_postgresql_configuration -# Prepare repmgr configuration -repmgr_generate_repmgr_config -# Initialize PostgreSQL & repmgr -repmgr_initialize diff --git a/bitnami/postgresql-repmgr/11/debian-11/tags-info.yaml b/bitnami/postgresql-repmgr/11/debian-11/tags-info.yaml deleted file mode 100644 index a3a447c5293a4..0000000000000 --- a/bitnami/postgresql-repmgr/11/debian-11/tags-info.yaml +++ /dev/null @@ -1,4 +0,0 @@ -rolling-tags: -- "11" -- 11-debian-11 -- 11.21.0 diff --git a/bitnami/postgresql-repmgr/12/debian-11/Dockerfile b/bitnami/postgresql-repmgr/12/debian-11/Dockerfile index 924898fd64afa..766ad6acf2d8a 100644 --- a/bitnami/postgresql-repmgr/12/debian-11/Dockerfile +++ b/bitnami/postgresql-repmgr/12/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-12T23:52:47Z" \ + org.opencontainers.image.created="2023-11-30T19:00:45Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="12.16.0-debian-11-r51" \ + org.opencontainers.image.ref.name="12.17.0-debian-11-r10" \ org.opencontainers.image.title="postgresql-repmgr" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="12.16.0" + org.opencontainers.image.version="12.17.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbsd0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblzma5 libmd0 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 locales procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "postgresql-repmgr-12.16.0-7-linux-${OS_ARCH}-debian-11" \ - ) && \ + "postgresql-repmgr-12.17.0-10-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -50,7 +50,7 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen COPY rootfs / RUN /opt/bitnami/scripts/postgresql-repmgr/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh -ENV APP_VERSION="12.16.0" \ +ENV APP_VERSION="12.17.0" \ BITNAMI_APP_NAME="postgresql-repmgr" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ diff --git a/bitnami/postgresql-repmgr/12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql-repmgr/12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index cea556f6bb57a..bc41d9e91d711 100644 --- a/bitnami/postgresql-repmgr/12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/postgresql-repmgr/12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "12.16.0-7" + "version": "12.17.0-10" } } \ No newline at end of file diff --git a/bitnami/postgresql-repmgr/12/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/postgresql-repmgr/12/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/postgresql-repmgr/12/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/postgresql-repmgr/12/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/postgresql-repmgr/12/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/postgresql-repmgr/12/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/postgresql-repmgr/12/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/postgresql-repmgr/12/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/postgresql-repmgr/12/debian-11/tags-info.yaml b/bitnami/postgresql-repmgr/12/debian-11/tags-info.yaml index e58b0e801fc82..1f911e56bed93 100644 --- a/bitnami/postgresql-repmgr/12/debian-11/tags-info.yaml +++ b/bitnami/postgresql-repmgr/12/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "12" - 12-debian-11 -- 12.16.0 +- 12.17.0 diff --git a/bitnami/postgresql-repmgr/13/debian-11/Dockerfile b/bitnami/postgresql-repmgr/13/debian-11/Dockerfile index 7a426c417b7cb..80016389c9a6d 100644 --- a/bitnami/postgresql-repmgr/13/debian-11/Dockerfile +++ b/bitnami/postgresql-repmgr/13/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-12T23:46:55Z" \ + org.opencontainers.image.created="2023-11-30T20:47:44Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="13.12.0-debian-11-r51" \ + org.opencontainers.image.ref.name="13.13.0-debian-11-r10" \ org.opencontainers.image.title="postgresql-repmgr" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="13.12.0" + org.opencontainers.image.version="13.13.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbsd0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblzma5 libmd0 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 locales procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "postgresql-repmgr-13.12.0-7-linux-${OS_ARCH}-debian-11" \ - ) && \ + "postgresql-repmgr-13.13.0-10-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -50,7 +50,7 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen COPY rootfs / RUN /opt/bitnami/scripts/postgresql-repmgr/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh -ENV APP_VERSION="13.12.0" \ +ENV APP_VERSION="13.13.0" \ BITNAMI_APP_NAME="postgresql-repmgr" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ diff --git a/bitnami/postgresql-repmgr/13/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql-repmgr/13/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index a689918df93c3..8430fec9dd6ce 100644 --- a/bitnami/postgresql-repmgr/13/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/postgresql-repmgr/13/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "13.12.0-7" + "version": "13.13.0-10" } } \ No newline at end of file diff --git a/bitnami/postgresql-repmgr/13/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/postgresql-repmgr/13/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/postgresql-repmgr/13/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/postgresql-repmgr/13/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/postgresql-repmgr/13/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/postgresql-repmgr/13/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/postgresql-repmgr/13/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/postgresql-repmgr/13/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/postgresql-repmgr/13/debian-11/tags-info.yaml b/bitnami/postgresql-repmgr/13/debian-11/tags-info.yaml index 090e8e65819d5..3f104d5d417dc 100644 --- a/bitnami/postgresql-repmgr/13/debian-11/tags-info.yaml +++ b/bitnami/postgresql-repmgr/13/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "13" - 13-debian-11 -- 13.12.0 +- 13.13.0 diff --git a/bitnami/postgresql-repmgr/14/debian-11/Dockerfile b/bitnami/postgresql-repmgr/14/debian-11/Dockerfile index 06debf64d3270..1628f017e3161 100644 --- a/bitnami/postgresql-repmgr/14/debian-11/Dockerfile +++ b/bitnami/postgresql-repmgr/14/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-13T02:08:13Z" \ + org.opencontainers.image.created="2023-11-30T22:22:06Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="14.9.0-debian-11-r54" \ + org.opencontainers.image.ref.name="14.10.0-debian-11-r10" \ org.opencontainers.image.title="postgresql-repmgr" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="14.9.0" + org.opencontainers.image.version="14.10.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbsd0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 locales procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "postgresql-repmgr-14.9.0-8-linux-${OS_ARCH}-debian-11" \ - ) && \ + "postgresql-repmgr-14.10.0-10-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -50,7 +50,7 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen COPY rootfs / RUN /opt/bitnami/scripts/postgresql-repmgr/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh -ENV APP_VERSION="14.9.0" \ +ENV APP_VERSION="14.10.0" \ BITNAMI_APP_NAME="postgresql-repmgr" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ diff --git a/bitnami/postgresql-repmgr/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql-repmgr/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 92b7bd39d5bf7..4695b6823d526 100644 --- a/bitnami/postgresql-repmgr/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/postgresql-repmgr/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "14.9.0-8" + "version": "14.10.0-10" } } \ No newline at end of file diff --git a/bitnami/postgresql-repmgr/14/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/postgresql-repmgr/14/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/postgresql-repmgr/14/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/postgresql-repmgr/14/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/postgresql-repmgr/14/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/postgresql-repmgr/14/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/postgresql-repmgr/14/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/postgresql-repmgr/14/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/postgresql-repmgr/14/debian-11/tags-info.yaml b/bitnami/postgresql-repmgr/14/debian-11/tags-info.yaml index 0bb49aa70041c..de51d3f056ea2 100644 --- a/bitnami/postgresql-repmgr/14/debian-11/tags-info.yaml +++ b/bitnami/postgresql-repmgr/14/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "14" - 14-debian-11 -- 14.9.0 +- 14.10.0 diff --git a/bitnami/postgresql-repmgr/15/debian-11/Dockerfile b/bitnami/postgresql-repmgr/15/debian-11/Dockerfile index acb1e1f2fbf87..63aa9985276e8 100644 --- a/bitnami/postgresql-repmgr/15/debian-11/Dockerfile +++ b/bitnami/postgresql-repmgr/15/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-13T02:01:55Z" \ + org.opencontainers.image.created="2023-11-30T19:50:42Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="15.4.0-debian-11-r51" \ + org.opencontainers.image.ref.name="15.5.0-debian-11-r10" \ org.opencontainers.image.title="postgresql-repmgr" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="15.4.0" + org.opencontainers.image.version="15.5.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbsd0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 locales procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "postgresql-repmgr-15.4.0-7-linux-${OS_ARCH}-debian-11" \ - ) && \ + "postgresql-repmgr-15.5.0-10-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -50,7 +50,7 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen COPY rootfs / RUN /opt/bitnami/scripts/postgresql-repmgr/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh -ENV APP_VERSION="15.4.0" \ +ENV APP_VERSION="15.5.0" \ BITNAMI_APP_NAME="postgresql-repmgr" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ diff --git a/bitnami/postgresql-repmgr/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql-repmgr/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index f4b862e7a727c..1c40e92e62624 100644 --- a/bitnami/postgresql-repmgr/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/postgresql-repmgr/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "15.4.0-7" + "version": "15.5.0-10" } } \ No newline at end of file diff --git a/bitnami/postgresql-repmgr/15/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/postgresql-repmgr/15/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/postgresql-repmgr/15/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/postgresql-repmgr/15/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/postgresql-repmgr/15/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/postgresql-repmgr/15/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/postgresql-repmgr/15/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/postgresql-repmgr/15/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/postgresql-repmgr/15/debian-11/tags-info.yaml b/bitnami/postgresql-repmgr/15/debian-11/tags-info.yaml index 563edf6e24881..62105fc239b4a 100644 --- a/bitnami/postgresql-repmgr/15/debian-11/tags-info.yaml +++ b/bitnami/postgresql-repmgr/15/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "15" - 15-debian-11 -- 15.4.0 +- 15.5.0 diff --git a/bitnami/postgresql-repmgr/16/debian-11/Dockerfile b/bitnami/postgresql-repmgr/16/debian-11/Dockerfile index 76175b2dc4582..bc676f259bcb0 100644 --- a/bitnami/postgresql-repmgr/16/debian-11/Dockerfile +++ b/bitnami/postgresql-repmgr/16/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-13T01:23:51Z" \ + org.opencontainers.image.created="2023-11-30T20:59:23Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="16.0.0-debian-11-r11" \ + org.opencontainers.image.ref.name="16.1.0-debian-11-r11" \ org.opencontainers.image.title="postgresql-repmgr" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="16.0.0" + org.opencontainers.image.version="16.1.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbsd0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 locales procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "postgresql-repmgr-16.0.0-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "postgresql-repmgr-16.1.0-10-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -50,7 +50,7 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen COPY rootfs / RUN /opt/bitnami/scripts/postgresql-repmgr/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh -ENV APP_VERSION="16.0.0" \ +ENV APP_VERSION="16.1.0" \ BITNAMI_APP_NAME="postgresql-repmgr" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ diff --git a/bitnami/postgresql-repmgr/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql-repmgr/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 7582c640cfb1e..23b2af3cb09f3 100644 --- a/bitnami/postgresql-repmgr/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/postgresql-repmgr/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.0.0-3" + "version": "16.1.0-10" } } \ No newline at end of file diff --git a/bitnami/postgresql-repmgr/16/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/postgresql-repmgr/16/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/postgresql-repmgr/16/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/postgresql-repmgr/16/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/postgresql-repmgr/16/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/postgresql-repmgr/16/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/postgresql-repmgr/16/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/postgresql-repmgr/16/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/postgresql-repmgr/16/debian-11/tags-info.yaml b/bitnami/postgresql-repmgr/16/debian-11/tags-info.yaml index d17a071db1830..04d65fc0aa5b3 100644 --- a/bitnami/postgresql-repmgr/16/debian-11/tags-info.yaml +++ b/bitnami/postgresql-repmgr/16/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "16" - 16-debian-11 -- 16.0.0 +- 16.1.0 - latest diff --git a/bitnami/postgresql-repmgr/README.md b/bitnami/postgresql-repmgr/README.md index 6667340a1f3ca..e30ab2ccf8ab6 100644 --- a/bitnami/postgresql-repmgr/README.md +++ b/bitnami/postgresql-repmgr/README.md @@ -1,4 +1,4 @@ -# PostgreSQL HA packaged by Bitnami +# Bitnami package for PostgreSQL HA ## What is PostgreSQL HA? @@ -27,7 +27,7 @@ You can find the default credentials and available configuration options in the * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. @@ -595,6 +595,11 @@ Please see the list of environment variables available in the Bitnami PostgreSQL | POSTGRESQL_TLS_CA_FILE | `nil` | | POSTGRESQL_TLS_CRL_FILE | `nil` | | POSTGRESQL_TLS_PREFER_SERVER_CIPHERS | `yes` | +| POSTGRESQL_MAX_CONNECTIONS | `100` | +| POSTGRESQL_TCP_KEEPALIVES_IDLE | `0` | +| POSTGRESQL_TCP_KEEPALIVES_INTERVAL | `0` | +| POSTGRESQL_TCP_KEEPALIVES_COUNT | `0` | +| POSTGRESQL_STATEMENT_TIMEOUT | `0` | ## Logging diff --git a/bitnami/postgresql/11/debian-11/Dockerfile b/bitnami/postgresql/11/debian-11/Dockerfile deleted file mode 100644 index 775d53cfabcfb..0000000000000 --- a/bitnami/postgresql/11/debian-11/Dockerfile +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -FROM docker.io/bitnami/minideb:bullseye - -ARG EXTRA_LOCALES -ARG TARGETARCH -ARG WITH_ALL_LOCALES="no" - -LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ - org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-13T00:46:28Z" \ - org.opencontainers.image.description="Application packaged by VMware, Inc" \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="11.21.0-debian-11-r58" \ - org.opencontainers.image.title="postgresql" \ - org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="11.21.0" - -ENV HOME="/" \ - OS_ARCH="${TARGETARCH:-amd64}" \ - OS_FLAVOUR="debian-11" \ - OS_NAME="linux" - -COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] -# Install required system packages and dependencies -RUN install_packages ca-certificates curl libbsd0 libbz2-1.0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libncurses6 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 libzstd1 locales procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - COMPONENTS=( \ - "postgresql-11.21.0-9-linux-${OS_ARCH}-debian-11" \ - ) && \ - for COMPONENT in "${COMPONENTS[@]}"; do \ - if [ ! -f "${COMPONENT}.tar.gz" ]; then \ - curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ - curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ - done -RUN apt-get autoremove --purge -y curl && \ - apt-get update && apt-get upgrade -y && \ - apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives -RUN chmod g+rwX /opt/bitnami -RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8 -RUN update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX && \ - DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales -RUN echo 'en_GB.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen -RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen - -COPY rootfs / -RUN /opt/bitnami/scripts/postgresql/postunpack.sh -RUN /opt/bitnami/scripts/locales/add-extra-locales.sh -ENV APP_VERSION="11.21.0" \ - BITNAMI_APP_NAME="postgresql" \ - LANG="en_US.UTF-8" \ - LANGUAGE="en_US:en" \ - NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \ - PATH="/opt/bitnami/postgresql/bin:$PATH" - -VOLUME [ "/bitnami/postgresql", "/docker-entrypoint-initdb.d", "/docker-entrypoint-preinitdb.d" ] - -EXPOSE 5432 - -USER 1001 -ENTRYPOINT [ "/opt/bitnami/scripts/postgresql/entrypoint.sh" ] -CMD [ "/opt/bitnami/scripts/postgresql/run.sh" ] diff --git a/bitnami/postgresql/11/debian-11/docker-compose.yml b/bitnami/postgresql/11/debian-11/docker-compose.yml deleted file mode 100644 index c5dd014af645d..0000000000000 --- a/bitnami/postgresql/11/debian-11/docker-compose.yml +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -version: '2' - -services: - postgresql: - image: docker.io/bitnami/postgresql:11 - ports: - - '5432:5432' - volumes: - - 'postgresql_data:/bitnami/postgresql' - environment: - - 'ALLOW_EMPTY_PASSWORD=yes' - -volumes: - postgresql_data: - driver: local diff --git a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh deleted file mode 100644 index 184de8a117e28..0000000000000 --- a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Bitnami custom library - -# shellcheck disable=SC1091 - -# Load Generic Libraries -. /opt/bitnami/scripts/liblog.sh - -# Constants -BOLD='\033[1m' - -# Functions - -######################## -# Print the welcome page -# Globals: -# DISABLE_WELCOME_MESSAGE -# BITNAMI_APP_NAME -# Arguments: -# None -# Returns: -# None -######################### -print_welcome_page() { - if [[ -z "${DISABLE_WELCOME_MESSAGE:-}" ]]; then - if [[ -n "$BITNAMI_APP_NAME" ]]; then - print_image_welcome_page - fi - fi -} - -######################## -# Print the welcome page for a Bitnami Docker image -# Globals: -# BITNAMI_APP_NAME -# Arguments: -# None -# Returns: -# None -######################### -print_image_welcome_page() { - local github_url="https://github.com/bitnami/containers" - - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" -} - diff --git a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh deleted file mode 100644 index 63759c777f3ba..0000000000000 --- a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh +++ /dev/null @@ -1,141 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Library for managing files - -# shellcheck disable=SC1091 - -# Load Generic Libraries -. /opt/bitnami/scripts/libos.sh - -# Functions - -######################## -# Replace a regex-matching string in a file -# Arguments: -# $1 - filename -# $2 - match regex -# $3 - substitute regex -# $4 - use POSIX regex. Default: true -# Returns: -# None -######################### -replace_in_file() { - local filename="${1:?filename is required}" - local match_regex="${2:?match regex is required}" - local substitute_regex="${3:?substitute regex is required}" - local posix_regex=${4:-true} - - local result - - # We should avoid using 'sed in-place' substitutions - # 1) They are not compatible with files mounted from ConfigMap(s) - # 2) We found incompatibility issues with Debian10 and "in-place" substitutions - local -r del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues - if [[ $posix_regex = true ]]; then - result="$(sed -E "s${del}${match_regex}${del}${substitute_regex}${del}g" "$filename")" - else - result="$(sed "s${del}${match_regex}${del}${substitute_regex}${del}g" "$filename")" - fi - echo "$result" > "$filename" -} - -######################## -# Replace a regex-matching multiline string in a file -# Arguments: -# $1 - filename -# $2 - match regex -# $3 - substitute regex -# Returns: -# None -######################### -replace_in_file_multiline() { - local filename="${1:?filename is required}" - local match_regex="${2:?match regex is required}" - local substitute_regex="${3:?substitute regex is required}" - - local result - local -r del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues - result="$(perl -pe "BEGIN{undef $/;} s${del}${match_regex}${del}${substitute_regex}${del}sg" "$filename")" - echo "$result" > "$filename" -} - -######################## -# Remove a line in a file based on a regex -# Arguments: -# $1 - filename -# $2 - match regex -# $3 - use POSIX regex. Default: true -# Returns: -# None -######################### -remove_in_file() { - local filename="${1:?filename is required}" - local match_regex="${2:?match regex is required}" - local posix_regex=${3:-true} - local result - - # We should avoid using 'sed in-place' substitutions - # 1) They are not compatible with files mounted from ConfigMap(s) - # 2) We found incompatibility issues with Debian10 and "in-place" substitutions - if [[ $posix_regex = true ]]; then - result="$(sed -E "/$match_regex/d" "$filename")" - else - result="$(sed "/$match_regex/d" "$filename")" - fi - echo "$result" > "$filename" -} - -######################## -# Appends text after the last line matching a pattern -# Arguments: -# $1 - file -# $2 - match regex -# $3 - contents to add -# Returns: -# None -######################### -append_file_after_last_match() { - local file="${1:?missing file}" - local match_regex="${2:?missing pattern}" - local value="${3:?missing value}" - - # We read the file in reverse, replace the first match (0,/pattern/s) and then reverse the results again - result="$(tac "$file" | sed -E "0,/($match_regex)/s||${value}\n\1|" | tac)" - echo "$result" > "$file" -} - -######################## -# Wait until certain entry is present in a log file -# Arguments: -# $1 - entry to look for -# $2 - log file -# $3 - max retries. Default: 12 -# $4 - sleep between retries (in seconds). Default: 5 -# Returns: -# Boolean -######################### -wait_for_log_entry() { - local -r entry="${1:-missing entry}" - local -r log_file="${2:-missing log file}" - local -r retries="${3:-12}" - local -r interval_time="${4:-5}" - local attempt=0 - - check_log_file_for_entry() { - if ! grep -qE "$entry" "$log_file"; then - debug "Entry \"${entry}\" still not present in ${log_file} (attempt $((++attempt))/${retries})" - return 1 - fi - } - debug "Checking that ${log_file} log file contains entry \"${entry}\"" - if retry_while check_log_file_for_entry "$retries" "$interval_time"; then - debug "Found entry \"${entry}\" in ${log_file}" - true - else - error "Could not find entry \"${entry}\" in ${log_file} after ${retries} retries" - debug_execute cat "$log_file" - return 1 - fi -} diff --git a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh deleted file mode 100644 index 96b22f99710c7..0000000000000 --- a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh +++ /dev/null @@ -1,193 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Library for file system actions - -# shellcheck disable=SC1091 - -# Load Generic Libraries -. /opt/bitnami/scripts/liblog.sh - -# Functions - -######################## -# Ensure a file/directory is owned (user and group) but the given user -# Arguments: -# $1 - filepath -# $2 - owner -# Returns: -# None -######################### -owned_by() { - local path="${1:?path is missing}" - local owner="${2:?owner is missing}" - local group="${3:-}" - - if [[ -n $group ]]; then - chown "$owner":"$group" "$path" - else - chown "$owner":"$owner" "$path" - fi -} - -######################## -# Ensure a directory exists and, optionally, is owned by the given user -# Arguments: -# $1 - directory -# $2 - owner -# Returns: -# None -######################### -ensure_dir_exists() { - local dir="${1:?directory is missing}" - local owner_user="${2:-}" - local owner_group="${3:-}" - - [ -d "${dir}" ] || mkdir -p "${dir}" - if [[ -n $owner_user ]]; then - owned_by "$dir" "$owner_user" "$owner_group" - fi -} - -######################## -# Checks whether a directory is empty or not -# arguments: -# $1 - directory -# returns: -# boolean -######################### -is_dir_empty() { - local -r path="${1:?missing directory}" - # Calculate real path in order to avoid issues with symlinks - local -r dir="$(realpath "$path")" - if [[ ! -e "$dir" ]] || [[ -z "$(ls -A "$dir")" ]]; then - true - else - false - fi -} - -######################## -# Checks whether a mounted directory is empty or not -# arguments: -# $1 - directory -# returns: -# boolean -######################### -is_mounted_dir_empty() { - local dir="${1:?missing directory}" - - if is_dir_empty "$dir" || find "$dir" -mindepth 1 -maxdepth 1 -not -name ".snapshot" -not -name "lost+found" -exec false {} +; then - true - else - false - fi -} - -######################## -# Checks whether a file can be written to or not -# arguments: -# $1 - file -# returns: -# boolean -######################### -is_file_writable() { - local file="${1:?missing file}" - local dir - dir="$(dirname "$file")" - - if [[ (-f "$file" && -w "$file") || (! -f "$file" && -d "$dir" && -w "$dir") ]]; then - true - else - false - fi -} - -######################## -# Relativize a path -# arguments: -# $1 - path -# $2 - base -# returns: -# None -######################### -relativize() { - local -r path="${1:?missing path}" - local -r base="${2:?missing base}" - pushd "$base" >/dev/null || exit - realpath -q --no-symlinks --relative-base="$base" "$path" | sed -e 's|^/$|.|' -e 's|^/||' - popd >/dev/null || exit -} - -######################## -# Configure permisions and ownership recursively -# Globals: -# None -# Arguments: -# $1 - paths (as a string). -# Flags: -# -f|--file-mode - mode for directories. -# -d|--dir-mode - mode for files. -# -u|--user - user -# -g|--group - group -# Returns: -# None -######################### -configure_permissions_ownership() { - local -r paths="${1:?paths is missing}" - local dir_mode="" - local file_mode="" - local user="" - local group="" - - # Validate arguments - shift 1 - while [ "$#" -gt 0 ]; do - case "$1" in - -f | --file-mode) - shift - file_mode="${1:?missing mode for files}" - ;; - -d | --dir-mode) - shift - dir_mode="${1:?missing mode for directories}" - ;; - -u | --user) - shift - user="${1:?missing user}" - ;; - -g | --group) - shift - group="${1:?missing group}" - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - - read -r -a filepaths <<<"$paths" - for p in "${filepaths[@]}"; do - if [[ -e "$p" ]]; then - find -L "$p" -printf "" - if [[ -n $dir_mode ]]; then - find -L "$p" -type d ! -perm "$dir_mode" -print0 | xargs -r -0 chmod "$dir_mode" - fi - if [[ -n $file_mode ]]; then - find -L "$p" -type f ! -perm "$file_mode" -print0 | xargs -r -0 chmod "$file_mode" - fi - if [[ -n $user ]] && [[ -n $group ]]; then - find -L "$p" -print0 | xargs -r -0 chown "${user}:${group}" - elif [[ -n $user ]] && [[ -z $group ]]; then - find -L "$p" -print0 | xargs -r -0 chown "${user}" - elif [[ -z $user ]] && [[ -n $group ]]; then - find -L "$p" -print0 | xargs -r -0 chgrp "${group}" - fi - else - stderr_print "$p does not exist" - fi - done -} diff --git a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh b/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh deleted file mode 100644 index dadd06149e00e..0000000000000 --- a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Library to use for scripts expected to be used as Kubernetes lifecycle hooks - -# shellcheck disable=SC1091 - -# Load generic libraries -. /opt/bitnami/scripts/liblog.sh -. /opt/bitnami/scripts/libos.sh - -# Override functions that log to stdout/stderr of the current process, so they print to process 1 -for function_to_override in stderr_print debug_execute; do - # Output is sent to output of process 1 and thus end up in the container log - # The hook output in general isn't saved - eval "$(declare -f "$function_to_override") >/proc/1/fd/1 2>/proc/1/fd/2" -done diff --git a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh deleted file mode 100644 index 2a9e76a4d7256..0000000000000 --- a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Library for logging functions - -# Constants -RESET='\033[0m' -RED='\033[38;5;1m' -GREEN='\033[38;5;2m' -YELLOW='\033[38;5;3m' -MAGENTA='\033[38;5;5m' -CYAN='\033[38;5;6m' - -# Functions - -######################## -# Print to STDERR -# Arguments: -# Message to print -# Returns: -# None -######################### -stderr_print() { - # 'is_boolean_yes' is defined in libvalidations.sh, but depends on this file so we cannot source it - local bool="${BITNAMI_QUIET:-false}" - # comparison is performed without regard to the case of alphabetic characters - shopt -s nocasematch - if ! [[ "$bool" = 1 || "$bool" =~ ^(yes|true)$ ]]; then - printf "%b\\n" "${*}" >&2 - fi -} - -######################## -# Log message -# Arguments: -# Message to log -# Returns: -# None -######################### -log() { - stderr_print "${CYAN}${MODULE:-} ${MAGENTA}$(date "+%T.%2N ")${RESET}${*}" -} -######################## -# Log an 'info' message -# Arguments: -# Message to log -# Returns: -# None -######################### -info() { - log "${GREEN}INFO ${RESET} ==> ${*}" -} -######################## -# Log message -# Arguments: -# Message to log -# Returns: -# None -######################### -warn() { - log "${YELLOW}WARN ${RESET} ==> ${*}" -} -######################## -# Log an 'error' message -# Arguments: -# Message to log -# Returns: -# None -######################### -error() { - log "${RED}ERROR${RESET} ==> ${*}" -} -######################## -# Log a 'debug' message -# Globals: -# BITNAMI_DEBUG -# Arguments: -# None -# Returns: -# None -######################### -debug() { - # 'is_boolean_yes' is defined in libvalidations.sh, but depends on this file so we cannot source it - local bool="${BITNAMI_DEBUG:-false}" - # comparison is performed without regard to the case of alphabetic characters - shopt -s nocasematch - if [[ "$bool" = 1 || "$bool" =~ ^(yes|true)$ ]]; then - log "${MAGENTA}DEBUG${RESET} ==> ${*}" - fi -} - -######################## -# Indent a string -# Arguments: -# $1 - string -# $2 - number of indentation characters (default: 4) -# $3 - indentation character (default: " ") -# Returns: -# None -######################### -indent() { - local string="${1:-}" - local num="${2:?missing num}" - local char="${3:-" "}" - # Build the indentation unit string - local indent_unit="" - for ((i = 0; i < num; i++)); do - indent_unit="${indent_unit}${char}" - done - # shellcheck disable=SC2001 - # Complex regex, see https://github.com/koalaman/shellcheck/wiki/SC2001#exceptions - echo "$string" | sed "s/^/${indent_unit}/" -} diff --git a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh deleted file mode 100644 index b47c69a568250..0000000000000 --- a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh +++ /dev/null @@ -1,165 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Library for network functions - -# shellcheck disable=SC1091 - -# Load Generic Libraries -. /opt/bitnami/scripts/liblog.sh - -# Functions - -######################## -# Resolve IP address for a host/domain (i.e. DNS lookup) -# Arguments: -# $1 - Hostname to resolve -# $2 - IP address version (v4, v6), leave empty for resolving to any version -# Returns: -# IP -######################### -dns_lookup() { - local host="${1:?host is missing}" - local ip_version="${2:-}" - getent "ahosts${ip_version}" "$host" | awk '/STREAM/ {print $1 }' | head -n 1 -} - -######################### -# Wait for a hostname and return the IP -# Arguments: -# $1 - hostname -# $2 - number of retries -# $3 - seconds to wait between retries -# Returns: -# - IP address that corresponds to the hostname -######################### -wait_for_dns_lookup() { - local hostname="${1:?hostname is missing}" - local retries="${2:-5}" - local seconds="${3:-1}" - check_host() { - if [[ $(dns_lookup "$hostname") == "" ]]; then - false - else - true - fi - } - # Wait for the host to be ready - retry_while "check_host ${hostname}" "$retries" "$seconds" - dns_lookup "$hostname" -} - -######################## -# Get machine's IP -# Arguments: -# None -# Returns: -# Machine IP -######################### -get_machine_ip() { - local -a ip_addresses - local hostname - hostname="$(hostname)" - read -r -a ip_addresses <<< "$(dns_lookup "$hostname" | xargs echo)" - if [[ "${#ip_addresses[@]}" -gt 1 ]]; then - warn "Found more than one IP address associated to hostname ${hostname}: ${ip_addresses[*]}, will use ${ip_addresses[0]}" - elif [[ "${#ip_addresses[@]}" -lt 1 ]]; then - error "Could not find any IP address associated to hostname ${hostname}" - exit 1 - fi - echo "${ip_addresses[0]}" -} - -######################## -# Check if the provided argument is a resolved hostname -# Arguments: -# $1 - Value to check -# Returns: -# Boolean -######################### -is_hostname_resolved() { - local -r host="${1:?missing value}" - if [[ -n "$(dns_lookup "$host")" ]]; then - true - else - false - fi -} - -######################## -# Parse URL -# Globals: -# None -# Arguments: -# $1 - uri - String -# $2 - component to obtain. Valid options (scheme, authority, userinfo, host, port, path, query or fragment) - String -# Returns: -# String -parse_uri() { - local uri="${1:?uri is missing}" - local component="${2:?component is missing}" - - # Solution based on https://tools.ietf.org/html/rfc3986#appendix-B with - # additional sub-expressions to split authority into userinfo, host and port - # Credits to Patryk Obara (see https://stackoverflow.com/a/45977232/6694969) - local -r URI_REGEX='^(([^:/?#]+):)?(//((([^@/?#]+)@)?([^:/?#]+)(:([0-9]+))?))?(/([^?#]*))?(\?([^#]*))?(#(.*))?' - # || | ||| | | | | | | | | | - # |2 scheme | ||6 userinfo 7 host | 9 port | 11 rpath | 13 query | 15 fragment - # 1 scheme: | |5 userinfo@ 8 :... 10 path 12 ?... 14 #... - # | 4 authority - # 3 //... - local index=0 - case "$component" in - scheme) - index=2 - ;; - authority) - index=4 - ;; - userinfo) - index=6 - ;; - host) - index=7 - ;; - port) - index=9 - ;; - path) - index=10 - ;; - query) - index=13 - ;; - fragment) - index=14 - ;; - *) - stderr_print "unrecognized component $component" - return 1 - ;; - esac - [[ "$uri" =~ $URI_REGEX ]] && echo "${BASH_REMATCH[${index}]}" -} - -######################## -# Wait for a HTTP connection to succeed -# Globals: -# * -# Arguments: -# $1 - URL to wait for -# $2 - Maximum amount of retries (optional) -# $3 - Time between retries (optional) -# Returns: -# true if the HTTP connection succeeded, false otherwise -######################### -wait_for_http_connection() { - local url="${1:?missing url}" - local retries="${2:-}" - local sleep_time="${3:-}" - if ! retry_while "debug_execute curl --silent ${url}" "$retries" "$sleep_time"; then - error "Could not connect to ${url}" - return 1 - fi -} diff --git a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh deleted file mode 100644 index c0500acee78d9..0000000000000 --- a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ /dev/null @@ -1,657 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Library for operating system actions - -# shellcheck disable=SC1091 - -# Load Generic Libraries -. /opt/bitnami/scripts/liblog.sh -. /opt/bitnami/scripts/libfs.sh -. /opt/bitnami/scripts/libvalidations.sh - -# Functions - -######################## -# Check if an user exists in the system -# Arguments: -# $1 - user -# Returns: -# Boolean -######################### -user_exists() { - local user="${1:?user is missing}" - id "$user" >/dev/null 2>&1 -} - -######################## -# Check if a group exists in the system -# Arguments: -# $1 - group -# Returns: -# Boolean -######################### -group_exists() { - local group="${1:?group is missing}" - getent group "$group" >/dev/null 2>&1 -} - -######################## -# Create a group in the system if it does not exist already -# Arguments: -# $1 - group -# Flags: -# -i|--gid - the ID for the new group -# -s|--system - Whether to create new user as system user (uid <= 999) -# Returns: -# None -######################### -ensure_group_exists() { - local group="${1:?group is missing}" - local gid="" - local is_system_user=false - - # Validate arguments - shift 1 - while [ "$#" -gt 0 ]; do - case "$1" in - -i | --gid) - shift - gid="${1:?missing gid}" - ;; - -s | --system) - is_system_user=true - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - - if ! group_exists "$group"; then - local -a args=("$group") - if [[ -n "$gid" ]]; then - if group_exists "$gid"; then - error "The GID $gid is already in use." >&2 - return 1 - fi - args+=("--gid" "$gid") - fi - $is_system_user && args+=("--system") - groupadd "${args[@]}" >/dev/null 2>&1 - fi -} - -######################## -# Create an user in the system if it does not exist already -# Arguments: -# $1 - user -# Flags: -# -i|--uid - the ID for the new user -# -g|--group - the group the new user should belong to -# -a|--append-groups - comma-separated list of supplemental groups to append to the new user -# -h|--home - the home directory for the new user -# -s|--system - whether to create new user as system user (uid <= 999) -# Returns: -# None -######################### -ensure_user_exists() { - local user="${1:?user is missing}" - local uid="" - local group="" - local append_groups="" - local home="" - local is_system_user=false - - # Validate arguments - shift 1 - while [ "$#" -gt 0 ]; do - case "$1" in - -i | --uid) - shift - uid="${1:?missing uid}" - ;; - -g | --group) - shift - group="${1:?missing group}" - ;; - -a | --append-groups) - shift - append_groups="${1:?missing append_groups}" - ;; - -h | --home) - shift - home="${1:?missing home directory}" - ;; - -s | --system) - is_system_user=true - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - - if ! user_exists "$user"; then - local -a user_args=("-N" "$user") - if [[ -n "$uid" ]]; then - if user_exists "$uid"; then - error "The UID $uid is already in use." - return 1 - fi - user_args+=("--uid" "$uid") - else - $is_system_user && user_args+=("--system") - fi - useradd "${user_args[@]}" >/dev/null 2>&1 - fi - - if [[ -n "$group" ]]; then - local -a group_args=("$group") - $is_system_user && group_args+=("--system") - ensure_group_exists "${group_args[@]}" - usermod -g "$group" "$user" >/dev/null 2>&1 - fi - - if [[ -n "$append_groups" ]]; then - local -a groups - read -ra groups <<<"$(tr ',;' ' ' <<<"$append_groups")" - for group in "${groups[@]}"; do - ensure_group_exists "$group" - usermod -aG "$group" "$user" >/dev/null 2>&1 - done - fi - - if [[ -n "$home" ]]; then - mkdir -p "$home" - usermod -d "$home" "$user" >/dev/null 2>&1 - configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" - fi -} - -######################## -# Check if the script is currently running as root -# Arguments: -# $1 - user -# $2 - group -# Returns: -# Boolean -######################### -am_i_root() { - if [[ "$(id -u)" = "0" ]]; then - true - else - false - fi -} - -######################## -# Print OS metadata -# Arguments: -# $1 - Flag name -# Flags: -# --id - Distro ID -# --version - Distro version -# --branch - Distro branch -# --codename - Distro codename -# --name - Distro name -# --pretty-name - Distro pretty name -# Returns: -# String -######################### -get_os_metadata() { - local -r flag_name="${1:?missing flag}" - # Helper function - get_os_release_metadata() { - local -r env_name="${1:?missing environment variable name}" - ( - . /etc/os-release - echo "${!env_name}" - ) - } - case "$flag_name" in - --id) - get_os_release_metadata ID - ;; - --version) - get_os_release_metadata VERSION_ID - ;; - --branch) - get_os_release_metadata VERSION_ID | sed 's/\..*//' - ;; - --codename) - get_os_release_metadata VERSION_CODENAME - ;; - --name) - get_os_release_metadata NAME - ;; - --pretty-name) - get_os_release_metadata PRETTY_NAME - ;; - *) - error "Unknown flag ${flag_name}" - return 1 - ;; - esac -} - -######################## -# Get total memory available -# Arguments: -# None -# Returns: -# Memory in bytes -######################### -get_total_memory() { - echo $(($(grep MemTotal /proc/meminfo | awk '{print $2}') / 1024)) -} - -######################## -# Get machine size depending on specified memory -# Globals: -# None -# Arguments: -# None -# Flags: -# --memory - memory size (optional) -# Returns: -# Detected instance size -######################### -get_machine_size() { - local memory="" - # Validate arguments - while [[ "$#" -gt 0 ]]; do - case "$1" in - --memory) - shift - memory="${1:?missing memory}" - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - if [[ -z "$memory" ]]; then - debug "Memory was not specified, detecting available memory automatically" - memory="$(get_total_memory)" - fi - sanitized_memory=$(convert_to_mb "$memory") - if [[ "$sanitized_memory" -gt 26000 ]]; then - echo 2xlarge - elif [[ "$sanitized_memory" -gt 13000 ]]; then - echo xlarge - elif [[ "$sanitized_memory" -gt 6000 ]]; then - echo large - elif [[ "$sanitized_memory" -gt 3000 ]]; then - echo medium - elif [[ "$sanitized_memory" -gt 1500 ]]; then - echo small - else - echo micro - fi -} - -######################## -# Get machine size depending on specified memory -# Globals: -# None -# Arguments: -# $1 - memory size (optional) -# Returns: -# Detected instance size -######################### -get_supported_machine_sizes() { - echo micro small medium large xlarge 2xlarge -} - -######################## -# Convert memory size from string to amount of megabytes (i.e. 2G -> 2048) -# Globals: -# None -# Arguments: -# $1 - memory size -# Returns: -# Result of the conversion -######################### -convert_to_mb() { - local amount="${1:-}" - if [[ $amount =~ ^([0-9]+)(m|M|g|G) ]]; then - size="${BASH_REMATCH[1]}" - unit="${BASH_REMATCH[2]}" - if [[ "$unit" = "g" || "$unit" = "G" ]]; then - amount="$((size * 1024))" - else - amount="$size" - fi - fi - echo "$amount" -} - -######################### -# Redirects output to /dev/null if debug mode is disabled -# Globals: -# BITNAMI_DEBUG -# Arguments: -# $@ - Command to execute -# Returns: -# None -######################### -debug_execute() { - if is_boolean_yes "${BITNAMI_DEBUG:-false}"; then - "$@" - else - "$@" >/dev/null 2>&1 - fi -} - -######################## -# Retries a command a given number of times -# Arguments: -# $1 - cmd (as a string) -# $2 - max retries. Default: 12 -# $3 - sleep between retries (in seconds). Default: 5 -# Returns: -# Boolean -######################### -retry_while() { - local cmd="${1:?cmd is missing}" - local retries="${2:-12}" - local sleep_time="${3:-5}" - local return_value=1 - - read -r -a command <<<"$cmd" - for ((i = 1; i <= retries; i += 1)); do - "${command[@]}" && return_value=0 && break - sleep "$sleep_time" - done - return $return_value -} - -######################## -# Generate a random string -# Arguments: -# -t|--type - String type (ascii, alphanumeric, numeric), defaults to ascii -# -c|--count - Number of characters, defaults to 32 -# Arguments: -# None -# Returns: -# None -# Returns: -# String -######################### -generate_random_string() { - local type="ascii" - local count="32" - local filter - local result - # Validate arguments - while [[ "$#" -gt 0 ]]; do - case "$1" in - -t | --type) - shift - type="$1" - ;; - -c | --count) - shift - count="$1" - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - # Validate type - case "$type" in - ascii) - filter="[:print:]" - ;; - numeric) - filter="0-9" - ;; - alphanumeric) - filter="a-zA-Z0-9" - ;; - alphanumeric+special|special+alphanumeric) - # Limit variety of special characters, so there is a higher chance of containing more alphanumeric characters - # Special characters are harder to write, and it could impact the overall UX if most passwords are too complex - filter='a-zA-Z0-9:@.,/+!=' - ;; - *) - echo "Invalid type ${type}" >&2 - return 1 - ;; - esac - # Obtain count + 10 lines from /dev/urandom to ensure that the resulting string has the expected size - # Note there is a very small chance of strings starting with EOL character - # Therefore, the higher amount of lines read, this will happen less frequently - result="$(head -n "$((count + 10))" /dev/urandom | tr -dc "$filter" | head -c "$count")" - echo "$result" -} - -######################## -# Create md5 hash from a string -# Arguments: -# $1 - string -# Returns: -# md5 hash - string -######################### -generate_md5_hash() { - local -r str="${1:?missing input string}" - echo -n "$str" | md5sum | awk '{print $1}' -} - -######################## -# Create sha1 hash from a string -# Arguments: -# $1 - string -# $2 - algorithm - 1 (default), 224, 256, 384, 512 -# Returns: -# sha1 hash - string -######################### -generate_sha_hash() { - local -r str="${1:?missing input string}" - local -r algorithm="${2:-1}" - echo -n "$str" | "sha${algorithm}sum" | awk '{print $1}' -} - -######################## -# Converts a string to its hexadecimal representation -# Arguments: -# $1 - string -# Returns: -# hexadecimal representation of the string -######################### -convert_to_hex() { - local -r str=${1:?missing input string} - local -i iterator - local char - for ((iterator = 0; iterator < ${#str}; iterator++)); do - char=${str:iterator:1} - printf '%x' "'${char}" - done -} - -######################## -# Get boot time -# Globals: -# None -# Arguments: -# None -# Returns: -# Boot time metadata -######################### -get_boot_time() { - stat /proc --format=%Y -} - -######################## -# Get machine ID -# Globals: -# None -# Arguments: -# None -# Returns: -# Machine ID -######################### -get_machine_id() { - local machine_id - if [[ -f /etc/machine-id ]]; then - machine_id="$(cat /etc/machine-id)" - fi - if [[ -z "$machine_id" ]]; then - # Fallback to the boot-time, which will at least ensure a unique ID in the current session - machine_id="$(get_boot_time)" - fi - echo "$machine_id" -} - -######################## -# Get the root partition's disk device ID (e.g. /dev/sda1) -# Globals: -# None -# Arguments: -# None -# Returns: -# Root partition disk ID -######################### -get_disk_device_id() { - local device_id="" - if grep -q ^/dev /proc/mounts; then - device_id="$(grep ^/dev /proc/mounts | awk '$2 == "/" { print $1 }' | tail -1)" - fi - # If it could not be autodetected, fallback to /dev/sda1 as a default - if [[ -z "$device_id" || ! -b "$device_id" ]]; then - device_id="/dev/sda1" - fi - echo "$device_id" -} - -######################## -# Get the root disk device ID (e.g. /dev/sda) -# Globals: -# None -# Arguments: -# None -# Returns: -# Root disk ID -######################### -get_root_disk_device_id() { - get_disk_device_id | sed -E 's/p?[0-9]+$//' -} - -######################## -# Get the root disk size in bytes -# Globals: -# None -# Arguments: -# None -# Returns: -# Root disk size in bytes -######################### -get_root_disk_size() { - fdisk -l "$(get_root_disk_device_id)" | grep 'Disk.*bytes' | sed -E 's/.*, ([0-9]+) bytes,.*/\1/' || true -} - -######################## -# Run command as a specific user and group (optional) -# Arguments: -# $1 - USER(:GROUP) to switch to -# $2..$n - command to execute -# Returns: -# Exit code of the specified command -######################### -run_as_user() { - run_chroot "$@" -} - -######################## -# Execute command as a specific user and group (optional), -# replacing the current process image -# Arguments: -# $1 - USER(:GROUP) to switch to -# $2..$n - command to execute -# Returns: -# Exit code of the specified command -######################### -exec_as_user() { - run_chroot --replace-process "$@" -} - -######################## -# Run a command using chroot -# Arguments: -# $1 - USER(:GROUP) to switch to -# $2..$n - command to execute -# Flags: -# -r | --replace-process - Replace the current process image (optional) -# Returns: -# Exit code of the specified command -######################### -run_chroot() { - local userspec - local user - local homedir - local replace=false - local -r cwd="$(pwd)" - - # Parse and validate flags - while [[ "$#" -gt 0 ]]; do - case "$1" in - -r | --replace-process) - replace=true - ;; - --) - shift - break - ;; - -*) - stderr_print "unrecognized flag $1" - return 1 - ;; - *) - break - ;; - esac - shift - done - - # Parse and validate arguments - if [[ "$#" -lt 2 ]]; then - echo "expected at least 2 arguments" - return 1 - else - userspec=$1 - shift - - # userspec can optionally include the group, so we parse the user - user=$(echo "$userspec" | cut -d':' -f1) - fi - - if ! am_i_root; then - error "Could not switch to '${userspec}': Operation not permitted" - return 1 - fi - - # Get the HOME directory for the user to switch, as chroot does - # not properly update this env and some scripts rely on it - homedir=$(eval echo "~${user}") - if [[ ! -d $homedir ]]; then - homedir="${HOME:-/}" - fi - - # Obtaining value for "$@" indirectly in order to properly support shell parameter expansion - if [[ "$replace" = true ]]; then - exec chroot --userspec="$userspec" / bash -c "cd ${cwd}; export HOME=${homedir}; exec \"\$@\"" -- "$@" - else - chroot --userspec="$userspec" / bash -c "cd ${cwd}; export HOME=${homedir}; exec \"\$@\"" -- "$@" - fi -} diff --git a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh deleted file mode 100644 index af6af64d6dd08..0000000000000 --- a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Bitnami persistence library -# Used for bringing persistence capabilities to applications that don't have clear separation of data and logic - -# shellcheck disable=SC1091 - -# Load Generic Libraries -. /opt/bitnami/scripts/libfs.sh -. /opt/bitnami/scripts/libos.sh -. /opt/bitnami/scripts/liblog.sh -. /opt/bitnami/scripts/libversion.sh - -# Functions - -######################## -# Persist an application directory -# Globals: -# BITNAMI_ROOT_DIR -# BITNAMI_VOLUME_DIR -# Arguments: -# $1 - App folder name -# $2 - List of app files to persist -# Returns: -# true if all steps succeeded, false otherwise -######################### -persist_app() { - local -r app="${1:?missing app}" - local -a files_to_restore - read -r -a files_to_persist <<< "$(tr ',;:' ' ' <<< "$2")" - local -r install_dir="${BITNAMI_ROOT_DIR}/${app}" - local -r persist_dir="${BITNAMI_VOLUME_DIR}/${app}" - # Persist the individual files - if [[ "${#files_to_persist[@]}" -le 0 ]]; then - warn "No files are configured to be persisted" - return - fi - pushd "$install_dir" >/dev/null || exit - local file_to_persist_relative file_to_persist_destination file_to_persist_destination_folder - local -r tmp_file="/tmp/perms.acl" - for file_to_persist in "${files_to_persist[@]}"; do - if [[ ! -f "$file_to_persist" && ! -d "$file_to_persist" ]]; then - error "Cannot persist '${file_to_persist}' because it does not exist" - return 1 - fi - file_to_persist_relative="$(relativize "$file_to_persist" "$install_dir")" - file_to_persist_destination="${persist_dir}/${file_to_persist_relative}" - file_to_persist_destination_folder="$(dirname "$file_to_persist_destination")" - # Get original permissions for existing files, which will be applied later - # Exclude the root directory with 'sed', to avoid issues when copying the entirety of it to a volume - getfacl -R "$file_to_persist_relative" | sed -E '/# file: (\..+|[^.])/,$!d' > "$tmp_file" - # Copy directories to the volume - ensure_dir_exists "$file_to_persist_destination_folder" - cp -Lr --preserve=links "$file_to_persist_relative" "$file_to_persist_destination_folder" - # Restore permissions - pushd "$persist_dir" >/dev/null || exit - if am_i_root; then - setfacl --restore="$tmp_file" - else - # When running as non-root, don't change ownership - setfacl --restore=<(grep -E -v '^# (owner|group):' "$tmp_file") - fi - popd >/dev/null || exit - done - popd >/dev/null || exit - rm -f "$tmp_file" - # Install the persisted files into the installation directory, via symlinks - restore_persisted_app "$@" -} - -######################## -# Restore a persisted application directory -# Globals: -# BITNAMI_ROOT_DIR -# BITNAMI_VOLUME_DIR -# FORCE_MAJOR_UPGRADE -# Arguments: -# $1 - App folder name -# $2 - List of app files to restore -# Returns: -# true if all steps succeeded, false otherwise -######################### -restore_persisted_app() { - local -r app="${1:?missing app}" - local -a files_to_restore - read -r -a files_to_restore <<< "$(tr ',;:' ' ' <<< "$2")" - local -r install_dir="${BITNAMI_ROOT_DIR}/${app}" - local -r persist_dir="${BITNAMI_VOLUME_DIR}/${app}" - # Restore the individual persisted files - if [[ "${#files_to_restore[@]}" -le 0 ]]; then - warn "No persisted files are configured to be restored" - return - fi - local file_to_restore_relative file_to_restore_origin file_to_restore_destination - for file_to_restore in "${files_to_restore[@]}"; do - file_to_restore_relative="$(relativize "$file_to_restore" "$install_dir")" - # We use 'realpath --no-symlinks' to ensure that the case of '.' is covered and the directory is removed - file_to_restore_origin="$(realpath --no-symlinks "${install_dir}/${file_to_restore_relative}")" - file_to_restore_destination="$(realpath --no-symlinks "${persist_dir}/${file_to_restore_relative}")" - rm -rf "$file_to_restore_origin" - ln -sfn "$file_to_restore_destination" "$file_to_restore_origin" - done -} - -######################## -# Check if an application directory was already persisted -# Globals: -# BITNAMI_VOLUME_DIR -# Arguments: -# $1 - App folder name -# Returns: -# true if all steps succeeded, false otherwise -######################### -is_app_initialized() { - local -r app="${1:?missing app}" - local -r persist_dir="${BITNAMI_VOLUME_DIR}/${app}" - if ! is_mounted_dir_empty "$persist_dir"; then - true - else - false - fi -} diff --git a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh deleted file mode 100644 index 107f54e6b5c91..0000000000000 --- a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ /dev/null @@ -1,496 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Library for managing services - -# shellcheck disable=SC1091 - -# Load Generic Libraries -. /opt/bitnami/scripts/libvalidations.sh -. /opt/bitnami/scripts/liblog.sh - -# Functions - -######################## -# Read the provided pid file and returns a PID -# Arguments: -# $1 - Pid file -# Returns: -# PID -######################### -get_pid_from_file() { - local pid_file="${1:?pid file is missing}" - - if [[ -f "$pid_file" ]]; then - if [[ -n "$(< "$pid_file")" ]] && [[ "$(< "$pid_file")" -gt 0 ]]; then - echo "$(< "$pid_file")" - fi - fi -} - -######################## -# Check if a provided PID corresponds to a running service -# Arguments: -# $1 - PID -# Returns: -# Boolean -######################### -is_service_running() { - local pid="${1:?pid is missing}" - - kill -0 "$pid" 2>/dev/null -} - -######################## -# Stop a service by sending a termination signal to its pid -# Arguments: -# $1 - Pid file -# $2 - Signal number (optional) -# Returns: -# None -######################### -stop_service_using_pid() { - local pid_file="${1:?pid file is missing}" - local signal="${2:-}" - local pid - - pid="$(get_pid_from_file "$pid_file")" - [[ -z "$pid" ]] || ! is_service_running "$pid" && return - - if [[ -n "$signal" ]]; then - kill "-${signal}" "$pid" - else - kill "$pid" - fi - - local counter=10 - while [[ "$counter" -ne 0 ]] && is_service_running "$pid"; do - sleep 1 - counter=$((counter - 1)) - done -} - -######################## -# Start cron daemon -# Arguments: -# None -# Returns: -# true if started correctly, false otherwise -######################### -cron_start() { - if [[ -x "/usr/sbin/cron" ]]; then - /usr/sbin/cron - elif [[ -x "/usr/sbin/crond" ]]; then - /usr/sbin/crond - else - false - fi -} - -######################## -# Generate a cron configuration file for a given service -# Arguments: -# $1 - Service name -# $2 - Command -# Flags: -# --run-as - User to run as (default: root) -# --schedule - Cron schedule configuration (default: * * * * *) -# Returns: -# None -######################### -generate_cron_conf() { - local service_name="${1:?service name is missing}" - local cmd="${2:?command is missing}" - local run_as="root" - local schedule="* * * * *" - local clean="true" - - # Parse optional CLI flags - shift 2 - while [[ "$#" -gt 0 ]]; do - case "$1" in - --run-as) - shift - run_as="$1" - ;; - --schedule) - shift - schedule="$1" - ;; - --no-clean) - clean="false" - ;; - *) - echo "Invalid command line flag ${1}" >&2 - return 1 - ;; - esac - shift - done - - mkdir -p /etc/cron.d - if "$clean"; then - cat > "/etc/cron.d/${service_name}" <> /etc/cron.d/"$service_name" - fi -} - -######################## -# Remove a cron configuration file for a given service -# Arguments: -# $1 - Service name -# Returns: -# None -######################### -remove_cron_conf() { - local service_name="${1:?service name is missing}" - local cron_conf_dir="/etc/monit/conf.d" - rm -f "${cron_conf_dir}/${service_name}" -} - -######################## -# Generate a monit configuration file for a given service -# Arguments: -# $1 - Service name -# $2 - Pid file -# $3 - Start command -# $4 - Stop command -# Flags: -# --disable - Whether to disable the monit configuration -# Returns: -# None -######################### -generate_monit_conf() { - local service_name="${1:?service name is missing}" - local pid_file="${2:?pid file is missing}" - local start_command="${3:?start command is missing}" - local stop_command="${4:?stop command is missing}" - local monit_conf_dir="/etc/monit/conf.d" - local disabled="no" - - # Parse optional CLI flags - shift 4 - while [[ "$#" -gt 0 ]]; do - case "$1" in - --disable) - disabled="yes" - ;; - *) - echo "Invalid command line flag ${1}" >&2 - return 1 - ;; - esac - shift - done - - is_boolean_yes "$disabled" && conf_suffix=".disabled" - mkdir -p "$monit_conf_dir" - cat > "${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <&2 - return 1 - ;; - esac - shift - done - - mkdir -p "$logrotate_conf_dir" - cat < "${logrotate_conf_dir}/${service_name}" -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -${log_path} { - ${period} - rotate ${rotations} - dateext - compress - copytruncate - missingok -$(indent "$extra" 2) -} -EOF -} - -######################## -# Remove a logrotate configuration file -# Arguments: -# $1 - Service name -# Returns: -# None -######################### -remove_logrotate_conf() { - local service_name="${1:?service name is missing}" - local logrotate_conf_dir="/etc/logrotate.d" - rm -f "${logrotate_conf_dir}/${service_name}" -} - -######################## -# Generate a Systemd configuration file -# Arguments: -# $1 - Service name -# Flags: -# --custom-service-content - Custom content to add to the [service] block -# --environment - Environment variable to define (multiple --environment options may be passed) -# --environment-file - Text file with environment variables (multiple --environment-file options may be passed) -# --exec-start - Start command (required) -# --exec-start-pre - Pre-start command (optional) -# --exec-start-post - Post-start command (optional) -# --exec-stop - Stop command (optional) -# --exec-reload - Reload command (optional) -# --group - System group to start the service with -# --name - Service full name (e.g. Apache HTTP Server, defaults to $1) -# --restart - When to restart the Systemd service after being stopped (defaults to always) -# --pid-file - Service PID file -# --standard-output - File where to print stdout output -# --standard-error - File where to print stderr output -# --success-exit-status - Exit code that indicates a successful shutdown -# --type - Systemd unit type (defaults to forking) -# --user - System user to start the service with -# --working-directory - Working directory at which to start the service -# Returns: -# None -######################### -generate_systemd_conf() { - local -r service_name="${1:?service name is missing}" - local -r systemd_units_dir="/etc/systemd/system" - local -r service_file="${systemd_units_dir}/bitnami.${service_name}.service" - # Default values - local name="$service_name" - local type="forking" - local user="" - local group="" - local environment="" - local environment_file="" - local exec_start="" - local exec_start_pre="" - local exec_start_post="" - local exec_stop="" - local exec_reload="" - local restart="always" - local pid_file="" - local standard_output="journal" - local standard_error="" - local limits_content="" - local success_exit_status="" - local custom_service_content="" - local working_directory="" - # Parse CLI flags - shift - while [[ "$#" -gt 0 ]]; do - case "$1" in - --name \ - | --type \ - | --user \ - | --group \ - | --exec-start \ - | --exec-stop \ - | --exec-reload \ - | --restart \ - | --pid-file \ - | --standard-output \ - | --standard-error \ - | --success-exit-status \ - | --custom-service-content \ - | --working-directory \ - ) - var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" - shift - declare "$var_name"="${1:?"${var_name} value is missing"}" - ;; - --limit-*) - [[ -n "$limits_content" ]] && limits_content+=$'\n' - var_name="${1//--limit-}" - shift - limits_content+="Limit${var_name^^}=${1:?"--limit-${var_name} value is missing"}" - ;; - --exec-start-pre) - shift - [[ -n "$exec_start_pre" ]] && exec_start_pre+=$'\n' - exec_start_pre+="ExecStartPre=${1:?"--exec-start-pre value is missing"}" - ;; - --exec-start-post) - shift - [[ -n "$exec_start_post" ]] && exec_start_post+=$'\n' - exec_start_post+="ExecStartPost=${1:?"--exec-start-post value is missing"}" - ;; - --environment) - shift - # It is possible to add multiple environment lines - [[ -n "$environment" ]] && environment+=$'\n' - environment+="Environment=${1:?"--environment value is missing"}" - ;; - --environment-file) - shift - # It is possible to add multiple environment-file lines - [[ -n "$environment_file" ]] && environment_file+=$'\n' - environment_file+="EnvironmentFile=${1:?"--environment-file value is missing"}" - ;; - *) - echo "Invalid command line flag ${1}" >&2 - return 1 - ;; - esac - shift - done - # Validate inputs - local error="no" - if [[ -z "$exec_start" ]]; then - error "The --exec-start option is required" - error="yes" - fi - if [[ "$error" != "no" ]]; then - return 1 - fi - # Generate the Systemd unit - cat > "$service_file" <> "$service_file" <<< "WorkingDirectory=${working_directory}" - fi - if [[ -n "$exec_start_pre" ]]; then - # This variable may contain multiple ExecStartPre= directives - cat >> "$service_file" <<< "$exec_start_pre" - fi - if [[ -n "$exec_start" ]]; then - cat >> "$service_file" <<< "ExecStart=${exec_start}" - fi - if [[ -n "$exec_start_post" ]]; then - # This variable may contain multiple ExecStartPost= directives - cat >> "$service_file" <<< "$exec_start_post" - fi - # Optional stop and reload commands - if [[ -n "$exec_stop" ]]; then - cat >> "$service_file" <<< "ExecStop=${exec_stop}" - fi - if [[ -n "$exec_reload" ]]; then - cat >> "$service_file" <<< "ExecReload=${exec_reload}" - fi - # User and group - if [[ -n "$user" ]]; then - cat >> "$service_file" <<< "User=${user}" - fi - if [[ -n "$group" ]]; then - cat >> "$service_file" <<< "Group=${group}" - fi - # PID file allows to determine if the main process is running properly (for Restart=always) - if [[ -n "$pid_file" ]]; then - cat >> "$service_file" <<< "PIDFile=${pid_file}" - fi - if [[ -n "$restart" ]]; then - cat >> "$service_file" <<< "Restart=${restart}" - fi - # Environment flags - if [[ -n "$environment" ]]; then - # This variable may contain multiple Environment= directives - cat >> "$service_file" <<< "$environment" - fi - if [[ -n "$environment_file" ]]; then - # This variable may contain multiple EnvironmentFile= directives - cat >> "$service_file" <<< "$environment_file" - fi - # Logging - if [[ -n "$standard_output" ]]; then - cat >> "$service_file" <<< "StandardOutput=${standard_output}" - fi - if [[ -n "$standard_error" ]]; then - cat >> "$service_file" <<< "StandardError=${standard_error}" - fi - if [[ -n "$custom_service_content" ]]; then - # This variable may contain multiple miscellaneous directives - cat >> "$service_file" <<< "$custom_service_content" - fi - if [[ -n "$success_exit_status" ]]; then - cat >> "$service_file" <> "$service_file" <> "$service_file" <> "$service_file" <= 0 )); then - true - else - false - fi -} - -######################## -# Check if the provided argument is a boolean or is the string 'yes/true' -# Arguments: -# $1 - Value to check -# Returns: -# Boolean -######################### -is_boolean_yes() { - local -r bool="${1:-}" - # comparison is performed without regard to the case of alphabetic characters - shopt -s nocasematch - if [[ "$bool" = 1 || "$bool" =~ ^(yes|true)$ ]]; then - true - else - false - fi -} - -######################## -# Check if the provided argument is a boolean yes/no value -# Arguments: -# $1 - Value to check -# Returns: -# Boolean -######################### -is_yes_no_value() { - local -r bool="${1:-}" - if [[ "$bool" =~ ^(yes|no)$ ]]; then - true - else - false - fi -} - -######################## -# Check if the provided argument is a boolean true/false value -# Arguments: -# $1 - Value to check -# Returns: -# Boolean -######################### -is_true_false_value() { - local -r bool="${1:-}" - if [[ "$bool" =~ ^(true|false)$ ]]; then - true - else - false - fi -} - -######################## -# Check if the provided argument is a boolean 1/0 value -# Arguments: -# $1 - Value to check -# Returns: -# Boolean -######################### -is_1_0_value() { - local -r bool="${1:-}" - if [[ "$bool" =~ ^[10]$ ]]; then - true - else - false - fi -} - -######################## -# Check if the provided argument is an empty string or not defined -# Arguments: -# $1 - Value to check -# Returns: -# Boolean -######################### -is_empty_value() { - local -r val="${1:-}" - if [[ -z "$val" ]]; then - true - else - false - fi -} - -######################## -# Validate if the provided argument is a valid port -# Arguments: -# $1 - Port to validate -# Returns: -# Boolean and error message -######################### -validate_port() { - local value - local unprivileged=0 - - # Parse flags - while [[ "$#" -gt 0 ]]; do - case "$1" in - -unprivileged) - unprivileged=1 - ;; - --) - shift - break - ;; - -*) - stderr_print "unrecognized flag $1" - return 1 - ;; - *) - break - ;; - esac - shift - done - - if [[ "$#" -gt 1 ]]; then - echo "too many arguments provided" - return 2 - elif [[ "$#" -eq 0 ]]; then - stderr_print "missing port argument" - return 1 - else - value=$1 - fi - - if [[ -z "$value" ]]; then - echo "the value is empty" - return 1 - else - if ! is_int "$value"; then - echo "value is not an integer" - return 2 - elif [[ "$value" -lt 0 ]]; then - echo "negative value provided" - return 2 - elif [[ "$value" -gt 65535 ]]; then - echo "requested port is greater than 65535" - return 2 - elif [[ "$unprivileged" = 1 && "$value" -lt 1024 ]]; then - echo "privileged port requested" - return 3 - fi - fi -} - -######################## -# Validate if the provided argument is a valid IPv6 address -# Arguments: -# $1 - IP to validate -# Returns: -# Boolean -######################### -validate_ipv6() { - local ip="${1:?ip is missing}" - local stat=1 - local full_address_regex='^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$' - local short_address_regex='^((([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6}::(([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6})$' - - if [[ $ip =~ $full_address_regex || $ip =~ $short_address_regex || $ip == "::" ]]; then - stat=0 - fi - return $stat -} - -######################## -# Validate if the provided argument is a valid IPv4 address -# Arguments: -# $1 - IP to validate -# Returns: -# Boolean -######################### -validate_ipv4() { - local ip="${1:?ip is missing}" - local stat=1 - - if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then - read -r -a ip_array <<< "$(tr '.' ' ' <<< "$ip")" - [[ ${ip_array[0]} -le 255 && ${ip_array[1]} -le 255 \ - && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]] - stat=$? - fi - return $stat -} - -######################## -# Validate if the provided argument is a valid IPv4 or IPv6 address -# Arguments: -# $1 - IP to validate -# Returns: -# Boolean -######################### -validate_ip() { - local ip="${1:?ip is missing}" - local stat=1 - - if validate_ipv4 "$ip"; then - stat=0 - else - stat=$(validate_ipv6 "$ip") - fi - return $stat -} - -######################## -# Validate a string format -# Arguments: -# $1 - String to validate -# Returns: -# Boolean -######################### -validate_string() { - local string - local min_length=-1 - local max_length=-1 - - # Parse flags - while [ "$#" -gt 0 ]; do - case "$1" in - -min-length) - shift - min_length=${1:-} - ;; - -max-length) - shift - max_length=${1:-} - ;; - --) - shift - break - ;; - -*) - stderr_print "unrecognized flag $1" - return 1 - ;; - *) - break - ;; - esac - shift - done - - if [ "$#" -gt 1 ]; then - stderr_print "too many arguments provided" - return 2 - elif [ "$#" -eq 0 ]; then - stderr_print "missing string" - return 1 - else - string=$1 - fi - - if [[ "$min_length" -ge 0 ]] && [[ "${#string}" -lt "$min_length" ]]; then - echo "string length is less than $min_length" - return 1 - fi - if [[ "$max_length" -ge 0 ]] && [[ "${#string}" -gt "$max_length" ]]; then - echo "string length is great than $max_length" - return 1 - fi -} diff --git a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh deleted file mode 100644 index 6ca71ac7bdbb7..0000000000000 --- a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Library for managing versions strings - -# shellcheck disable=SC1091 - -# Load Generic Libraries -. /opt/bitnami/scripts/liblog.sh - -# Functions -######################## -# Gets semantic version -# Arguments: -# $1 - version: string to extract major.minor.patch -# $2 - section: 1 to extract major, 2 to extract minor, 3 to extract patch -# Returns: -# array with the major, minor and release -######################### -get_sematic_version () { - local version="${1:?version is required}" - local section="${2:?section is required}" - local -a version_sections - - #Regex to parse versions: x.y.z - local -r regex='([0-9]+)(\.([0-9]+)(\.([0-9]+))?)?' - - if [[ "$version" =~ $regex ]]; then - local i=1 - local j=1 - local n=${#BASH_REMATCH[*]} - - while [[ $i -lt $n ]]; do - if [[ -n "${BASH_REMATCH[$i]}" ]] && [[ "${BASH_REMATCH[$i]:0:1}" != '.' ]]; then - version_sections[j]="${BASH_REMATCH[$i]}" - ((j++)) - fi - ((i++)) - done - - local number_regex='^[0-9]+$' - if [[ "$section" =~ $number_regex ]] && (( section > 0 )) && (( section <= 3 )); then - echo "${version_sections[$section]}" - return - else - stderr_print "Section allowed values are: 1, 2, and 3" - return 1 - fi - fi -} diff --git a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh deleted file mode 100644 index 8023f9b0549a0..0000000000000 --- a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ /dev/null @@ -1,476 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Bitnami web server handler library - -# shellcheck disable=SC1090,SC1091 - -# Load generic libraries -. /opt/bitnami/scripts/liblog.sh - -######################## -# Execute a command (or list of commands) with the web server environment and library loaded -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -web_server_execute() { - local -r web_server="${1:?missing web server}" - shift - # Run program in sub-shell to avoid web server environment getting loaded when not necessary - ( - . "/opt/bitnami/scripts/lib${web_server}.sh" - . "/opt/bitnami/scripts/${web_server}-env.sh" - "$@" - ) -} - -######################## -# Prints the list of enabled web servers -# Globals: -# None -# Arguments: -# None -# Returns: -# None -######################### -web_server_list() { - local -r -a supported_web_servers=(apache nginx) - local -a existing_web_servers=() - for web_server in "${supported_web_servers[@]}"; do - [[ -f "/opt/bitnami/scripts/${web_server}-env.sh" ]] && existing_web_servers+=("$web_server") - done - echo "${existing_web_servers[@]:-}" -} - -######################## -# Prints the currently-enabled web server type (only one, in order of preference) -# Globals: -# None -# Arguments: -# None -# Returns: -# None -######################### -web_server_type() { - local -a web_servers - read -r -a web_servers <<< "$(web_server_list)" - echo "${web_servers[0]:-}" -} - -######################## -# Validate that a supported web server is configured -# Globals: -# None -# Arguments: -# None -# Returns: -# None -######################### -web_server_validate() { - local error_code=0 - local supported_web_servers=("apache" "nginx") - - # Auxiliary functions - print_validation_error() { - error "$1" - error_code=1 - } - - if [[ -z "$(web_server_type)" || ! " ${supported_web_servers[*]} " == *" $(web_server_type) "* ]]; then - print_validation_error "Could not detect any supported web servers. It must be one of: ${supported_web_servers[*]}" - elif ! web_server_execute "$(web_server_type)" type -t "is_$(web_server_type)_running" >/dev/null; then - print_validation_error "Could not load the $(web_server_type) web server library from /opt/bitnami/scripts. Check that it exists and is readable." - fi - - return "$error_code" -} - -######################## -# Check whether the web server is running -# Globals: -# * -# Arguments: -# None -# Returns: -# true if the web server is running, false otherwise -######################### -is_web_server_running() { - "is_$(web_server_type)_running" -} - -######################## -# Start web server -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -web_server_start() { - info "Starting $(web_server_type) in background" - if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then - systemctl start "bitnami.$(web_server_type).service" - else - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" - fi -} - -######################## -# Stop web server -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -web_server_stop() { - info "Stopping $(web_server_type)" - if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then - systemctl stop "bitnami.$(web_server_type).service" - else - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" - fi -} - -######################## -# Restart web server -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -web_server_restart() { - info "Restarting $(web_server_type)" - if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then - systemctl restart "bitnami.$(web_server_type).service" - else - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" - fi -} - -######################## -# Reload web server -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -web_server_reload() { - if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then - systemctl reload "bitnami.$(web_server_type).service" - else - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" - fi -} - -######################## -# Ensure a web server application configuration exists (i.e. Apache virtual host format or NGINX server block) -# It serves as a wrapper for the specific web server function -# Globals: -# * -# Arguments: -# $1 - App name -# Flags: -# --type - Application type, which has an effect on which configuration template to use -# --hosts - Host listen addresses -# --server-name - Server name -# --server-aliases - Server aliases -# --allow-remote-connections - Whether to allow remote connections or to require local connections -# --disable - Whether to render server configurations with a .disabled prefix -# --disable-http - Whether to render the app's HTTP server configuration with a .disabled prefix -# --disable-https - Whether to render the app's HTTPS server configuration with a .disabled prefix -# --http-port - HTTP port number -# --https-port - HTTPS port number -# --document-root - Path to document root directory -# Apache-specific flags: -# --apache-additional-configuration - Additional vhost configuration (no default) -# --apache-additional-http-configuration - Additional HTTP vhost configuration (no default) -# --apache-additional-https-configuration - Additional HTTPS vhost configuration (no default) -# --apache-before-vhost-configuration - Configuration to add before the directive (no default) -# --apache-allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no' and type is not defined) -# --apache-extra-directory-configuration - Extra configuration for the document root directory -# --apache-proxy-address - Address where to proxy requests -# --apache-proxy-configuration - Extra configuration for the proxy -# --apache-proxy-http-configuration - Extra configuration for the proxy HTTP vhost -# --apache-proxy-https-configuration - Extra configuration for the proxy HTTPS vhost -# --apache-move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup (only allowed when type is not defined) -# NGINX-specific flags: -# --nginx-additional-configuration - Additional server block configuration (no default) -# --nginx-external-configuration - Configuration external to server block (no default) -# Returns: -# true if the configuration was enabled, false otherwise -######################## -ensure_web_server_app_configuration_exists() { - local app="${1:?missing app}" - shift - local -a apache_args nginx_args web_servers args_var - apache_args=("$app") - nginx_args=("$app") - # Validate arguments - while [[ "$#" -gt 0 ]]; do - case "$1" in - # Common flags - --disable \ - | --disable-http \ - | --disable-https \ - ) - apache_args+=("$1") - nginx_args+=("$1") - ;; - --hosts \ - | --server-name \ - | --server-aliases \ - | --type \ - | --allow-remote-connections \ - | --http-port \ - | --https-port \ - | --document-root \ - ) - apache_args+=("$1" "${2:?missing value}") - nginx_args+=("$1" "${2:?missing value}") - shift - ;; - - # Specific Apache flags - --apache-additional-configuration \ - | --apache-additional-http-configuration \ - | --apache-additional-https-configuration \ - | --apache-before-vhost-configuration \ - | --apache-allow-override \ - | --apache-extra-directory-configuration \ - | --apache-proxy-address \ - | --apache-proxy-configuration \ - | --apache-proxy-http-configuration \ - | --apache-proxy-https-configuration \ - | --apache-move-htaccess \ - ) - apache_args+=("${1//apache-/}" "${2:?missing value}") - shift - ;; - - # Specific NGINX flags - --nginx-additional-configuration \ - | --nginx-external-configuration) - nginx_args+=("${1//nginx-/}" "${2:?missing value}") - shift - ;; - - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - read -r -a web_servers <<< "$(web_server_list)" - for web_server in "${web_servers[@]}"; do - args_var="${web_server}_args[@]" - web_server_execute "$web_server" "ensure_${web_server}_app_configuration_exists" "${!args_var}" - done -} - -######################## -# Ensure a web server application configuration does not exist anymore (i.e. Apache virtual host format or NGINX server block) -# It serves as a wrapper for the specific web server function -# Globals: -# * -# Arguments: -# $1 - App name -# Returns: -# true if the configuration was disabled, false otherwise -######################## -ensure_web_server_app_configuration_not_exists() { - local app="${1:?missing app}" - local -a web_servers - read -r -a web_servers <<< "$(web_server_list)" - for web_server in "${web_servers[@]}"; do - web_server_execute "$web_server" "ensure_${web_server}_app_configuration_not_exists" "$app" - done -} - -######################## -# Ensure the web server loads the configuration for an application in a URL prefix -# It serves as a wrapper for the specific web server function -# Globals: -# * -# Arguments: -# $1 - App name -# Flags: -# --allow-remote-connections - Whether to allow remote connections or to require local connections -# --document-root - Path to document root directory -# --prefix - URL prefix from where it will be accessible (i.e. /myapp) -# --type - Application type, which has an effect on what configuration template will be used -# Apache-specific flags: -# --apache-additional-configuration - Additional vhost configuration (no default) -# --apache-allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no') -# --apache-extra-directory-configuration - Extra configuration for the document root directory -# --apache-move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup -# NGINX-specific flags: -# --nginx-additional-configuration - Additional server block configuration (no default) -# Returns: -# true if the configuration was enabled, false otherwise -######################## -ensure_web_server_prefix_configuration_exists() { - local app="${1:?missing app}" - shift - local -a apache_args nginx_args web_servers args_var - apache_args=("$app") - nginx_args=("$app") - # Validate arguments - while [[ "$#" -gt 0 ]]; do - case "$1" in - # Common flags - --allow-remote-connections \ - | --document-root \ - | --prefix \ - | --type \ - ) - apache_args+=("$1" "${2:?missing value}") - nginx_args+=("$1" "${2:?missing value}") - shift - ;; - - # Specific Apache flags - --apache-additional-configuration \ - | --apache-allow-override \ - | --apache-extra-directory-configuration \ - | --apache-move-htaccess \ - ) - apache_args+=("${1//apache-/}" "$2") - shift - ;; - - # Specific NGINX flags - --nginx-additional-configuration) - nginx_args+=("${1//nginx-/}" "$2") - shift - ;; - - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - read -r -a web_servers <<< "$(web_server_list)" - for web_server in "${web_servers[@]}"; do - args_var="${web_server}_args[@]" - web_server_execute "$web_server" "ensure_${web_server}_prefix_configuration_exists" "${!args_var}" - done -} - -######################## -# Ensure a web server application configuration is updated with the runtime configuration (i.e. ports) -# It serves as a wrapper for the specific web server function -# Globals: -# * -# Arguments: -# $1 - App name -# Flags: -# --hosts - Host listen addresses -# --server-name - Server name -# --server-aliases - Server aliases -# --enable-http - Enable HTTP app configuration (if not enabled already) -# --enable-https - Enable HTTPS app configuration (if not enabled already) -# --disable-http - Disable HTTP app configuration (if not disabled already) -# --disable-https - Disable HTTPS app configuration (if not disabled already) -# --http-port - HTTP port number -# --https-port - HTTPS port number -# Returns: -# true if the configuration was updated, false otherwise -######################## -web_server_update_app_configuration() { - local app="${1:?missing app}" - shift - local -a args web_servers - args=("$app") - # Validate arguments - while [[ "$#" -gt 0 ]]; do - case "$1" in - # Common flags - --enable-http \ - | --enable-https \ - | --disable-http \ - | --disable-https \ - ) - args+=("$1") - ;; - --hosts \ - | --server-name \ - | --server-aliases \ - | --http-port \ - | --https-port \ - ) - args+=("$1" "${2:?missing value}") - shift - ;; - - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - read -r -a web_servers <<< "$(web_server_list)" - for web_server in "${web_servers[@]}"; do - web_server_execute "$web_server" "${web_server}_update_app_configuration" "${args[@]}" - done -} - -######################## -# Enable loading page, which shows users that the initialization process is not yet completed -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -web_server_enable_loading_page() { - ensure_web_server_app_configuration_exists "__loading" --hosts "_default_" \ - --apache-additional-configuration " -# Show a HTTP 503 Service Unavailable page by default -RedirectMatch 503 ^/$ -# Show index.html if server is answering with 404 Not Found or 503 Service Unavailable status codes -ErrorDocument 404 /index.html -ErrorDocument 503 /index.html" \ - --nginx-additional-configuration " -# Show a HTTP 503 Service Unavailable page by default -location / { - return 503; -} -# Show index.html if server is answering with 404 Not Found or 503 Service Unavailable status codes -error_page 404 @installing; -error_page 503 @installing; -location @installing { - rewrite ^(.*)$ /index.html break; -}" - web_server_reload -} - -######################## -# Enable loading page, which shows users that the initialization process is not yet completed -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -web_server_disable_install_page() { - ensure_web_server_app_configuration_not_exists "__loading" - web_server_reload -} diff --git a/bitnami/postgresql/11/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/postgresql/11/debian-11/prebuildfs/usr/sbin/run-script deleted file mode 100755 index 4ca0f897277eb..0000000000000 --- a/bitnami/postgresql/11/debian-11/prebuildfs/usr/sbin/run-script +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -set -u - -if [ $# -eq 0 ]; then - >&2 echo "No arguments provided" - exit 1 -fi - -script=$1 -exit_code="${2:-96}" -fail_if_not_present="${3:-n}" - -if test -f "$script"; then - sh $script - - if [ $? -ne 0 ]; then - exit $((exit_code)) - fi -elif [ "$fail_if_not_present" = "y" ]; then - >&2 echo "script not found: $script" - exit 127 -fi diff --git a/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/libautoctl.sh b/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/libautoctl.sh deleted file mode 100644 index 236512a9095f8..0000000000000 --- a/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/libautoctl.sh +++ /dev/null @@ -1,308 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Bitnami pg_auto_failover library - -# shellcheck disable=SC1090,SC1091 - -# Load PostgreSQL library -. /opt/bitnami/scripts/libpostgresql.sh - -######################## -# Change pg_hba.conf so it allows access from replication users -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -autoctl_configure_pghba() { - local replication_auth="trust" - if [[ -n "${POSTGRESQL_REPLICATION_PASSWORD}" ]]; then - replication_auth="md5" - fi - - cat <"${POSTGRESQL_PGHBA_FILE}" -local all all trust -EOF - - if [[ "${POSTGRESQL_AUTOCTL_MODE}" = "monitor" ]]; then - cat <>"${POSTGRESQL_PGHBA_FILE}" -host pg_auto_failover autoctl_node 0.0.0.0/0 ${replication_auth} -EOF - elif [[ "${POSTGRESQL_AUTOCTL_MODE}" = "postgres" ]]; then - cat <>"${POSTGRESQL_PGHBA_FILE}" -host all all 0.0.0.0/0 ${replication_auth} -host all all ::/0 ${replication_auth} -host replication pgautofailover_replicator 0.0.0.0/0 ${replication_auth} -EOF - fi - - cp "${POSTGRESQL_PGHBA_FILE}" "${POSTGRESQL_DATA_DIR}/pg_hba.conf" -} - -######################## -# Configure the auth parameters -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -autoctl_configure_auth() { - info "Configuring auth parameters for (${POSTGRESQL_DATA_DIR})..." - - if [[ -f ${POSTGRESQL_DATA_DIR}/.autoctl_initialized ]]; then - info "Auth parameters are already configured, restoring from existing data" - else - postgresql_start_bg - - if [[ -n "${POSTGRESQL_REPLICATION_PASSWORD}" ]]; then - info "Changing replication passwords" - - local -r escaped_password="${POSTGRESQL_REPLICATION_PASSWORD//\'/\'\'}" - if [[ "${POSTGRESQL_AUTOCTL_MODE}" = "monitor" ]]; then - echo "ALTER USER autoctl_node WITH PASSWORD '${escaped_password}';" | postgresql_execute - elif [[ "${POSTGRESQL_AUTOCTL_MODE}" = "postgres" ]]; then - echo "ALTER USER pgautofailover_replicator WITH PASSWORD '${escaped_password}';" | postgresql_execute - pg_autoctl config set --pgdata "${POSTGRESQL_DATA_DIR}" replication.password "${POSTGRESQL_REPLICATION_PASSWORD}" - fi - fi - - if [[ "${POSTGRESQL_AUTOCTL_MODE}" = "postgres" ]]; then - info "Adding users auth configurations..." - [[ -n "${POSTGRESQL_DATABASE}" ]] && [[ "$POSTGRESQL_DATABASE" != "postgres" ]] && postgresql_create_custom_database - if [[ "$POSTGRESQL_USERNAME" = "postgres" ]]; then - postgresql_alter_postgres_user "$POSTGRESQL_PASSWORD" - else - if [[ -n "$POSTGRESQL_POSTGRES_PASSWORD" ]]; then - postgresql_alter_postgres_user "$POSTGRESQL_POSTGRES_PASSWORD" - fi - postgresql_create_admin_user - fi - fi - - postgresql_stop - fi -} - -######################## -# Create a monitor -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -autoctl_create_monitor() { - local -r default_hostname=${1:?default_hostname is required} - - "${POSTGRESQL_BIN_DIR}/pg_autoctl" create monitor \ - --auth md5 \ - --pgdata "${POSTGRESQL_DATA_DIR}" \ - --no-ssl \ - --hostname "${POSTGRESQL_AUTOCTL_HOSTNAME:-$default_hostname}" -} - -######################## -# Build monitor URI -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -monitor_connection_string() { - echo "postgres://autoctl_node:${POSTGRESQL_REPLICATION_PASSWORD}@${POSTGRESQL_AUTOCTL_MONITOR_HOST}/pg_auto_failover?connect_timeout=2" -} - -######################## -# Create a postgress node -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -autoctl_create_postgres() { - local -r default_hostname=${1:?default_hostname is required} - - PGPASSWORD="${POSTGRESQL_REPLICATION_PASSWORD}" "${POSTGRESQL_BIN_DIR}/pg_autoctl" create postgres \ - --auth md5 \ - --pgdata "${POSTGRESQL_DATA_DIR}" \ - --no-ssl \ - --monitor "$(monitor_connection_string)" \ - --name "${POSTGRESQL_AUTOCTL_HOSTNAME:-$default_hostname}" \ - --hostname "${POSTGRESQL_AUTOCTL_HOSTNAME:-$default_hostname}" - - pg_autoctl config set --pgdata "${POSTGRESQL_DATA_DIR}" pg_autoctl.monitor "$(monitor_connection_string)" - wait_until_can_connect "$(monitor_connection_string)" -} - -######################## -# Create postgresql data dir using pg_autoclt -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -autoctl_create_node() { - info "Creating ${POSTGRESQL_AUTOCTL_MODE} data directory (${POSTGRESQL_DATA_DIR})..." - - if [[ -f ${POSTGRESQL_DATA_DIR}/.autoctl_initialized ]]; then - info "A ${POSTGRESQL_AUTOCTL_MODE} data directory (${POSTGRESQL_DATA_DIR}) already exists, restoring from existing data" - else - info "Cleaning dbinit initialization files ${POSTGRESQL_DATA_DIR}..." - rm -rf "${POSTGRESQL_DATA_DIR:?}"/* - - local -r default_hostname="$(hostname --fqdn)" - if [[ "${POSTGRESQL_AUTOCTL_MODE}" = "monitor" ]]; then - autoctl_create_monitor "${default_hostname}" - elif [[ "${POSTGRESQL_AUTOCTL_MODE}" = "postgres" ]]; then - autoctl_create_postgres "${default_hostname}" - else - error "autoctl does not support ${POSTGRESQL_AUTOCTL_MODE}" - exit 1 - fi - fi -} - -######################## -# Add pgautofailover extension to shared_preload_libraries property in postgresql.conf -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -autoctl_configure_pgautofailover() { - info "Load pgautofailover through POSTGRESQL_SHARED_PRELOAD_LIBRARIES env var..." - if [[ -f ${POSTGRESQL_DATA_DIR}/.autoctl_initialized ]]; then - info "The pgautofailover is already loaded, restoring from existing config" - else - local preload_libraries - if [[ -n "${POSTGRESQL_SHARED_PRELOAD_LIBRARIES}" ]]; then - preload_libraries="${POSTGRESQL_SHARED_PRELOAD_LIBRARIES},pgautofailover" - else - preload_libraries="pgautofailover" - fi - - postgresql_set_property "shared_preload_libraries" "${preload_libraries}" - fi -} - -######################## -# Add pgbackrest extension's configuration file and directories -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -autoctl_configure_pgbackrest() { - if [[ -f ${POSTGRESQL_DATA_DIR}/.autoctl_initialized ]]; then - info "The pgbackrest is already configured" - else - info "Configuring pgbackrest..." - debug "Ensuring pgbackrest expected directories/files exist..." - for dir in "${POSTGRESQL_PGBACKREST_LOGS_DIR}" "${POSTGRESQL_PGBACKREST_BACKUPS_DIR}" "${POSTGRESQL_PGBACKREST_SPOOL_DIR}"; do - ensure_dir_exists "${dir}" - am_i_root && chown "${POSTGRESQL_DAEMON_USER}:${POSTGRESQL_DAEMON_GROUP}" "${dir}" - done - - cat <>"${POSTGRESQL_PGBACKREST_CONF_FILE}" -[global] -repo1-path=${POSTGRESQL_PGBACKREST_BACKUPS_DIR} -repo1-cipher-pass=${POSTGRESQL_REPLICATION_PASSWORD} -repo1-cipher-type=aes-256-cbc -repo1-retention-diff=1 -repo1-retention-full=2 -process-max=2 -log-path=${POSTGRESQL_PGBACKREST_LOGS_DIR} -log-level-console=info -log-level-file=debug -archive-async=y -spool-path=${POSTGRESQL_PGBACKREST_SPOOL_DIR} -start-fast=y -[testdb] -pg1-path=${POSTGRESQL_DATA_DIR} -EOF - fi -} - -######################## -# Initialize a monitor or postgress node using pg_autoctl command. -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -autoctl_initialize() { - info "Initializing ${POSTGRESQL_AUTOCTL_MODE} data directory..." - - postgresql_unrestrict_pghba - autoctl_create_node - autoctl_configure_pgautofailover - autoctl_configure_pgbackrest - - if [[ ! -f ${POSTGRESQL_DATA_DIR}/.autoctl_initialized ]]; then - info "Moving configuration files to (${POSTGRESQL_DATA_DIR})..." - - cp "${POSTGRESQL_CONF_FILE}" "${POSTGRESQL_DATA_DIR}/postgresql.conf" - mkdir -p "${POSTGRESQL_DATA_DIR}/conf.d" - fi - - autoctl_configure_auth - autoctl_configure_pghba - - touch "${POSTGRESQL_DATA_DIR}/.autoctl_initialized" - info "Done initializing ${POSTGRESQL_AUTOCTL_MODE} data directory..." -} - -######################## -# Wait until a node is ready to accepts connection. -# Globals: -# POSTGRESQL_* -# Arguments: -# - $1 node hostname -# Returns: -# None -######################### -wait_until_can_connect() { - local connection_string="$1" - - check_postgresql_connection() { - psql "$connection_string" -c 'select version()' > /dev/null 2>&1 - } - - info "Wait until node is available..." - if ! retry_while "check_postgresql_connection"; then - error "Could not connect to the postgresql" - return 1 - fi -} - -######################## -# Change pg_hba.conf so only password-based authentication is allowed -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_unrestrict_pghba() { - replace_in_file "$POSTGRESQL_PGHBA_FILE" "md5" "trust" false -} diff --git a/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh b/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh deleted file mode 100644 index b66e8c5a581e1..0000000000000 --- a/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh +++ /dev/null @@ -1,1323 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Bitnami PostgreSQL library - -# shellcheck disable=SC1090,SC1091 - -# Load Generic Libraries -. /opt/bitnami/scripts/libfile.sh -. /opt/bitnami/scripts/libfs.sh -. /opt/bitnami/scripts/liblog.sh -. /opt/bitnami/scripts/libos.sh -. /opt/bitnami/scripts/libservice.sh -. /opt/bitnami/scripts/libvalidations.sh -. /opt/bitnami/scripts/libnet.sh - -######################## -# Configure libnss_wrapper so PostgreSQL commands work with a random user. -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_enable_nss_wrapper() { - if ! getent passwd "$(id -u)" &>/dev/null && [ -e "$NSS_WRAPPER_LIB" ]; then - debug "Configuring libnss_wrapper..." - export LD_PRELOAD="$NSS_WRAPPER_LIB" - # shellcheck disable=SC2155 - export NSS_WRAPPER_PASSWD="$(mktemp)" - # shellcheck disable=SC2155 - export NSS_WRAPPER_GROUP="$(mktemp)" - echo "postgres:x:$(id -u):$(id -g):PostgreSQL:$POSTGRESQL_DATA_DIR:/bin/false" >"$NSS_WRAPPER_PASSWD" - echo "postgres:x:$(id -g):" >"$NSS_WRAPPER_GROUP" - fi -} - -######################## -# Validate settings in POSTGRESQL_* environment variables -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_validate() { - info "Validating settings in POSTGRESQL_* env vars.." - local error_code=0 - - # Auxiliary functions - print_validation_error() { - error "$1" - error_code=1 - } - - check_multi_value() { - if [[ " ${2} " != *" ${!1} "* ]]; then - print_validation_error "The allowed values for ${1} are: ${2}" - fi - } - - empty_password_enabled_warn() { - warn "You set the environment variable ALLOW_EMPTY_PASSWORD=${ALLOW_EMPTY_PASSWORD}. For safety reasons, do not use this flag in a production environment." - } - empty_password_error() { - print_validation_error "The $1 environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow the container to be started with blank passwords. This is recommended only for development." - } - if is_boolean_yes "$ALLOW_EMPTY_PASSWORD"; then - empty_password_enabled_warn - else - if [[ -z "$POSTGRESQL_PASSWORD" ]]; then - empty_password_error "POSTGRESQL_PASSWORD" - fi - if ((${#POSTGRESQL_PASSWORD} > 100)); then - print_validation_error "The password cannot be longer than 100 characters. Set the environment variable POSTGRESQL_PASSWORD with a shorter value" - fi - if [[ -n "$POSTGRESQL_USERNAME" ]] && [[ -z "$POSTGRESQL_PASSWORD" ]]; then - empty_password_error "POSTGRESQL_PASSWORD" - fi - if [[ -n "$POSTGRESQL_USERNAME" ]] && [[ "$POSTGRESQL_USERNAME" != "postgres" ]] && [[ -n "$POSTGRESQL_PASSWORD" ]] && [[ -z "$POSTGRESQL_DATABASE" ]]; then - print_validation_error "In order to use a custom PostgreSQL user you need to set the environment variable POSTGRESQL_DATABASE as well" - fi - fi - if [[ -n "$POSTGRESQL_REPLICATION_MODE" ]]; then - if [[ "$POSTGRESQL_REPLICATION_MODE" = "master" ]]; then - if ((POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS < 0)); then - print_validation_error "The number of synchronous replicas cannot be less than 0. Set the environment variable POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS" - fi - elif [[ "$POSTGRESQL_REPLICATION_MODE" = "slave" ]]; then - if [[ -z "$POSTGRESQL_MASTER_HOST" ]]; then - print_validation_error "Slave replication mode chosen without setting the environment variable POSTGRESQL_MASTER_HOST. Use it to indicate where the Master node is running" - fi - if [[ -z "$POSTGRESQL_REPLICATION_USER" ]]; then - print_validation_error "Slave replication mode chosen without setting the environment variable POSTGRESQL_REPLICATION_USER. Make sure that the master also has this parameter set" - fi - else - print_validation_error "Invalid replication mode. Available options are 'master/slave'" - fi - # Common replication checks - if [[ -n "$POSTGRESQL_REPLICATION_USER" ]] && [[ -z "$POSTGRESQL_REPLICATION_PASSWORD" ]]; then - empty_password_error "POSTGRESQL_REPLICATION_PASSWORD" - fi - else - if is_boolean_yes "$ALLOW_EMPTY_PASSWORD"; then - empty_password_enabled_warn - else - if [[ -z "$POSTGRESQL_PASSWORD" ]]; then - empty_password_error "POSTGRESQL_PASSWORD" - fi - if [[ -n "$POSTGRESQL_USERNAME" ]] && [[ -z "$POSTGRESQL_PASSWORD" ]]; then - empty_password_error "POSTGRESQL_PASSWORD" - fi - fi - fi - - if ! is_yes_no_value "$POSTGRESQL_ENABLE_LDAP"; then - empty_password_error "The values allowed for POSTGRESQL_ENABLE_LDAP are: yes or no" - fi - - if is_boolean_yes "$POSTGRESQL_ENABLE_LDAP" && [[ -n "$POSTGRESQL_LDAP_URL" ]] && [[ -n "$POSTGRESQL_LDAP_SERVER" ]]; then - empty_password_error "You can not set POSTGRESQL_LDAP_URL and POSTGRESQL_LDAP_SERVER at the same time. Check your LDAP configuration." - fi - - if ! is_yes_no_value "$POSTGRESQL_ENABLE_TLS"; then - print_validation_error "The values allowed for POSTGRESQL_ENABLE_TLS are: yes or no" - elif is_boolean_yes "$POSTGRESQL_ENABLE_TLS"; then - # TLS Checks - if [[ -z "$POSTGRESQL_TLS_CERT_FILE" ]]; then - print_validation_error "You must provide a X.509 certificate in order to use TLS" - elif [[ ! -f "$POSTGRESQL_TLS_CERT_FILE" ]]; then - print_validation_error "The X.509 certificate file in the specified path ${POSTGRESQL_TLS_CERT_FILE} does not exist" - fi - if [[ -z "$POSTGRESQL_TLS_KEY_FILE" ]]; then - print_validation_error "You must provide a private key in order to use TLS" - elif [[ ! -f "$POSTGRESQL_TLS_KEY_FILE" ]]; then - print_validation_error "The private key file in the specified path ${POSTGRESQL_TLS_KEY_FILE} does not exist" - fi - if [[ -z "$POSTGRESQL_TLS_CA_FILE" ]]; then - warn "A CA X.509 certificate was not provided. Client verification will not be performed in TLS connections" - elif [[ ! -f "$POSTGRESQL_TLS_CA_FILE" ]]; then - print_validation_error "The CA X.509 certificate file in the specified path ${POSTGRESQL_TLS_CA_FILE} does not exist" - fi - if [[ -n "$POSTGRESQL_TLS_CRL_FILE" ]] && [[ ! -f "$POSTGRESQL_TLS_CRL_FILE" ]]; then - print_validation_error "The CRL file in the specified path ${POSTGRESQL_TLS_CRL_FILE} does not exist" - fi - if ! is_yes_no_value "$POSTGRESQL_TLS_PREFER_SERVER_CIPHERS"; then - print_validation_error "The values allowed for POSTGRESQL_TLS_PREFER_SERVER_CIPHERS are: yes or no" - fi - fi - - if [[ -n "$POSTGRESQL_SYNCHRONOUS_REPLICAS_MODE" ]]; then - check_multi_value "POSTGRESQL_SYNCHRONOUS_REPLICAS_MODE" "FIRST ANY" - fi - - [[ "$error_code" -eq 0 ]] || exit "$error_code" -} - -######################## -# Create basic postgresql.conf file using the example provided in the share/ folder -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_create_config() { - info "postgresql.conf file not detected. Generating it..." - cp "$POSTGRESQL_BASE_DIR/share/postgresql.conf.sample" "$POSTGRESQL_CONF_FILE" - # Update default value for 'include_dir' directive - # ref: https://github.com/postgres/postgres/commit/fb9c475597c245562a28d1e916b575ac4ec5c19f#diff-f5544d9b6d218cc9677524b454b41c60 - if ! grep include_dir "$POSTGRESQL_CONF_FILE" >/dev/null; then - error "include_dir line is not present in $POSTGRESQL_CONF_FILE. This may be due to a changes in a new version of PostgreSQL. Please check" - exit 1 - fi - local psql_conf - psql_conf="$(sed -E "/#include_dir/i include_dir = 'conf.d'" "$POSTGRESQL_CONF_FILE")" - echo "$psql_conf" >"$POSTGRESQL_CONF_FILE" -} - -######################## -# Create ldap auth configuration in pg_hba, -# but keeps postgres user to authenticate locally -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_ldap_auth_configuration() { - info "Generating LDAP authentication configuration" - local ldap_configuration="" - - if [[ -n "$POSTGRESQL_LDAP_URL" ]]; then - ldap_configuration="ldapurl=\"$POSTGRESQL_LDAP_URL\"" - else - ldap_configuration="ldapserver=${POSTGRESQL_LDAP_SERVER}" - - [[ -n "$POSTGRESQL_LDAP_PREFIX" ]] && ldap_configuration+=" ldapprefix=\"${POSTGRESQL_LDAP_PREFIX}\"" - [[ -n "$POSTGRESQL_LDAP_SUFFIX" ]] && ldap_configuration+=" ldapsuffix=\"${POSTGRESQL_LDAP_SUFFIX}\"" - [[ -n "$POSTGRESQL_LDAP_PORT" ]] && ldap_configuration+=" ldapport=${POSTGRESQL_LDAP_PORT}" - [[ -n "$POSTGRESQL_LDAP_BASE_DN" ]] && ldap_configuration+=" ldapbasedn=\"${POSTGRESQL_LDAP_BASE_DN}\"" - [[ -n "$POSTGRESQL_LDAP_BIND_DN" ]] && ldap_configuration+=" ldapbinddn=\"${POSTGRESQL_LDAP_BIND_DN}\"" - [[ -n "$POSTGRESQL_LDAP_BIND_PASSWORD" ]] && ldap_configuration+=" ldapbindpasswd=${POSTGRESQL_LDAP_BIND_PASSWORD}" - [[ -n "$POSTGRESQL_LDAP_SEARCH_ATTR" ]] && ldap_configuration+=" ldapsearchattribute=${POSTGRESQL_LDAP_SEARCH_ATTR}" - [[ -n "$POSTGRESQL_LDAP_SEARCH_FILTER" ]] && ldap_configuration+=" ldapsearchfilter=\"${POSTGRESQL_LDAP_SEARCH_FILTER}\"" - [[ -n "$POSTGRESQL_LDAP_TLS" ]] && ldap_configuration+=" ldaptls=${POSTGRESQL_LDAP_TLS}" - [[ -n "$POSTGRESQL_LDAP_SCHEME" ]] && ldap_configuration+=" ldapscheme=${POSTGRESQL_LDAP_SCHEME}" - fi - - cat <"$POSTGRESQL_PGHBA_FILE" -host all postgres 0.0.0.0/0 trust -host all postgres ::/0 trust -host all all 0.0.0.0/0 ldap $ldap_configuration -host all all ::/0 ldap $ldap_configuration -EOF -} - -######################## -# Create local auth configuration in pg_hba -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_password_auth_configuration() { - info "Generating local authentication configuration" - cat <"$POSTGRESQL_PGHBA_FILE" -host all all 0.0.0.0/0 trust -host all all ::/0 trust -EOF -} - -######################## -# Enforce Certificate client authentication -# for TLS connections in pg_hba -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_tls_auth_configuration() { - info "Enabling TLS Client authentication" - local previous_content - [[ -f "$POSTGRESQL_PGHBA_FILE" ]] && previous_content=$(<"$POSTGRESQL_PGHBA_FILE") - - cat <"$POSTGRESQL_PGHBA_FILE" -hostssl all all 0.0.0.0/0 cert -hostssl all all ::/0 cert -${previous_content:-} -EOF -} - -######################## -# Create basic pg_hba.conf file -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_create_pghba() { - info "pg_hba.conf file not detected. Generating it..." - - if is_boolean_yes "$POSTGRESQL_ENABLE_LDAP"; then - postgresql_ldap_auth_configuration - else - postgresql_password_auth_configuration - fi -} - -######################## -# Change pg_hba.conf so it allows local UNIX socket-based connections -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_allow_local_connection() { - cat <>"$POSTGRESQL_PGHBA_FILE" -local all all trust -host all all 127.0.0.1/32 trust -host all all ::1/128 trust -EOF -} - -######################## -# Change pg_hba.conf so only password-based authentication is allowed -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_restrict_pghba() { - if [[ -n "$POSTGRESQL_PASSWORD" ]]; then - replace_in_file "$POSTGRESQL_PGHBA_FILE" "trust" "md5" false - fi -} - -######################## -# Change pg_hba.conf so it allows access from replication users -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_add_replication_to_pghba() { - local replication_auth="trust" - if [[ -n "$POSTGRESQL_REPLICATION_PASSWORD" ]]; then - replication_auth="md5" - fi - cat <>"$POSTGRESQL_PGHBA_FILE" -host replication all 0.0.0.0/0 ${replication_auth} -host replication all ::/0 ${replication_auth} -EOF -} - -######################## -# Change a PostgreSQL configuration file by setting a property -# Globals: -# POSTGRESQL_* -# Arguments: -# $1 - property -# $2 - value -# $3 - Path to configuration file (default: $POSTGRESQL_CONF_FILE) -# Returns: -# None -######################### -postgresql_set_property() { - local -r property="${1:?missing property}" - local -r value="${2:?missing value}" - local -r conf_file="${3:-$POSTGRESQL_CONF_FILE}" - local psql_conf - if grep -qE "^#*\s*${property}" "$conf_file" >/dev/null; then - replace_in_file "$conf_file" "^#*\s*${property}\s*=.*" "${property} = '${value}'" false - else - echo "${property} = '${value}'" >>"$conf_file" - fi -} - -######################## -# Create a user for master-slave replication -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_create_replication_user() { - local -r escaped_password="${POSTGRESQL_REPLICATION_PASSWORD//\'/\'\'}" - info "Creating replication user $POSTGRESQL_REPLICATION_USER" - echo "CREATE ROLE \"$POSTGRESQL_REPLICATION_USER\" REPLICATION LOGIN ENCRYPTED PASSWORD '$escaped_password'" | postgresql_execute -} - -######################## -# Change postgresql.conf by setting replication parameters -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_configure_replication_parameters() { - local -r psql_major_version="$(postgresql_get_major_version)" - info "Configuring replication parameters" - postgresql_set_property "wal_level" "$POSTGRESQL_WAL_LEVEL" - postgresql_set_property "max_wal_size" "400MB" - postgresql_set_property "max_wal_senders" "16" - if ((psql_major_version >= 13)); then - postgresql_set_property "wal_keep_size" "128MB" - else - postgresql_set_property "wal_keep_segments" "12" - fi - postgresql_set_property "hot_standby" "on" -} - -######################## -# Change postgresql.conf by setting parameters for synchronous replication -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_configure_synchronous_replication() { - local replication_nodes="" - local synchronous_standby_names="" - info "Configuring synchronous_replication" - - # Check for comma separate values - # When using repmgr, POSTGRESQL_CLUSTER_APP_NAME will contain the list of nodes to be synchronous - # This list need to cleaned from other things but node names. - if [[ "$POSTGRESQL_CLUSTER_APP_NAME" == *","* ]]; then - read -r -a nodes <<<"$(tr ',;' ' ' <<<"${POSTGRESQL_CLUSTER_APP_NAME}")" - for node in "${nodes[@]}"; do - [[ "$node" =~ ^(([^:/?#]+):)?// ]] || node="tcp://${node}" - - # repmgr is only using the first segment of the FQDN as the application name - host="$(parse_uri "$node" 'host' | awk -F. '{print $1}')" - replication_nodes="${replication_nodes}${replication_nodes:+,}\"${host}\"" - done - else - replication_nodes="\"${POSTGRESQL_CLUSTER_APP_NAME}\"" - fi - - if ((POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS > 0)); then - synchronous_standby_names="${POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS} (${replication_nodes})" - if [[ -n "$POSTGRESQL_SYNCHRONOUS_REPLICAS_MODE" ]]; then - synchronous_standby_names="${POSTGRESQL_SYNCHRONOUS_REPLICAS_MODE} ${synchronous_standby_names}" - fi - - postgresql_set_property "synchronous_commit" "$POSTGRESQL_SYNCHRONOUS_COMMIT_MODE" - postgresql_set_property "synchronous_standby_names" "$synchronous_standby_names" - fi -} - -######################## -# Change postgresql.conf by setting TLS properies -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_configure_tls() { - info "Configuring TLS" - chmod 600 "$POSTGRESQL_TLS_KEY_FILE" || warn "Could not set compulsory permissions (600) on file ${POSTGRESQL_TLS_KEY_FILE}" - postgresql_set_property "ssl" "on" - # Server ciphers are preferred by default - ! is_boolean_yes "$POSTGRESQL_TLS_PREFER_SERVER_CIPHERS" && postgresql_set_property "ssl_prefer_server_ciphers" "off" - [[ -n $POSTGRESQL_TLS_CA_FILE ]] && postgresql_set_property "ssl_ca_file" "$POSTGRESQL_TLS_CA_FILE" - [[ -n $POSTGRESQL_TLS_CRL_FILE ]] && postgresql_set_property "ssl_crl_file" "$POSTGRESQL_TLS_CRL_FILE" - postgresql_set_property "ssl_cert_file" "$POSTGRESQL_TLS_CERT_FILE" - postgresql_set_property "ssl_key_file" "$POSTGRESQL_TLS_KEY_FILE" -} - -######################## -# Change postgresql.conf by setting fsync -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_configure_fsync() { - info "Configuring fsync" - postgresql_set_property "fsync" "$POSTGRESQL_FSYNC" -} - -######################## -# Alter password of the postgres user -# Globals: -# POSTGRESQL_* -# Arguments: -# Password -# Returns: -# None -######################### -postgresql_alter_postgres_user() { - local -r escaped_password="${1//\'/\'\'}" - info "Changing password of postgres" - echo "ALTER ROLE postgres WITH PASSWORD '$escaped_password';" | postgresql_execute - if [[ -n "$POSTGRESQL_POSTGRES_CONNECTION_LIMIT" ]]; then - echo "ALTER ROLE postgres WITH CONNECTION LIMIT ${POSTGRESQL_POSTGRES_CONNECTION_LIMIT};" | postgresql_execute - fi -} - -######################## -# Create an admin user with all privileges in POSTGRESQL_DATABASE -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_create_admin_user() { - local -r escaped_password="${POSTGRESQL_PASSWORD//\'/\'\'}" - info "Creating user ${POSTGRESQL_USERNAME}" - local connlimit_string="" - if [[ -n "$POSTGRESQL_USERNAME_CONNECTION_LIMIT" ]]; then - connlimit_string="CONNECTION LIMIT ${POSTGRESQL_USERNAME_CONNECTION_LIMIT}" - fi - echo "CREATE ROLE \"${POSTGRESQL_USERNAME}\" WITH LOGIN ${connlimit_string} CREATEDB PASSWORD '${escaped_password}';" | postgresql_execute - info "Granting access to \"${POSTGRESQL_USERNAME}\" to the database \"${POSTGRESQL_DATABASE}\"" - echo "GRANT ALL PRIVILEGES ON DATABASE \"${POSTGRESQL_DATABASE}\" TO \"${POSTGRESQL_USERNAME}\"\;" | postgresql_execute "" "postgres" "$POSTGRESQL_PASSWORD" - echo "ALTER DATABASE \"${POSTGRESQL_DATABASE}\" OWNER TO \"${POSTGRESQL_USERNAME}\"\;" | postgresql_execute "" "postgres" "$POSTGRESQL_PASSWORD" - info "Setting ownership for the 'public' schema database \"${POSTGRESQL_DATABASE}\" to \"${POSTGRESQL_USERNAME}\"" - echo "ALTER SCHEMA public OWNER TO \"${POSTGRESQL_USERNAME}\"\;" | postgresql_execute "$POSTGRESQL_DATABASE" "postgres" "$POSTGRESQL_PASSWORD" -} - -######################## -# Create a database with name $POSTGRESQL_DATABASE -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_create_custom_database() { - echo "CREATE DATABASE \"$POSTGRESQL_DATABASE\"" | postgresql_execute "" "postgres" "" -} - -######################## -# Change postgresql.conf to listen in 0.0.0.0 -# Arguments: -# None -# Returns: -# None -######################### -postgresql_enable_remote_connections() { - postgresql_set_property "listen_addresses" "*" -} - -######################## -# Check if a given configuration file was mounted externally -# Globals: -# POSTGRESQL_* -# Arguments: -# $1 - Filename -# Returns: -# 1 if the file was mounted externally, 0 otherwise -######################### -postgresql_is_file_external() { - local -r filename=$1 - if [[ -d "$POSTGRESQL_MOUNTED_CONF_DIR" ]] && [[ -f "$POSTGRESQL_MOUNTED_CONF_DIR"/"$filename" ]]; then - return 0 - else - return 1 - fi -} - -######################## -# Remove flags and postmaster files from a previous run (case of container restart) -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_clean_from_restart() { - local -r -a files=( - "$POSTGRESQL_DATA_DIR"/postmaster.pid - "$POSTGRESQL_DATA_DIR"/standby.signal - "$POSTGRESQL_DATA_DIR"/recovery.signal - ) - - for file in "${files[@]}"; do - if [[ -f "$file" ]]; then - info "Cleaning stale $file file" - rm "$file" - fi - done -} - -######################## -# Ensure PostgreSQL is initialized -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_initialize() { - info "Initializing PostgreSQL database..." - - # This fixes an issue where the trap would kill the entrypoint.sh, if a PID was left over from a previous run - # Exec replaces the process without creating a new one, and when the container is restarted it may have the same PID - rm -f "$POSTGRESQL_PID_FILE" - - # User injected custom configuration - if [[ -d "$POSTGRESQL_MOUNTED_CONF_DIR" ]] && compgen -G "$POSTGRESQL_MOUNTED_CONF_DIR"/* >/dev/null; then - debug "Copying files from $POSTGRESQL_MOUNTED_CONF_DIR to $POSTGRESQL_CONF_DIR" - cp -fr "$POSTGRESQL_MOUNTED_CONF_DIR"/. "$POSTGRESQL_CONF_DIR" - fi - local create_conf_file=yes - local create_pghba_file=yes - - if postgresql_is_file_external "postgresql.conf"; then - info "Custom configuration $POSTGRESQL_CONF_FILE detected" - create_conf_file=no - fi - - if postgresql_is_file_external "pg_hba.conf"; then - info "Custom configuration $POSTGRESQL_PGHBA_FILE detected" - create_pghba_file=no - fi - - debug "Ensuring expected directories/files exist..." - for dir in "$POSTGRESQL_TMP_DIR" "$POSTGRESQL_LOG_DIR" "$POSTGRESQL_DATA_DIR"; do - ensure_dir_exists "$dir" - am_i_root && chown "$POSTGRESQL_DAEMON_USER:$POSTGRESQL_DAEMON_GROUP" "$dir" - done - am_i_root && find "$POSTGRESQL_DATA_DIR" -mindepth 1 -maxdepth 1 -not -name ".snapshot" -not -name "lost+found" -exec chown -R "$POSTGRESQL_DAEMON_USER:$POSTGRESQL_DAEMON_GROUP" {} \; - chmod u+rwx "$POSTGRESQL_DATA_DIR" || warn "Lack of permissions on data directory!" - chmod go-rwx "$POSTGRESQL_DATA_DIR" || warn "Lack of permissions on data directory!" - - is_boolean_yes "$POSTGRESQL_ALLOW_REMOTE_CONNECTIONS" && is_boolean_yes "$create_pghba_file" && postgresql_create_pghba && postgresql_allow_local_connection - # Configure port - postgresql_set_property "port" "$POSTGRESQL_PORT_NUMBER" - is_empty_value "$POSTGRESQL_DEFAULT_TOAST_COMPRESSION" || postgresql_set_property "default_toast_compression" "$POSTGRESQL_DEFAULT_TOAST_COMPRESSION" - is_empty_value "$POSTGRESQL_PASSWORD_ENCRYPTION" || postgresql_set_property "password_encryption" "$POSTGRESQL_PASSWORD_ENCRYPTION" - if ! is_dir_empty "$POSTGRESQL_DATA_DIR"; then - info "Deploying PostgreSQL with persisted data..." - export POSTGRESQL_FIRST_BOOT="no" - is_boolean_yes "$create_pghba_file" && postgresql_restrict_pghba - is_boolean_yes "$create_conf_file" && postgresql_configure_replication_parameters - is_boolean_yes "$create_conf_file" && postgresql_configure_fsync - is_boolean_yes "$create_conf_file" && is_boolean_yes "$POSTGRESQL_ENABLE_TLS" && postgresql_configure_tls - [[ "$POSTGRESQL_REPLICATION_MODE" = "master" ]] && [[ -n "$POSTGRESQL_REPLICATION_USER" ]] && is_boolean_yes "$create_pghba_file" && postgresql_add_replication_to_pghba - [[ "$POSTGRESQL_REPLICATION_MODE" = "master" ]] && is_boolean_yes "$create_pghba_file" && postgresql_configure_synchronous_replication - [[ "$POSTGRESQL_REPLICATION_MODE" = "slave" ]] && postgresql_configure_recovery - else - if [[ "$POSTGRESQL_REPLICATION_MODE" = "master" ]]; then - postgresql_master_init_db - postgresql_start_bg "false" - [[ -n "${POSTGRESQL_DATABASE}" ]] && [[ "$POSTGRESQL_DATABASE" != "postgres" ]] && postgresql_create_custom_database - if [[ "$POSTGRESQL_USERNAME" = "postgres" ]]; then - postgresql_alter_postgres_user "$POSTGRESQL_PASSWORD" - else - if [[ -n "$POSTGRESQL_POSTGRES_PASSWORD" ]]; then - postgresql_alter_postgres_user "$POSTGRESQL_POSTGRES_PASSWORD" - fi - postgresql_create_admin_user - fi - is_boolean_yes "$create_pghba_file" && postgresql_restrict_pghba - [[ -n "$POSTGRESQL_REPLICATION_USER" ]] && postgresql_create_replication_user - is_boolean_yes "$create_conf_file" && postgresql_configure_replication_parameters - is_boolean_yes "$create_pghba_file" && postgresql_configure_synchronous_replication - is_boolean_yes "$create_conf_file" && postgresql_configure_fsync - is_boolean_yes "$create_conf_file" && is_boolean_yes "$POSTGRESQL_ENABLE_TLS" && postgresql_configure_tls - [[ -n "$POSTGRESQL_REPLICATION_USER" ]] && is_boolean_yes "$create_pghba_file" && postgresql_add_replication_to_pghba - else - postgresql_slave_init_db - is_boolean_yes "$create_pghba_file" && postgresql_restrict_pghba - is_boolean_yes "$create_conf_file" && postgresql_configure_replication_parameters - is_boolean_yes "$create_conf_file" && postgresql_configure_fsync - is_boolean_yes "$create_conf_file" && is_boolean_yes "$POSTGRESQL_ENABLE_TLS" && postgresql_configure_tls - postgresql_configure_recovery - fi - fi - # TLS Modifications on pghba need to be performed after properly configuring postgresql.conf file - is_boolean_yes "$create_pghba_file" && is_boolean_yes "$POSTGRESQL_ENABLE_TLS" && [[ -n $POSTGRESQL_TLS_CA_FILE ]] && postgresql_tls_auth_configuration - - is_boolean_yes "$create_conf_file" && [[ -n "$POSTGRESQL_SHARED_PRELOAD_LIBRARIES" ]] && postgresql_set_property "shared_preload_libraries" "$POSTGRESQL_SHARED_PRELOAD_LIBRARIES" - is_boolean_yes "$create_conf_file" && postgresql_configure_logging - is_boolean_yes "$create_conf_file" && postgresql_configure_connections - is_boolean_yes "$create_conf_file" && postgresql_configure_timezone - - # Delete conf files generated on first run - rm -f "$POSTGRESQL_DATA_DIR"/postgresql.conf "$POSTGRESQL_DATA_DIR"/pg_hba.conf - - # Stop postgresql - postgresql_stop -} - -######################## -# Run custom pre-initialization scripts -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_custom_pre_init_scripts() { - info "Loading custom pre-init scripts..." - if [[ -d "$POSTGRESQL_PREINITSCRIPTS_DIR" ]] && [[ -n $(find "$POSTGRESQL_PREINITSCRIPTS_DIR/" -type f -name "*.sh") ]]; then - info "Loading user's custom files from $POSTGRESQL_PREINITSCRIPTS_DIR ..." - find "$POSTGRESQL_PREINITSCRIPTS_DIR/" -type f -name "*.sh" | sort | while read -r f; do - if [[ -x "$f" ]]; then - debug "Executing $f" - "$f" - else - debug "Sourcing $f" - . "$f" - fi - done - fi -} - -######################## -# Run custom initialization scripts -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_custom_init_scripts() { - info "Loading custom scripts..." - if [[ -d "$POSTGRESQL_INITSCRIPTS_DIR" ]] && [[ -n $(find "$POSTGRESQL_INITSCRIPTS_DIR/" -type f -regex ".*\.\(sh\|sql\|sql.gz\)") ]] && [[ ! -f "$POSTGRESQL_VOLUME_DIR/.user_scripts_initialized" ]]; then - info "Loading user's custom files from $POSTGRESQL_INITSCRIPTS_DIR ..." - postgresql_start_bg "false" - find "$POSTGRESQL_INITSCRIPTS_DIR/" -type f -regex ".*\.\(sh\|sql\|sql.gz\)" | sort | while read -r f; do - case "$f" in - *.sh) - if [[ -x "$f" ]]; then - debug "Executing $f" - "$f" - else - debug "Sourcing $f" - . "$f" - fi - ;; - *.sql) - debug "Executing $f" - postgresql_execute "$POSTGRESQL_DATABASE" "$POSTGRESQL_INITSCRIPTS_USERNAME" "$POSTGRESQL_INITSCRIPTS_PASSWORD" <"$f" - ;; - *.sql.gz) - debug "Executing $f" - gunzip -c "$f" | postgresql_execute "$POSTGRESQL_DATABASE" "$POSTGRESQL_INITSCRIPTS_USERNAME" "$POSTGRESQL_INITSCRIPTS_PASSWORD" - ;; - *) debug "Ignoring $f" ;; - esac - done - touch "$POSTGRESQL_VOLUME_DIR"/.user_scripts_initialized - fi -} - -######################## -# Stop PostgreSQL -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# None -######################### -postgresql_stop() { - local -r -a cmd=("pg_ctl" "stop" "-w" "-D" "$POSTGRESQL_DATA_DIR" "-m" "$POSTGRESQL_SHUTDOWN_MODE" "-t" "$POSTGRESQL_PGCTLTIMEOUT") - if [[ -f "$POSTGRESQL_PID_FILE" ]]; then - info "Stopping PostgreSQL..." - if am_i_root; then - run_as_user "$POSTGRESQL_DAEMON_USER" "${cmd[@]}" - else - "${cmd[@]}" - fi - fi -} - -######################## -# Start PostgreSQL and wait until it is ready -# Globals: -# POSTGRESQL_* -# Arguments: -# $1 - Enable logs for PostgreSQL. Default: false -# Returns: -# None -######################### -postgresql_start_bg() { - local -r pg_logs=${1:-false} - local -r pg_ctl_flags=("-w" "-D" "$POSTGRESQL_DATA_DIR" "-l" "$POSTGRESQL_LOG_FILE" "-o" "--config-file=$POSTGRESQL_CONF_FILE --external_pid_file=$POSTGRESQL_PID_FILE --hba_file=$POSTGRESQL_PGHBA_FILE") - info "Starting PostgreSQL in background..." - if is_postgresql_running; then - return 0 - fi - local pg_ctl_cmd=() - if am_i_root; then - pg_ctl_cmd+=("run_as_user" "$POSTGRESQL_DAEMON_USER") - fi - pg_ctl_cmd+=("$POSTGRESQL_BIN_DIR"/pg_ctl) - if [[ "${BITNAMI_DEBUG:-false}" = true ]] || [[ $pg_logs = true ]]; then - "${pg_ctl_cmd[@]}" "start" "${pg_ctl_flags[@]}" - else - "${pg_ctl_cmd[@]}" "start" "${pg_ctl_flags[@]}" >/dev/null 2>&1 - fi - local pg_isready_args=("-U" "postgres" "-p" "$POSTGRESQL_PORT_NUMBER") - local counter=$POSTGRESQL_INIT_MAX_TIMEOUT - while ! "$POSTGRESQL_BIN_DIR"/pg_isready "${pg_isready_args[@]}" >/dev/null 2>&1; do - sleep 1 - counter=$((counter - 1)) - if ((counter <= 0)); then - error "PostgreSQL is not ready after $POSTGRESQL_INIT_MAX_TIMEOUT seconds" - exit 1 - fi - done -} - -######################## -# Check if PostgreSQL is running -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# Boolean -######################### -is_postgresql_running() { - local pid - pid="$(get_pid_from_file "$POSTGRESQL_PID_FILE")" - - if [[ -z "$pid" ]]; then - false - else - is_service_running "$pid" - fi -} - -######################## -# Check if PostgreSQL is not running -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# Boolean -######################### -is_postgresql_not_running() { - ! is_postgresql_running -} - -######################## -# Initialize master node database by running initdb -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# Boolean -######################### -postgresql_master_init_db() { - local envExtraFlags=() - local initdb_args=() - if [[ -n "${POSTGRESQL_INITDB_ARGS}" ]]; then - read -r -a envExtraFlags <<<"$POSTGRESQL_INITDB_ARGS" - initdb_args+=("${envExtraFlags[@]}") - fi - if [[ -n "$POSTGRESQL_INITDB_WAL_DIR" ]]; then - ensure_dir_exists "$POSTGRESQL_INITDB_WAL_DIR" - am_i_root && chown "$POSTGRESQL_DAEMON_USER:$POSTGRESQL_DAEMON_GROUP" "$POSTGRESQL_INITDB_WAL_DIR" - initdb_args+=("--waldir" "$POSTGRESQL_INITDB_WAL_DIR") - fi - local initdb_cmd=() - if am_i_root; then - initdb_cmd+=("run_as_user" "$POSTGRESQL_DAEMON_USER") - fi - initdb_cmd+=("$POSTGRESQL_BIN_DIR/initdb") - if [[ -n "${initdb_args[*]:-}" ]]; then - info "Initializing PostgreSQL with ${initdb_args[*]} extra initdb arguments" - if [[ "${BITNAMI_DEBUG:-false}" = true ]]; then - "${initdb_cmd[@]}" -E UTF8 -D "$POSTGRESQL_DATA_DIR" -U "postgres" "${initdb_args[@]}" - else - "${initdb_cmd[@]}" -E UTF8 -D "$POSTGRESQL_DATA_DIR" -U "postgres" "${initdb_args[@]}" >/dev/null 2>&1 - fi - elif [[ "${BITNAMI_DEBUG:-false}" = true ]]; then - "${initdb_cmd[@]}" -E UTF8 -D "$POSTGRESQL_DATA_DIR" -U "postgres" - else - "${initdb_cmd[@]}" -E UTF8 -D "$POSTGRESQL_DATA_DIR" -U "postgres" >/dev/null 2>&1 - fi -} - -######################## -# Initialize slave node by running pg_basebackup -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# Boolean -######################### -postgresql_slave_init_db() { - info "Waiting for replication master to accept connections (${POSTGRESQL_INIT_MAX_TIMEOUT} timeout)..." - local -r check_args=("-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-p" "$POSTGRESQL_MASTER_PORT_NUMBER" "-d" "postgres") - local check_cmd=() - if am_i_root; then - check_cmd=("run_as_user" "$POSTGRESQL_DAEMON_USER") - fi - check_cmd+=("$POSTGRESQL_BIN_DIR"/pg_isready) - local ready_counter=$POSTGRESQL_INIT_MAX_TIMEOUT - - while ! PGPASSWORD=$POSTGRESQL_REPLICATION_PASSWORD "${check_cmd[@]}" "${check_args[@]}"; do - sleep 1 - ready_counter=$((ready_counter - 1)) - if ((ready_counter <= 0)); then - error "PostgreSQL master is not ready after $POSTGRESQL_INIT_MAX_TIMEOUT seconds" - exit 1 - fi - - done - info "Replicating the initial database" - local -r backup_args=("-D" "$POSTGRESQL_DATA_DIR" "-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-p" "$POSTGRESQL_MASTER_PORT_NUMBER" "-X" "stream" "-w" "-v" "-P") - local backup_cmd=() - if am_i_root; then - backup_cmd+=("run_as_user" "$POSTGRESQL_DAEMON_USER") - fi - backup_cmd+=("$POSTGRESQL_BIN_DIR"/pg_basebackup) - local replication_counter=$POSTGRESQL_INIT_MAX_TIMEOUT - while ! PGPASSWORD=$POSTGRESQL_REPLICATION_PASSWORD "${backup_cmd[@]}" "${backup_args[@]}"; do - debug "Backup command failed. Sleeping and trying again" - sleep 1 - replication_counter=$((replication_counter - 1)) - if ((replication_counter <= 0)); then - error "Slave replication failed after trying for $POSTGRESQL_INIT_MAX_TIMEOUT seconds" - exit 1 - fi - done -} - -######################## -# Create recovery.conf in slave node -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# Boolean -######################### -postgresql_configure_recovery() { - info "Setting up streaming replication slave..." - - local -r escaped_password="${POSTGRESQL_REPLICATION_PASSWORD//\&/\\&}" - local -r psql_major_version="$(postgresql_get_major_version)" - if ((psql_major_version >= 12)); then - postgresql_set_property "primary_conninfo" "host=${POSTGRESQL_MASTER_HOST} port=${POSTGRESQL_MASTER_PORT_NUMBER} user=${POSTGRESQL_REPLICATION_USER} password=${escaped_password} application_name=${POSTGRESQL_CLUSTER_APP_NAME}" "$POSTGRESQL_CONF_FILE" - ((psql_major_version < 16)) && postgresql_set_property "promote_trigger_file" "/tmp/postgresql.trigger.${POSTGRESQL_MASTER_PORT_NUMBER}" "$POSTGRESQL_CONF_FILE" - touch "$POSTGRESQL_DATA_DIR"/standby.signal - else - cp -f "$POSTGRESQL_BASE_DIR/share/recovery.conf.sample" "$POSTGRESQL_RECOVERY_FILE" - chmod 600 "$POSTGRESQL_RECOVERY_FILE" - am_i_root && chown "$POSTGRESQL_DAEMON_USER:$POSTGRESQL_DAEMON_GROUP" "$POSTGRESQL_RECOVERY_FILE" - postgresql_set_property "standby_mode" "on" "$POSTGRESQL_RECOVERY_FILE" - postgresql_set_property "primary_conninfo" "host=${POSTGRESQL_MASTER_HOST} port=${POSTGRESQL_MASTER_PORT_NUMBER} user=${POSTGRESQL_REPLICATION_USER} password=${escaped_password} application_name=${POSTGRESQL_CLUSTER_APP_NAME}" "$POSTGRESQL_RECOVERY_FILE" - postgresql_set_property "trigger_file" "/tmp/postgresql.trigger.${POSTGRESQL_MASTER_PORT_NUMBER}" "$POSTGRESQL_RECOVERY_FILE" - fi -} - -######################## -# Configure logging parameters -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# Boolean -######################### -postgresql_configure_logging() { - [[ -n "$POSTGRESQL_PGAUDIT_LOG" ]] && postgresql_set_property "pgaudit.log" "$POSTGRESQL_PGAUDIT_LOG" - [[ -n "$POSTGRESQL_PGAUDIT_LOG_CATALOG" ]] && postgresql_set_property "pgaudit.log_catalog" "$POSTGRESQL_PGAUDIT_LOG_CATALOG" - [[ -n "$POSTGRESQL_PGAUDIT_LOG_PARAMETER" ]] && postgresql_set_property "pgaudit.log_parameter" "$POSTGRESQL_PGAUDIT_LOG_PARAMETER" - [[ -n "$POSTGRESQL_LOG_CONNECTIONS" ]] && postgresql_set_property "log_connections" "$POSTGRESQL_LOG_CONNECTIONS" - [[ -n "$POSTGRESQL_LOG_DISCONNECTIONS" ]] && postgresql_set_property "log_disconnections" "$POSTGRESQL_LOG_DISCONNECTIONS" - [[ -n "$POSTGRESQL_LOG_HOSTNAME" ]] && postgresql_set_property "log_hostname" "$POSTGRESQL_LOG_HOSTNAME" - [[ -n "$POSTGRESQL_CLIENT_MIN_MESSAGES" ]] && postgresql_set_property "client_min_messages" "$POSTGRESQL_CLIENT_MIN_MESSAGES" - [[ -n "$POSTGRESQL_LOG_LINE_PREFIX" ]] && postgresql_set_property "log_line_prefix" "$POSTGRESQL_LOG_LINE_PREFIX" - ([[ -n "$POSTGRESQL_LOG_TIMEZONE" ]] && postgresql_set_property "log_timezone" "$POSTGRESQL_LOG_TIMEZONE") || true -} - -######################## -# Configure connection parameters -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# Boolean -######################### -postgresql_configure_connections() { - [[ -n "$POSTGRESQL_MAX_CONNECTIONS" ]] && postgresql_set_property "max_connections" "$POSTGRESQL_MAX_CONNECTIONS" - [[ -n "$POSTGRESQL_TCP_KEEPALIVES_IDLE" ]] && postgresql_set_property "tcp_keepalives_idle" "$POSTGRESQL_TCP_KEEPALIVES_IDLE" - [[ -n "$POSTGRESQL_TCP_KEEPALIVES_INTERVAL" ]] && postgresql_set_property "tcp_keepalives_interval" "$POSTGRESQL_TCP_KEEPALIVES_INTERVAL" - [[ -n "$POSTGRESQL_TCP_KEEPALIVES_COUNT" ]] && postgresql_set_property "tcp_keepalives_count" "$POSTGRESQL_TCP_KEEPALIVES_COUNT" - ([[ -n "$POSTGRESQL_STATEMENT_TIMEOUT" ]] && postgresql_set_property "statement_timeout" "$POSTGRESQL_STATEMENT_TIMEOUT") || true -} - -######################## -# Configure timezone -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# Boolean -######################### -postgresql_configure_timezone() { - ([[ -n "$POSTGRESQL_TIMEZONE" ]] && postgresql_set_property "timezone" "$POSTGRESQL_TIMEZONE") || true -} - -######################## -# Remove pg_hba.conf lines based on filter -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# Boolean -######################### -postgresql_remove_pghba_lines() { - for filter in ${POSTGRESQL_PGHBA_REMOVE_FILTERS//,/ }; do - result="$(sed -E "/${filter}/d" "$POSTGRESQL_PGHBA_FILE")" - echo "$result" >"$POSTGRESQL_PGHBA_FILE" - done -} - -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC2148 - -######################## -# Return PostgreSQL major version -# Globals: -# POSTGRESQL_* -# Arguments: -# None -# Returns: -# String -######################### -postgresql_get_major_version() { - psql --version | grep -oE "[0-9]+\.[0-9]+" | grep -oE "^[0-9]+" -} - -######################## -# Gets an environment variable name based on the suffix -# Arguments: -# $1 - environment variable suffix -# Returns: -# environment variable name -######################### -get_env_var_value() { - local env_var_suffix="${1:?missing suffix}" - local env_var_name - for env_var_prefix in POSTGRESQL POSTGRESQL_CLIENT; do - env_var_name="${env_var_prefix}_${env_var_suffix}" - if [[ -n "${!env_var_name:-}" ]]; then - echo "${!env_var_name}" - break - fi - done -} - -######################## -# Execute an arbitrary query/queries against the running PostgreSQL service and print the output -# Stdin: -# Query/queries to execute -# Globals: -# BITNAMI_DEBUG -# POSTGRESQL_* -# Arguments: -# $1 - Database where to run the queries -# $2 - User to run queries -# $3 - Password -# $4 - Extra options (eg. -tA) -# Returns: -# None -######################### -postgresql_execute_print_output() { - local -r db="${1:-}" - local -r user="${2:-postgres}" - local -r pass="${3:-}" - local opts - read -r -a opts <<<"${@:4}" - - local args=("-U" "$user" "-p" "${POSTGRESQL_PORT_NUMBER:-5432}") - [[ -n "$db" ]] && args+=("-d" "$db") - [[ "${#opts[@]}" -gt 0 ]] && args+=("${opts[@]}") - - # Execute the Query/queries from stdin - PGPASSWORD=$pass psql "${args[@]}" -} - -######################## -# Execute an arbitrary query/queries against the running PostgreSQL service -# Stdin: -# Query/queries to execute -# Globals: -# BITNAMI_DEBUG -# POSTGRESQL_* -# Arguments: -# $1 - Database where to run the queries -# $2 - User to run queries -# $3 - Password -# $4 - Extra options (eg. -tA) -# Returns: -# None -######################### -postgresql_execute() { - if [[ "${BITNAMI_DEBUG:-false}" = true ]]; then - "postgresql_execute_print_output" "$@" - elif [[ "${NO_ERRORS:-false}" = true ]]; then - "postgresql_execute_print_output" "$@" 2>/dev/null - else - "postgresql_execute_print_output" "$@" >/dev/null 2>&1 - fi -} - -######################## -# Execute an arbitrary query/queries against a remote PostgreSQL service and print to stdout -# Stdin: -# Query/queries to execute -# Globals: -# BITNAMI_DEBUG -# DB_* -# Arguments: -# $1 - Remote PostgreSQL service hostname -# $2 - Remote PostgreSQL service port -# $3 - Database where to run the queries -# $4 - User to run queries -# $5 - Password -# $6 - Extra options (eg. -tA) -# Returns: -# None -postgresql_remote_execute_print_output() { - local -r hostname="${1:?hostname is required}" - local -r port="${2:?port is required}" - local -a args=("-h" "$hostname" "-p" "$port") - shift 2 - "postgresql_execute_print_output" "$@" "${args[@]}" -} - -######################## -# Execute an arbitrary query/queries against a remote PostgreSQL service -# Stdin: -# Query/queries to execute -# Globals: -# BITNAMI_DEBUG -# DB_* -# Arguments: -# $1 - Remote PostgreSQL service hostname -# $2 - Remote PostgreSQL service port -# $3 - Database where to run the queries -# $4 - User to run queries -# $5 - Password -# $6 - Extra options (eg. -tA) -# Returns: -# None -postgresql_remote_execute() { - if [[ "${BITNAMI_DEBUG:-false}" = true ]]; then - "postgresql_remote_execute_print_output" "$@" - elif [[ "${NO_ERRORS:-false}" = true ]]; then - "postgresql_remote_execute_print_output" "$@" 2>/dev/null - else - "postgresql_remote_execute_print_output" "$@" >/dev/null 2>&1 - fi -} - -######################## -# Optionally create the given database user -# Flags: -# -p|--password - database password -# --host - database host -# --port - database port -# Arguments: -# $1 - user -# Returns: -# None -######################### -postgresql_ensure_user_exists() { - local -r user="${1:?user is missing}" - local password="" - # For accessing an external database - local db_host="" - local db_port="" - - # Validate arguments - shift 1 - while [ "$#" -gt 0 ]; do - case "$1" in - -p | --password) - shift - password="${1:?missing password}" - ;; - --host) - shift - db_host="${1:?missing database host}" - ;; - --port) - shift - db_port="${1:?missing database port}" - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - - local -a postgresql_execute_cmd=("postgresql_execute") - [[ -n "$db_host" && -n "$db_port" ]] && postgresql_execute_cmd=("postgresql_remote_execute" "$db_host" "$db_port") - local -a postgresql_execute_flags=("postgres" "$(get_env_var_value POSTGRES_USER)" "$(get_env_var_value POSTGRES_PASSWORD)") - - "${postgresql_execute_cmd[@]}" "${postgresql_execute_flags[@]}" <&2 - return 1 - ;; - esac - shift - done - - local -a postgresql_execute_cmd=("postgresql_execute") - [[ -n "$db_host" && -n "$db_port" ]] && postgresql_execute_cmd=("postgresql_remote_execute" "$db_host" "$db_port") - local -a postgresql_execute_flags=("postgres" "$(get_env_var_value POSTGRES_USER)" "$(get_env_var_value POSTGRES_PASSWORD)") - - "${postgresql_execute_cmd[@]}" "${postgresql_execute_flags[@]}" <> "$LOCALES_FILE" - else - echo "Locale ${locale} is already enabled" - fi -} - -if [[ "$WITH_ALL_LOCALES" =~ ^(yes|true|1)$ ]]; then - echo "Enabling all locales" - cp "$SUPPORTED_LOCALES_FILE" "$LOCALES_FILE" -else - # shellcheck disable=SC2001 - LOCALES_TO_ADD="$(sed 's/[,;]\s*/\n/g' <<< "$EXTRA_LOCALES")" - while [[ -n "$LOCALES_TO_ADD" ]] && read -r locale; do - echo "Enabling locale ${locale}" - enable_locale "$locale" - done <<< "$LOCALES_TO_ADD" -fi - -locale-gen diff --git a/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh b/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh deleted file mode 100644 index e4fa8f5255345..0000000000000 --- a/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh +++ /dev/null @@ -1,351 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Environment configuration for postgresql - -# The values for all environment variables will be set in the below order of precedence -# 1. Custom environment variables defined below after Bitnami defaults -# 2. Constants defined in this file (environment variables with no default), i.e. BITNAMI_ROOT_DIR -# 3. Environment variables overridden via external files using *_FILE variables (see below) -# 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata) - -# Load logging library -# shellcheck disable=SC1090,SC1091 -. /opt/bitnami/scripts/liblog.sh - -export BITNAMI_ROOT_DIR="/opt/bitnami" -export BITNAMI_VOLUME_DIR="/bitnami" - -# Logging configuration -export MODULE="${MODULE:-postgresql}" -export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}" - -# By setting an environment variable matching *_FILE to a file path, the prefixed environment -# variable will be overridden with the value specified in that file -postgresql_env_vars=( - POSTGRESQL_VOLUME_DIR - POSTGRESQL_DATA_DIR - POSTGRESQL_EXTRA_FLAGS - POSTGRESQL_INIT_MAX_TIMEOUT - POSTGRESQL_PGCTLTIMEOUT - POSTGRESQL_SHUTDOWN_MODE - POSTGRESQL_CLUSTER_APP_NAME - POSTGRESQL_DATABASE - POSTGRESQL_INITDB_ARGS - ALLOW_EMPTY_PASSWORD - POSTGRESQL_INITDB_WAL_DIR - POSTGRESQL_MASTER_HOST - POSTGRESQL_MASTER_PORT_NUMBER - POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS - POSTGRESQL_SYNCHRONOUS_REPLICAS_MODE - POSTGRESQL_PORT_NUMBER - POSTGRESQL_ALLOW_REMOTE_CONNECTIONS - POSTGRESQL_REPLICATION_MODE - POSTGRESQL_REPLICATION_USER - POSTGRESQL_SYNCHRONOUS_COMMIT_MODE - POSTGRESQL_FSYNC - POSTGRESQL_USERNAME - POSTGRESQL_ENABLE_LDAP - POSTGRESQL_LDAP_URL - POSTGRESQL_LDAP_PREFIX - POSTGRESQL_LDAP_SUFFIX - POSTGRESQL_LDAP_SERVER - POSTGRESQL_LDAP_PORT - POSTGRESQL_LDAP_SCHEME - POSTGRESQL_LDAP_TLS - POSTGRESQL_LDAP_BASE_DN - POSTGRESQL_LDAP_BIND_DN - POSTGRESQL_LDAP_BIND_PASSWORD - POSTGRESQL_LDAP_SEARCH_ATTR - POSTGRESQL_LDAP_SEARCH_FILTER - POSTGRESQL_INITSCRIPTS_USERNAME - POSTGRESQL_PASSWORD - POSTGRESQL_POSTGRES_PASSWORD - POSTGRESQL_REPLICATION_PASSWORD - POSTGRESQL_INITSCRIPTS_PASSWORD - POSTGRESQL_ENABLE_TLS - POSTGRESQL_TLS_CERT_FILE - POSTGRESQL_TLS_KEY_FILE - POSTGRESQL_TLS_CA_FILE - POSTGRESQL_TLS_CRL_FILE - POSTGRESQL_TLS_PREFER_SERVER_CIPHERS - POSTGRESQL_SHARED_PRELOAD_LIBRARIES - POSTGRESQL_PGAUDIT_LOG - POSTGRESQL_PGAUDIT_LOG_CATALOG - POSTGRESQL_PGAUDIT_LOG_PARAMETER - POSTGRESQL_LOG_CONNECTIONS - POSTGRESQL_LOG_DISCONNECTIONS - POSTGRESQL_LOG_HOSTNAME - POSTGRESQL_CLIENT_MIN_MESSAGES - POSTGRESQL_LOG_LINE_PREFIX - POSTGRESQL_LOG_TIMEZONE - POSTGRESQL_TIMEZONE - POSTGRESQL_MAX_CONNECTIONS - POSTGRESQL_TCP_KEEPALIVES_IDLE - POSTGRESQL_TCP_KEEPALIVES_INTERVAL - POSTGRESQL_TCP_KEEPALIVES_COUNT - POSTGRESQL_STATEMENT_TIMEOUT - POSTGRESQL_PGHBA_REMOVE_FILTERS - POSTGRESQL_USERNAME_CONNECTION_LIMIT - POSTGRESQL_POSTGRES_CONNECTION_LIMIT - POSTGRESQL_WAL_LEVEL - POSTGRESQL_DEFAULT_TOAST_COMPRESSION - POSTGRESQL_PASSWORD_ENCRYPTION - POSTGRESQL_DEFAULT_TRANSACTION_ISOLATION - POSTGRESQL_AUTOCTL_CONF_DIR - POSTGRESQL_AUTOCTL_MODE - POSTGRESQL_AUTOCTL_MONITOR_HOST - POSTGRESQL_AUTOCTL_HOSTNAME - POSTGRES_DATA_DIR - PGDATA - POSTGRES_SHUTDOWN_MODE - POSTGRES_CLUSTER_APP_NAME - POSTGRES_DATABASE - POSTGRES_DB - POSTGRES_INITDB_ARGS - POSTGRES_INITDB_WAL_DIR - POSTGRES_MASTER_HOST - POSTGRES_MASTER_PORT_NUMBER - POSTGRES_NUM_SYNCHRONOUS_REPLICAS - POSTGRES_SYNCHRONOUS_REPLICAS_MODE - POSTGRES_PORT_NUMBER - POSTGRES_ALLOW_REMOTE_CONNECTIONS - POSTGRES_REPLICATION_MODE - POSTGRES_REPLICATION_USER - POSTGRES_SYNCHRONOUS_COMMIT_MODE - POSTGRES_FSYNC - POSTGRES_USERNAME - POSTGRES_USER - POSTGRESQL_USER - POSTGRES_ENABLE_LDAP - POSTGRES_LDAP_URL - POSTGRES_LDAP_PREFIX - POSTGRES_LDAP_SUFFIX - POSTGRES_LDAP_SERVER - POSTGRES_LDAP_PORT - POSTGRES_LDAP_SCHEME - POSTGRES_LDAP_TLS - POSTGRES_LDAP_BASE_DN - POSTGRES_LDAP_BIND_DN - POSTGRES_LDAP_BIND_PASSWORD - POSTGRES_LDAP_SEARCH_ATTR - POSTGRES_LDAP_SEARCH_FILTER - POSTGRES_INITSCRIPTS_USERNAME - POSTGRES_PASSWORD - POSTGRES_POSTGRES_PASSWORD - POSTGRES_REPLICATION_PASSWORD - POSTGRES_INITSCRIPTS_PASSWORD - POSTGRES_ENABLE_TLS - POSTGRES_TLS_CERT_FILE - POSTGRES_TLS_KEY_FILE - POSTGRES_TLS_CA_FILE - POSTGRES_TLS_CRL_FILE - POSTGRES_TLS_PREFER_SERVER_CIPHERS - POSTGRES_SHARED_PRELOAD_LIBRARIES - POSTGRES_PGAUDIT_LOG - POSTGRES_PGAUDIT_LOG_CATALOG - POSTGRES_PGAUDIT_LOG_PARAMETER - POSTGRES_LOG_CONNECTIONS - POSTGRES_LOG_DISCONNECTIONS - POSTGRES_LOG_HOSTNAME - POSTGRES_CLIENT_MIN_MESSAGES - POSTGRES_LOG_LINE_PREFIX - POSTGRES_LOG_TIMEZONE - POSTGRES_TIMEZONE - POSTGRES_MAX_CONNECTIONS - POSTGRES_TCP_KEEPALIVES_IDLE - POSTGRES_TCP_KEEPALIVES_INTERVAL - POSTGRES_TCP_KEEPALIVES_COUNT - POSTGRES_STATEMENT_TIMEOUT - POSTGRES_PGHBA_REMOVE_FILTERS - POSTGRES_USER_CONNECTION_LIMIT - POSTGRES_POSTGRES_CONNECTION_LIMIT -) -for env_var in "${postgresql_env_vars[@]}"; do - file_env_var="${env_var}_FILE" - if [[ -n "${!file_env_var:-}" ]]; then - if [[ -r "${!file_env_var:-}" ]]; then - export "${env_var}=$(< "${!file_env_var}")" - unset "${file_env_var}" - else - warn "Skipping export of '${env_var}'. '${!file_env_var:-}' is not readable." - fi - fi -done -unset postgresql_env_vars - -# Paths -export POSTGRESQL_VOLUME_DIR="${POSTGRESQL_VOLUME_DIR:-/bitnami/postgresql}" -export POSTGRESQL_BASE_DIR="/opt/bitnami/postgresql" -POSTGRESQL_DATA_DIR="${POSTGRESQL_DATA_DIR:-"${POSTGRES_DATA_DIR:-}"}" -POSTGRESQL_DATA_DIR="${POSTGRESQL_DATA_DIR:-"${PGDATA:-}"}" -export POSTGRESQL_DATA_DIR="${POSTGRESQL_DATA_DIR:-${POSTGRESQL_VOLUME_DIR}/data}" -export POSTGRESQL_CONF_DIR="$POSTGRESQL_BASE_DIR/conf" -export POSTGRESQL_MOUNTED_CONF_DIR="$POSTGRESQL_VOLUME_DIR/conf" -export POSTGRESQL_CONF_FILE="$POSTGRESQL_CONF_DIR/postgresql.conf" -export POSTGRESQL_PGHBA_FILE="$POSTGRESQL_CONF_DIR/pg_hba.conf" -export POSTGRESQL_RECOVERY_FILE="$POSTGRESQL_DATA_DIR/recovery.conf" -export POSTGRESQL_LOG_DIR="$POSTGRESQL_BASE_DIR/logs" -export POSTGRESQL_LOG_FILE="$POSTGRESQL_LOG_DIR/postgresql.log" -export POSTGRESQL_TMP_DIR="$POSTGRESQL_BASE_DIR/tmp" -export POSTGRESQL_PID_FILE="$POSTGRESQL_TMP_DIR/postgresql.pid" -export POSTGRESQL_BIN_DIR="$POSTGRESQL_BASE_DIR/bin" -export POSTGRESQL_INITSCRIPTS_DIR="/docker-entrypoint-initdb.d" -export POSTGRESQL_PREINITSCRIPTS_DIR="/docker-entrypoint-preinitdb.d" -export PATH="${POSTGRESQL_BIN_DIR}:${BITNAMI_ROOT_DIR}/common/bin:${PATH}" - -# System users (when running with a privileged user) -export POSTGRESQL_DAEMON_USER="postgres" -export POSTGRESQL_DAEMON_GROUP="postgres" - -# PostgreSQL settings -export POSTGRESQL_EXTRA_FLAGS="${POSTGRESQL_EXTRA_FLAGS:-}" -export POSTGRESQL_INIT_MAX_TIMEOUT="${POSTGRESQL_INIT_MAX_TIMEOUT:-60}" -export POSTGRESQL_PGCTLTIMEOUT="${POSTGRESQL_PGCTLTIMEOUT:-60}" -POSTGRESQL_SHUTDOWN_MODE="${POSTGRESQL_SHUTDOWN_MODE:-"${POSTGRES_SHUTDOWN_MODE:-}"}" -export POSTGRESQL_SHUTDOWN_MODE="${POSTGRESQL_SHUTDOWN_MODE:-fast}" -POSTGRESQL_CLUSTER_APP_NAME="${POSTGRESQL_CLUSTER_APP_NAME:-"${POSTGRES_CLUSTER_APP_NAME:-}"}" -export POSTGRESQL_CLUSTER_APP_NAME="${POSTGRESQL_CLUSTER_APP_NAME:-walreceiver}" -POSTGRESQL_DATABASE="${POSTGRESQL_DATABASE:-"${POSTGRES_DATABASE:-}"}" -POSTGRESQL_DATABASE="${POSTGRESQL_DATABASE:-"${POSTGRES_DB:-}"}" -export POSTGRESQL_DATABASE="${POSTGRESQL_DATABASE:-postgres}" -POSTGRESQL_INITDB_ARGS="${POSTGRESQL_INITDB_ARGS:-"${POSTGRES_INITDB_ARGS:-}"}" -export POSTGRESQL_INITDB_ARGS="${POSTGRESQL_INITDB_ARGS:-}" -export ALLOW_EMPTY_PASSWORD="${ALLOW_EMPTY_PASSWORD:-no}" -POSTGRESQL_INITDB_WAL_DIR="${POSTGRESQL_INITDB_WAL_DIR:-"${POSTGRES_INITDB_WAL_DIR:-}"}" -export POSTGRESQL_INITDB_WAL_DIR="${POSTGRESQL_INITDB_WAL_DIR:-}" -POSTGRESQL_MASTER_HOST="${POSTGRESQL_MASTER_HOST:-"${POSTGRES_MASTER_HOST:-}"}" -export POSTGRESQL_MASTER_HOST="${POSTGRESQL_MASTER_HOST:-}" -POSTGRESQL_MASTER_PORT_NUMBER="${POSTGRESQL_MASTER_PORT_NUMBER:-"${POSTGRES_MASTER_PORT_NUMBER:-}"}" -export POSTGRESQL_MASTER_PORT_NUMBER="${POSTGRESQL_MASTER_PORT_NUMBER:-5432}" -POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS="${POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS:-"${POSTGRES_NUM_SYNCHRONOUS_REPLICAS:-}"}" -export POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS="${POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS:-0}" -POSTGRESQL_SYNCHRONOUS_REPLICAS_MODE="${POSTGRESQL_SYNCHRONOUS_REPLICAS_MODE:-"${POSTGRES_SYNCHRONOUS_REPLICAS_MODE:-}"}" -export POSTGRESQL_SYNCHRONOUS_REPLICAS_MODE="${POSTGRESQL_SYNCHRONOUS_REPLICAS_MODE:-}" -POSTGRESQL_PORT_NUMBER="${POSTGRESQL_PORT_NUMBER:-"${POSTGRES_PORT_NUMBER:-}"}" -export POSTGRESQL_PORT_NUMBER="${POSTGRESQL_PORT_NUMBER:-5432}" -POSTGRESQL_ALLOW_REMOTE_CONNECTIONS="${POSTGRESQL_ALLOW_REMOTE_CONNECTIONS:-"${POSTGRES_ALLOW_REMOTE_CONNECTIONS:-}"}" -export POSTGRESQL_ALLOW_REMOTE_CONNECTIONS="${POSTGRESQL_ALLOW_REMOTE_CONNECTIONS:-yes}" -POSTGRESQL_REPLICATION_MODE="${POSTGRESQL_REPLICATION_MODE:-"${POSTGRES_REPLICATION_MODE:-}"}" -export POSTGRESQL_REPLICATION_MODE="${POSTGRESQL_REPLICATION_MODE:-master}" -POSTGRESQL_REPLICATION_USER="${POSTGRESQL_REPLICATION_USER:-"${POSTGRES_REPLICATION_USER:-}"}" -export POSTGRESQL_REPLICATION_USER="${POSTGRESQL_REPLICATION_USER:-}" -POSTGRESQL_SYNCHRONOUS_COMMIT_MODE="${POSTGRESQL_SYNCHRONOUS_COMMIT_MODE:-"${POSTGRES_SYNCHRONOUS_COMMIT_MODE:-}"}" -export POSTGRESQL_SYNCHRONOUS_COMMIT_MODE="${POSTGRESQL_SYNCHRONOUS_COMMIT_MODE:-on}" -POSTGRESQL_FSYNC="${POSTGRESQL_FSYNC:-"${POSTGRES_FSYNC:-}"}" -export POSTGRESQL_FSYNC="${POSTGRESQL_FSYNC:-on}" -POSTGRESQL_USERNAME="${POSTGRESQL_USERNAME:-"${POSTGRES_USERNAME:-}"}" -POSTGRESQL_USERNAME="${POSTGRESQL_USERNAME:-"${POSTGRES_USER:-}"}" -POSTGRESQL_USERNAME="${POSTGRESQL_USERNAME:-"${POSTGRESQL_USER:-}"}" -export POSTGRESQL_USERNAME="${POSTGRESQL_USERNAME:-postgres}" -POSTGRESQL_ENABLE_LDAP="${POSTGRESQL_ENABLE_LDAP:-"${POSTGRES_ENABLE_LDAP:-}"}" -export POSTGRESQL_ENABLE_LDAP="${POSTGRESQL_ENABLE_LDAP:-no}" -POSTGRESQL_LDAP_URL="${POSTGRESQL_LDAP_URL:-"${POSTGRES_LDAP_URL:-}"}" -export POSTGRESQL_LDAP_URL="${POSTGRESQL_LDAP_URL:-}" -POSTGRESQL_LDAP_PREFIX="${POSTGRESQL_LDAP_PREFIX:-"${POSTGRES_LDAP_PREFIX:-}"}" -export POSTGRESQL_LDAP_PREFIX="${POSTGRESQL_LDAP_PREFIX:-}" -POSTGRESQL_LDAP_SUFFIX="${POSTGRESQL_LDAP_SUFFIX:-"${POSTGRES_LDAP_SUFFIX:-}"}" -export POSTGRESQL_LDAP_SUFFIX="${POSTGRESQL_LDAP_SUFFIX:-}" -POSTGRESQL_LDAP_SERVER="${POSTGRESQL_LDAP_SERVER:-"${POSTGRES_LDAP_SERVER:-}"}" -export POSTGRESQL_LDAP_SERVER="${POSTGRESQL_LDAP_SERVER:-}" -POSTGRESQL_LDAP_PORT="${POSTGRESQL_LDAP_PORT:-"${POSTGRES_LDAP_PORT:-}"}" -export POSTGRESQL_LDAP_PORT="${POSTGRESQL_LDAP_PORT:-}" -POSTGRESQL_LDAP_SCHEME="${POSTGRESQL_LDAP_SCHEME:-"${POSTGRES_LDAP_SCHEME:-}"}" -export POSTGRESQL_LDAP_SCHEME="${POSTGRESQL_LDAP_SCHEME:-}" -POSTGRESQL_LDAP_TLS="${POSTGRESQL_LDAP_TLS:-"${POSTGRES_LDAP_TLS:-}"}" -export POSTGRESQL_LDAP_TLS="${POSTGRESQL_LDAP_TLS:-}" -POSTGRESQL_LDAP_BASE_DN="${POSTGRESQL_LDAP_BASE_DN:-"${POSTGRES_LDAP_BASE_DN:-}"}" -export POSTGRESQL_LDAP_BASE_DN="${POSTGRESQL_LDAP_BASE_DN:-}" -POSTGRESQL_LDAP_BIND_DN="${POSTGRESQL_LDAP_BIND_DN:-"${POSTGRES_LDAP_BIND_DN:-}"}" -export POSTGRESQL_LDAP_BIND_DN="${POSTGRESQL_LDAP_BIND_DN:-}" -POSTGRESQL_LDAP_BIND_PASSWORD="${POSTGRESQL_LDAP_BIND_PASSWORD:-"${POSTGRES_LDAP_BIND_PASSWORD:-}"}" -export POSTGRESQL_LDAP_BIND_PASSWORD="${POSTGRESQL_LDAP_BIND_PASSWORD:-}" -POSTGRESQL_LDAP_SEARCH_ATTR="${POSTGRESQL_LDAP_SEARCH_ATTR:-"${POSTGRES_LDAP_SEARCH_ATTR:-}"}" -export POSTGRESQL_LDAP_SEARCH_ATTR="${POSTGRESQL_LDAP_SEARCH_ATTR:-}" -POSTGRESQL_LDAP_SEARCH_FILTER="${POSTGRESQL_LDAP_SEARCH_FILTER:-"${POSTGRES_LDAP_SEARCH_FILTER:-}"}" -export POSTGRESQL_LDAP_SEARCH_FILTER="${POSTGRESQL_LDAP_SEARCH_FILTER:-}" -POSTGRESQL_INITSCRIPTS_USERNAME="${POSTGRESQL_INITSCRIPTS_USERNAME:-"${POSTGRES_INITSCRIPTS_USERNAME:-}"}" -export POSTGRESQL_INITSCRIPTS_USERNAME="${POSTGRESQL_INITSCRIPTS_USERNAME:-$POSTGRESQL_USERNAME}" -POSTGRESQL_PASSWORD="${POSTGRESQL_PASSWORD:-"${POSTGRES_PASSWORD:-}"}" -export POSTGRESQL_PASSWORD="${POSTGRESQL_PASSWORD:-}" -POSTGRESQL_POSTGRES_PASSWORD="${POSTGRESQL_POSTGRES_PASSWORD:-"${POSTGRES_POSTGRES_PASSWORD:-}"}" -export POSTGRESQL_POSTGRES_PASSWORD="${POSTGRESQL_POSTGRES_PASSWORD:-}" -POSTGRESQL_REPLICATION_PASSWORD="${POSTGRESQL_REPLICATION_PASSWORD:-"${POSTGRES_REPLICATION_PASSWORD:-}"}" -export POSTGRESQL_REPLICATION_PASSWORD="${POSTGRESQL_REPLICATION_PASSWORD:-}" -POSTGRESQL_INITSCRIPTS_PASSWORD="${POSTGRESQL_INITSCRIPTS_PASSWORD:-"${POSTGRES_INITSCRIPTS_PASSWORD:-}"}" -export POSTGRESQL_INITSCRIPTS_PASSWORD="${POSTGRESQL_INITSCRIPTS_PASSWORD:-$POSTGRESQL_PASSWORD}" -POSTGRESQL_ENABLE_TLS="${POSTGRESQL_ENABLE_TLS:-"${POSTGRES_ENABLE_TLS:-}"}" -export POSTGRESQL_ENABLE_TLS="${POSTGRESQL_ENABLE_TLS:-no}" -POSTGRESQL_TLS_CERT_FILE="${POSTGRESQL_TLS_CERT_FILE:-"${POSTGRES_TLS_CERT_FILE:-}"}" -export POSTGRESQL_TLS_CERT_FILE="${POSTGRESQL_TLS_CERT_FILE:-}" -POSTGRESQL_TLS_KEY_FILE="${POSTGRESQL_TLS_KEY_FILE:-"${POSTGRES_TLS_KEY_FILE:-}"}" -export POSTGRESQL_TLS_KEY_FILE="${POSTGRESQL_TLS_KEY_FILE:-}" -POSTGRESQL_TLS_CA_FILE="${POSTGRESQL_TLS_CA_FILE:-"${POSTGRES_TLS_CA_FILE:-}"}" -export POSTGRESQL_TLS_CA_FILE="${POSTGRESQL_TLS_CA_FILE:-}" -POSTGRESQL_TLS_CRL_FILE="${POSTGRESQL_TLS_CRL_FILE:-"${POSTGRES_TLS_CRL_FILE:-}"}" -export POSTGRESQL_TLS_CRL_FILE="${POSTGRESQL_TLS_CRL_FILE:-}" -POSTGRESQL_TLS_PREFER_SERVER_CIPHERS="${POSTGRESQL_TLS_PREFER_SERVER_CIPHERS:-"${POSTGRES_TLS_PREFER_SERVER_CIPHERS:-}"}" -export POSTGRESQL_TLS_PREFER_SERVER_CIPHERS="${POSTGRESQL_TLS_PREFER_SERVER_CIPHERS:-yes}" -POSTGRESQL_SHARED_PRELOAD_LIBRARIES="${POSTGRESQL_SHARED_PRELOAD_LIBRARIES:-"${POSTGRES_SHARED_PRELOAD_LIBRARIES:-}"}" -export POSTGRESQL_SHARED_PRELOAD_LIBRARIES="${POSTGRESQL_SHARED_PRELOAD_LIBRARIES:-pgaudit}" -POSTGRESQL_PGAUDIT_LOG="${POSTGRESQL_PGAUDIT_LOG:-"${POSTGRES_PGAUDIT_LOG:-}"}" -export POSTGRESQL_PGAUDIT_LOG="${POSTGRESQL_PGAUDIT_LOG:-}" -POSTGRESQL_PGAUDIT_LOG_CATALOG="${POSTGRESQL_PGAUDIT_LOG_CATALOG:-"${POSTGRES_PGAUDIT_LOG_CATALOG:-}"}" -export POSTGRESQL_PGAUDIT_LOG_CATALOG="${POSTGRESQL_PGAUDIT_LOG_CATALOG:-}" -POSTGRESQL_PGAUDIT_LOG_PARAMETER="${POSTGRESQL_PGAUDIT_LOG_PARAMETER:-"${POSTGRES_PGAUDIT_LOG_PARAMETER:-}"}" -export POSTGRESQL_PGAUDIT_LOG_PARAMETER="${POSTGRESQL_PGAUDIT_LOG_PARAMETER:-}" -POSTGRESQL_LOG_CONNECTIONS="${POSTGRESQL_LOG_CONNECTIONS:-"${POSTGRES_LOG_CONNECTIONS:-}"}" -export POSTGRESQL_LOG_CONNECTIONS="${POSTGRESQL_LOG_CONNECTIONS:-}" -POSTGRESQL_LOG_DISCONNECTIONS="${POSTGRESQL_LOG_DISCONNECTIONS:-"${POSTGRES_LOG_DISCONNECTIONS:-}"}" -export POSTGRESQL_LOG_DISCONNECTIONS="${POSTGRESQL_LOG_DISCONNECTIONS:-}" -POSTGRESQL_LOG_HOSTNAME="${POSTGRESQL_LOG_HOSTNAME:-"${POSTGRES_LOG_HOSTNAME:-}"}" -export POSTGRESQL_LOG_HOSTNAME="${POSTGRESQL_LOG_HOSTNAME:-}" -POSTGRESQL_CLIENT_MIN_MESSAGES="${POSTGRESQL_CLIENT_MIN_MESSAGES:-"${POSTGRES_CLIENT_MIN_MESSAGES:-}"}" -export POSTGRESQL_CLIENT_MIN_MESSAGES="${POSTGRESQL_CLIENT_MIN_MESSAGES:-error}" -POSTGRESQL_LOG_LINE_PREFIX="${POSTGRESQL_LOG_LINE_PREFIX:-"${POSTGRES_LOG_LINE_PREFIX:-}"}" -export POSTGRESQL_LOG_LINE_PREFIX="${POSTGRESQL_LOG_LINE_PREFIX:-}" -POSTGRESQL_LOG_TIMEZONE="${POSTGRESQL_LOG_TIMEZONE:-"${POSTGRES_LOG_TIMEZONE:-}"}" -export POSTGRESQL_LOG_TIMEZONE="${POSTGRESQL_LOG_TIMEZONE:-}" -POSTGRESQL_TIMEZONE="${POSTGRESQL_TIMEZONE:-"${POSTGRES_TIMEZONE:-}"}" -export POSTGRESQL_TIMEZONE="${POSTGRESQL_TIMEZONE:-}" -POSTGRESQL_MAX_CONNECTIONS="${POSTGRESQL_MAX_CONNECTIONS:-"${POSTGRES_MAX_CONNECTIONS:-}"}" -export POSTGRESQL_MAX_CONNECTIONS="${POSTGRESQL_MAX_CONNECTIONS:-}" -POSTGRESQL_TCP_KEEPALIVES_IDLE="${POSTGRESQL_TCP_KEEPALIVES_IDLE:-"${POSTGRES_TCP_KEEPALIVES_IDLE:-}"}" -export POSTGRESQL_TCP_KEEPALIVES_IDLE="${POSTGRESQL_TCP_KEEPALIVES_IDLE:-}" -POSTGRESQL_TCP_KEEPALIVES_INTERVAL="${POSTGRESQL_TCP_KEEPALIVES_INTERVAL:-"${POSTGRES_TCP_KEEPALIVES_INTERVAL:-}"}" -export POSTGRESQL_TCP_KEEPALIVES_INTERVAL="${POSTGRESQL_TCP_KEEPALIVES_INTERVAL:-}" -POSTGRESQL_TCP_KEEPALIVES_COUNT="${POSTGRESQL_TCP_KEEPALIVES_COUNT:-"${POSTGRES_TCP_KEEPALIVES_COUNT:-}"}" -export POSTGRESQL_TCP_KEEPALIVES_COUNT="${POSTGRESQL_TCP_KEEPALIVES_COUNT:-}" -POSTGRESQL_STATEMENT_TIMEOUT="${POSTGRESQL_STATEMENT_TIMEOUT:-"${POSTGRES_STATEMENT_TIMEOUT:-}"}" -export POSTGRESQL_STATEMENT_TIMEOUT="${POSTGRESQL_STATEMENT_TIMEOUT:-}" -POSTGRESQL_PGHBA_REMOVE_FILTERS="${POSTGRESQL_PGHBA_REMOVE_FILTERS:-"${POSTGRES_PGHBA_REMOVE_FILTERS:-}"}" -export POSTGRESQL_PGHBA_REMOVE_FILTERS="${POSTGRESQL_PGHBA_REMOVE_FILTERS:-}" -POSTGRESQL_USERNAME_CONNECTION_LIMIT="${POSTGRESQL_USERNAME_CONNECTION_LIMIT:-"${POSTGRES_USER_CONNECTION_LIMIT:-}"}" -export POSTGRESQL_USERNAME_CONNECTION_LIMIT="${POSTGRESQL_USERNAME_CONNECTION_LIMIT:-}" -POSTGRESQL_POSTGRES_CONNECTION_LIMIT="${POSTGRESQL_POSTGRES_CONNECTION_LIMIT:-"${POSTGRES_POSTGRES_CONNECTION_LIMIT:-}"}" -export POSTGRESQL_POSTGRES_CONNECTION_LIMIT="${POSTGRESQL_POSTGRES_CONNECTION_LIMIT:-}" -export POSTGRESQL_WAL_LEVEL="${POSTGRESQL_WAL_LEVEL:-replica}" -export POSTGRESQL_DEFAULT_TOAST_COMPRESSION="${POSTGRESQL_DEFAULT_TOAST_COMPRESSION:-}" -export POSTGRESQL_PASSWORD_ENCRYPTION="${POSTGRESQL_PASSWORD_ENCRYPTION:-}" -export POSTGRESQL_DEFAULT_TRANSACTION_ISOLATION="${POSTGRESQL_DEFAULT_TRANSACTION_ISOLATION:-}" - -# pgAutoFailover settings -export POSTGRESQL_AUTOCTL_VOLUME_DIR="${POSTGRESQL_VOLUME_DIR}/pgautoctl" -export POSTGRESQL_AUTOCTL_CONF_DIR="${POSTGRESQL_AUTOCTL_CONF_DIR:-${POSTGRESQL_AUTOCTL_VOLUME_DIR}/.config}" -export POSTGRESQL_AUTOCTL_MODE="${POSTGRESQL_AUTOCTL_MODE:-postgres}" -export POSTGRESQL_AUTOCTL_MONITOR_HOST="${POSTGRESQL_AUTOCTL_MONITOR_HOST:-monitor}" -export POSTGRESQL_AUTOCTL_HOSTNAME="${POSTGRESQL_AUTOCTL_HOSTNAME:-$(hostname --fqdn)}" - -# pgBackRest settings -export POSTGRESQL_PGBACKREST_VOLUME_DIR="${POSTGRESQL_VOLUME_DIR}/pgbackrest" -export POSTGRESQL_PGBACKREST_LOGS_DIR="${POSTGRESQL_PGBACKREST_VOLUME_DIR}/logs" -export POSTGRESQL_PGBACKREST_BACKUPS_DIR="${POSTGRESQL_PGBACKREST_VOLUME_DIR}/backups" -export POSTGRESQL_PGBACKREST_SPOOL_DIR="${POSTGRESQL_PGBACKREST_VOLUME_DIR}/spool" -export POSTGRESQL_PGBACKREST_CONF_FILE="${POSTGRESQL_DATA_DIR}/pgbackrest.conf" - -# Internal -export POSTGRESQL_FIRST_BOOT="yes" -export NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" - -# Custom environment variables may be defined below diff --git a/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql/entrypoint.sh b/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql/entrypoint.sh deleted file mode 100755 index 8ea9cb4f10ee5..0000000000000 --- a/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql/entrypoint.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -#set -o xtrace - -# Load libraries -. /opt/bitnami/scripts/libbitnami.sh -. /opt/bitnami/scripts/libpostgresql.sh - -# Load PostgreSQL environment variables -. /opt/bitnami/scripts/postgresql-env.sh - -print_welcome_page - -# Enable the nss_wrapper settings -postgresql_enable_nss_wrapper - -if [[ "$*" = *"/opt/bitnami/scripts/postgresql/run.sh"* ]]; then - info "** Starting PostgreSQL setup **" - /opt/bitnami/scripts/postgresql/setup.sh - touch "$POSTGRESQL_TMP_DIR"/.initialized - info "** PostgreSQL setup finished! **" -fi - -echo "" -exec "$@" diff --git a/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql/postunpack.sh b/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql/postunpack.sh deleted file mode 100755 index 544976a70ef04..0000000000000 --- a/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql/postunpack.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -# Load libraries -. /opt/bitnami/scripts/libfs.sh -. /opt/bitnami/scripts/libpostgresql.sh - -# Load PostgreSQL environment variables -. /opt/bitnami/scripts/postgresql-env.sh - -for dir in "$POSTGRESQL_INITSCRIPTS_DIR" "$POSTGRESQL_TMP_DIR" "$POSTGRESQL_LOG_DIR" "$POSTGRESQL_CONF_DIR" "${POSTGRESQL_CONF_DIR}/conf.d" "$POSTGRESQL_MOUNTED_CONF_DIR" "${POSTGRESQL_MOUNTED_CONF_DIR}/conf.d" "$POSTGRESQL_VOLUME_DIR"; do - ensure_dir_exists "$dir" -done - -# Create basic pg_hba.conf for local connections -postgresql_allow_local_connection -# Create basic postgresql.conf -postgresql_create_config - -chmod -R g+rwX "$POSTGRESQL_INITSCRIPTS_DIR" "$POSTGRESQL_TMP_DIR" "$POSTGRESQL_LOG_DIR" "$POSTGRESQL_CONF_DIR" "${POSTGRESQL_CONF_DIR}/conf.d" "$POSTGRESQL_MOUNTED_CONF_DIR" "${POSTGRESQL_MOUNTED_CONF_DIR}/conf.d" "$POSTGRESQL_VOLUME_DIR" - -# Redirect all logging to stdout -ln -sf /dev/stdout "$POSTGRESQL_LOG_DIR/postgresql.log" diff --git a/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql/run-autoctl.sh b/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql/run-autoctl.sh deleted file mode 100755 index ade2e0df20954..0000000000000 --- a/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql/run-autoctl.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load libraries -. /opt/bitnami/scripts/libpostgresql.sh -. /opt/bitnami/scripts/libautoctl.sh -. /opt/bitnami/scripts/libos.sh - -# Load PostgreSQL environment variables -. /opt/bitnami/scripts/postgresql-env.sh - -export HOME="$POSTGRESQL_AUTOCTL_VOLUME_DIR" - -autoctl_initialize - -flags=("run" "--pgdata" "$POSTGRESQL_DATA_DIR") -cmd=$(command -v pg_autoctl) - -info "** Starting PostgreSQL autoctl_node (Mode: $POSTGRESQL_AUTOCTL_MODE) **" -if am_i_root; then - exec_as_user "$POSTGRESQL_DAEMON_USER" "$cmd" "${flags[@]}" -else - PGPASSWORD=$POSTGRESQL_REPLICATION_PASSWORD exec "$cmd" "${flags[@]}" -fi diff --git a/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql/run.sh b/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql/run.sh deleted file mode 100755 index 3273b4adf3883..0000000000000 --- a/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql/run.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail -# set -o xtrace # Uncomment this line for debugging purposes - -# Load libraries -. /opt/bitnami/scripts/libpostgresql.sh -. /opt/bitnami/scripts/libos.sh - -# Load PostgreSQL environment variables -. /opt/bitnami/scripts/postgresql-env.sh - -flags=("-D" "$POSTGRESQL_DATA_DIR" "--config-file=$POSTGRESQL_CONF_FILE" "--external_pid_file=$POSTGRESQL_PID_FILE" "--hba_file=$POSTGRESQL_PGHBA_FILE") - -if [[ -n "${POSTGRESQL_EXTRA_FLAGS:-}" ]]; then - read -r -a extra_flags <<< "$POSTGRESQL_EXTRA_FLAGS" - flags+=("${extra_flags[@]}") -fi - -if [[ -n "${POSTGRESQL_DEFAULT_TRANSACTION_ISOLATION:-}" ]]; then - flags+=("-c" "default_transaction_isolation=$POSTGRESQL_DEFAULT_TRANSACTION_ISOLATION") -fi - -flags+=("$@") - -cmd=$(command -v postgres) - -info "** Starting PostgreSQL **" -if am_i_root; then - exec_as_user "$POSTGRESQL_DAEMON_USER" "$cmd" "${flags[@]}" -else - exec "$cmd" "${flags[@]}" -fi diff --git a/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql/setup.sh b/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql/setup.sh deleted file mode 100755 index d5aa341ce75eb..0000000000000 --- a/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql/setup.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 -# -# Bitnami PostgreSQL setup - -# shellcheck disable=SC1091 - -set -o errexit -set -o nounset -set -o pipefail - -# Load libraries -. /opt/bitnami/scripts/liblog.sh -. /opt/bitnami/scripts/libos.sh -. /opt/bitnami/scripts/libvalidations.sh -. /opt/bitnami/scripts/libpostgresql.sh - -# Load PostgreSQL environment variables -. /opt/bitnami/scripts/postgresql-env.sh - -# Ensure PostgreSQL environment variables settings are valid -postgresql_validate -# Ensure PostgreSQL is stopped when this script ends. -trap "postgresql_stop" EXIT -# Ensure 'daemon' user exists when running as 'root' -am_i_root && ensure_user_exists "$POSTGRESQL_DAEMON_USER" --group "$POSTGRESQL_DAEMON_GROUP" -# Fix logging issue when running as root -am_i_root && chmod o+w "$(readlink /dev/stdout)" -# Remove flags and postmaster files from a previous run -postgresql_clean_from_restart -# Allow running custom pre-initialization scripts -postgresql_custom_pre_init_scripts -# Ensure PostgreSQL is initialized -postgresql_initialize -# Allow running custom initialization scripts -postgresql_custom_init_scripts - -# Allow remote connections once the initialization is finished -if ! postgresql_is_file_external "postgresql.conf" && is_boolean_yes "$POSTGRESQL_ALLOW_REMOTE_CONNECTIONS"; then - info "Enabling remote connections" - postgresql_enable_remote_connections -fi - -# Remove any pg_hba.conf lines that match the given filters -if ! postgresql_is_file_external "pg_hba.conf" && [[ -n "$POSTGRESQL_PGHBA_REMOVE_FILTERS" ]]; then - info "Removing lines that match these filters: ${POSTGRESQL_PGHBA_REMOVE_FILTERS}" - postgresql_remove_pghba_lines -fi diff --git a/bitnami/postgresql/11/debian-11/tags-info.yaml b/bitnami/postgresql/11/debian-11/tags-info.yaml deleted file mode 100644 index a3a447c5293a4..0000000000000 --- a/bitnami/postgresql/11/debian-11/tags-info.yaml +++ /dev/null @@ -1,4 +0,0 @@ -rolling-tags: -- "11" -- 11-debian-11 -- 11.21.0 diff --git a/bitnami/postgresql/12/debian-11/Dockerfile b/bitnami/postgresql/12/debian-11/Dockerfile index 2b5d48304a2fb..4f31b2dd8274d 100644 --- a/bitnami/postgresql/12/debian-11/Dockerfile +++ b/bitnami/postgresql/12/debian-11/Dockerfile @@ -9,13 +9,13 @@ ARG WITH_ALL_LOCALES="no" LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-13T02:01:55Z" \ + org.opencontainers.image.created="2023-11-30T19:03:54Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="12.16.0-debian-11-r54" \ + org.opencontainers.image.ref.name="12.17.0-debian-11-r16" \ org.opencontainers.image.title="postgresql" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="12.16.0" + org.opencontainers.image.version="12.17.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -23,20 +23,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbsd0 libbz2-1.0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libncurses6 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 libzstd1 locales procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "postgresql-12.16.0-10-linux-${OS_ARCH}-debian-11" \ - ) && \ + "postgresql-12.17.0-16-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -52,7 +52,7 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen COPY rootfs / RUN /opt/bitnami/scripts/postgresql/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh -ENV APP_VERSION="12.16.0" \ +ENV APP_VERSION="12.17.0" \ BITNAMI_APP_NAME="postgresql" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ diff --git a/bitnami/postgresql/12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql/12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 883b8216dc451..e2979cea9f5de 100644 --- a/bitnami/postgresql/12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/postgresql/12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "12.16.0-10" + "version": "12.17.0-16" } } \ No newline at end of file diff --git a/bitnami/postgresql/12/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/postgresql/12/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/postgresql/12/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/postgresql/12/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/postgresql/12/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/postgresql/12/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/postgresql/12/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/postgresql/12/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/postgresql/12/debian-11/tags-info.yaml b/bitnami/postgresql/12/debian-11/tags-info.yaml index e58b0e801fc82..1f911e56bed93 100644 --- a/bitnami/postgresql/12/debian-11/tags-info.yaml +++ b/bitnami/postgresql/12/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "12" - 12-debian-11 -- 12.16.0 +- 12.17.0 diff --git a/bitnami/postgresql/13/debian-11/Dockerfile b/bitnami/postgresql/13/debian-11/Dockerfile index 3b8d418148e71..c49c9cf6e78da 100644 --- a/bitnami/postgresql/13/debian-11/Dockerfile +++ b/bitnami/postgresql/13/debian-11/Dockerfile @@ -9,13 +9,13 @@ ARG WITH_ALL_LOCALES="no" LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-13T00:24:39Z" \ + org.opencontainers.image.created="2023-11-30T18:57:19Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="13.12.0-debian-11-r58" \ + org.opencontainers.image.ref.name="13.13.0-debian-11-r16" \ org.opencontainers.image.title="postgresql" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="13.12.0" + org.opencontainers.image.version="13.13.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -23,20 +23,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbsd0 libbz2-1.0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libncurses6 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 libzstd1 locales procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "postgresql-13.12.0-9-linux-${OS_ARCH}-debian-11" \ - ) && \ + "postgresql-13.13.0-16-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -52,7 +52,7 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen COPY rootfs / RUN /opt/bitnami/scripts/postgresql/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh -ENV APP_VERSION="13.12.0" \ +ENV APP_VERSION="13.13.0" \ BITNAMI_APP_NAME="postgresql" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ diff --git a/bitnami/postgresql/13/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql/13/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 4b3a5b935a859..a576dd518eaa9 100644 --- a/bitnami/postgresql/13/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/postgresql/13/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "13.12.0-9" + "version": "13.13.0-16" } } \ No newline at end of file diff --git a/bitnami/postgresql/13/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/postgresql/13/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/postgresql/13/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/postgresql/13/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/postgresql/13/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/postgresql/13/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/postgresql/13/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/postgresql/13/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/postgresql/13/debian-11/tags-info.yaml b/bitnami/postgresql/13/debian-11/tags-info.yaml index 090e8e65819d5..3f104d5d417dc 100644 --- a/bitnami/postgresql/13/debian-11/tags-info.yaml +++ b/bitnami/postgresql/13/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "13" - 13-debian-11 -- 13.12.0 +- 13.13.0 diff --git a/bitnami/postgresql/14/debian-11/Dockerfile b/bitnami/postgresql/14/debian-11/Dockerfile index 4f011c08006a4..2a842b5b26c65 100644 --- a/bitnami/postgresql/14/debian-11/Dockerfile +++ b/bitnami/postgresql/14/debian-11/Dockerfile @@ -9,13 +9,13 @@ ARG WITH_ALL_LOCALES="no" LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-13T02:58:24Z" \ + org.opencontainers.image.created="2023-11-30T19:41:20Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="14.9.0-debian-11-r58" \ + org.opencontainers.image.ref.name="14.10.0-debian-11-r17" \ org.opencontainers.image.title="postgresql" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="14.9.0" + org.opencontainers.image.version="14.10.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -23,20 +23,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbsd0 libbz2-1.0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libncurses6 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 libzstd1 locales procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "postgresql-14.9.0-10-linux-${OS_ARCH}-debian-11" \ - ) && \ + "postgresql-14.10.0-16-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -52,7 +52,7 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen COPY rootfs / RUN /opt/bitnami/scripts/postgresql/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh -ENV APP_VERSION="14.9.0" \ +ENV APP_VERSION="14.10.0" \ BITNAMI_APP_NAME="postgresql" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ diff --git a/bitnami/postgresql/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index fad6ecdd81549..c1df13a9fa118 100644 --- a/bitnami/postgresql/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/postgresql/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "14.9.0-10" + "version": "14.10.0-16" } } \ No newline at end of file diff --git a/bitnami/postgresql/14/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/postgresql/14/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/postgresql/14/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/postgresql/14/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/postgresql/14/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/postgresql/14/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/postgresql/14/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/postgresql/14/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/postgresql/14/debian-11/tags-info.yaml b/bitnami/postgresql/14/debian-11/tags-info.yaml index 0bb49aa70041c..de51d3f056ea2 100644 --- a/bitnami/postgresql/14/debian-11/tags-info.yaml +++ b/bitnami/postgresql/14/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "14" - 14-debian-11 -- 14.9.0 +- 14.10.0 diff --git a/bitnami/postgresql/15/debian-11/Dockerfile b/bitnami/postgresql/15/debian-11/Dockerfile index 1b2b9652e6aba..a264160d82ef2 100644 --- a/bitnami/postgresql/15/debian-11/Dockerfile +++ b/bitnami/postgresql/15/debian-11/Dockerfile @@ -9,13 +9,13 @@ ARG WITH_ALL_LOCALES="no" LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-13T02:39:02Z" \ + org.opencontainers.image.created="2023-11-30T22:33:35Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="15.4.0-debian-11-r54" \ + org.opencontainers.image.ref.name="15.5.0-debian-11-r15" \ org.opencontainers.image.title="postgresql" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="15.4.0" + org.opencontainers.image.version="15.5.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -23,20 +23,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbsd0 libbz2-1.0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libncurses6 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 libzstd1 locales procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "postgresql-15.4.0-10-linux-${OS_ARCH}-debian-11" \ - ) && \ + "postgresql-15.5.0-15-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -52,7 +52,7 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen COPY rootfs / RUN /opt/bitnami/scripts/postgresql/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh -ENV APP_VERSION="15.4.0" \ +ENV APP_VERSION="15.5.0" \ BITNAMI_APP_NAME="postgresql" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ diff --git a/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index b535a38f63264..0e6889dee5bc0 100644 --- a/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "15.4.0-10" + "version": "15.5.0-15" } } \ No newline at end of file diff --git a/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/postgresql/15/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/postgresql/15/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/postgresql/15/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/postgresql/15/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/postgresql/15/debian-11/tags-info.yaml b/bitnami/postgresql/15/debian-11/tags-info.yaml index 563edf6e24881..62105fc239b4a 100644 --- a/bitnami/postgresql/15/debian-11/tags-info.yaml +++ b/bitnami/postgresql/15/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "15" - 15-debian-11 -- 15.4.0 +- 15.5.0 diff --git a/bitnami/postgresql/16/debian-11/Dockerfile b/bitnami/postgresql/16/debian-11/Dockerfile index d420a0fc4ee19..17fe7c2ddbf0a 100644 --- a/bitnami/postgresql/16/debian-11/Dockerfile +++ b/bitnami/postgresql/16/debian-11/Dockerfile @@ -9,13 +9,13 @@ ARG WITH_ALL_LOCALES="no" LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-13T01:02:23Z" \ + org.opencontainers.image.created="2023-11-30T21:08:02Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="16.0.0-debian-11-r13" \ + org.opencontainers.image.ref.name="16.1.0-debian-11-r15" \ org.opencontainers.image.title="postgresql" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="16.0.0" + org.opencontainers.image.version="16.1.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -23,20 +23,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbsd0 libbz2-1.0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 libzstd1 locales procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "postgresql-16.0.0-5-linux-${OS_ARCH}-debian-11" \ - ) && \ + "postgresql-16.1.0-14-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -52,7 +52,7 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen COPY rootfs / RUN /opt/bitnami/scripts/postgresql/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh -ENV APP_VERSION="16.0.0" \ +ENV APP_VERSION="16.1.0" \ BITNAMI_APP_NAME="postgresql" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ diff --git a/bitnami/postgresql/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index ba3d6dc7c6e2a..9c6a6815437b7 100644 --- a/bitnami/postgresql/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/postgresql/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.0.0-5" + "version": "16.1.0-14" } } \ No newline at end of file diff --git a/bitnami/postgresql/16/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/postgresql/16/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/postgresql/16/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/postgresql/16/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/postgresql/16/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/postgresql/16/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/postgresql/16/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/postgresql/16/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/postgresql/16/debian-11/tags-info.yaml b/bitnami/postgresql/16/debian-11/tags-info.yaml index d17a071db1830..04d65fc0aa5b3 100644 --- a/bitnami/postgresql/16/debian-11/tags-info.yaml +++ b/bitnami/postgresql/16/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "16" - 16-debian-11 -- 16.0.0 +- 16.1.0 - latest diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md index ea3afdc0a7540..4caa4ee59cac4 100644 --- a/bitnami/postgresql/README.md +++ b/bitnami/postgresql/README.md @@ -1,4 +1,4 @@ -# PostgreSQL packaged by Bitnami +# Bitnami package for PostgreSQL ## What is PostgreSQL? @@ -27,7 +27,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/postgrest/11/debian-11/Dockerfile b/bitnami/postgrest/11/debian-11/Dockerfile index 84d0b9d0b84bc..8f12a77c387b8 100644 --- a/bitnami/postgrest/11/debian-11/Dockerfile +++ b/bitnami/postgrest/11/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T19:36:16Z" \ + org.opencontainers.image.created="2023-12-14T08:37:32Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="11.2.2-debian-11-r0" \ + org.opencontainers.image.ref.name="11.2.2-debian-11-r3" \ org.opencontainers.image.title="postgrest" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="11.2.2" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN install_packages ca-certificates curl libcom-err2 libffi7 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 libnettle8 libp11-kit0 libpq5 libsasl2-2 libssl1.1 libtasn1-6 libunistring2 procps zlib1g +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "postgrest-11.2.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "postgrest-11.2.2-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/postgrest/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgrest/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 5f3f87ce136f7..65411f4801c11 100644 --- a/bitnami/postgrest/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/postgrest/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.2.2-0" + "version": "11.2.2-1" } } \ No newline at end of file diff --git a/bitnami/postgrest/11/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/postgrest/11/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/postgrest/11/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/postgrest/11/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/postgrest/README.md b/bitnami/postgrest/README.md index 7f31897b49a6f..ccb474461dadf 100644 --- a/bitnami/postgrest/README.md +++ b/bitnami/postgrest/README.md @@ -1,4 +1,4 @@ -# PostgREST packaged by Bitnami +# Bitnami package for PostgREST ## What is PostgREST? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/prestashop/8/debian-11/Dockerfile b/bitnami/prestashop/8/debian-11/Dockerfile index b757ff039775b..1a9b05a9ccc7b 100644 --- a/bitnami/prestashop/8/debian-11/Dockerfile +++ b/bitnami/prestashop/8/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:50:34Z" \ + org.opencontainers.image.created="2023-12-02T11:28:23Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.1.2-debian-11-r8" \ + org.opencontainers.image.ref.name="8.1.2-debian-11-r11" \ org.opencontainers.image.title="prestashop" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="8.1.2" @@ -21,25 +21,25 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.1.24-3-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.57-12-linux-${OS_ARCH}-debian-11" \ - "mysql-client-11.1.2-0-linux-${OS_ARCH}-debian-11" \ - "libphp-8.1.24-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ + "php-8.1.26-4-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.58-1-linux-${OS_ARCH}-debian-11" \ + "mysql-client-11.1.3-0-linux-${OS_ARCH}-debian-11" \ + "libphp-8.1.26-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-3-linux-${OS_ARCH}-debian-11" \ "prestashop-8.1.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/prestashop/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/prestashop/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index ed91525b8334f..15e4ccbfddffe 100644 --- a/bitnami/prestashop/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/prestashop/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,25 +3,25 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.57-12" + "version": "2.4.58-1" }, "libphp": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.24-0" + "version": "8.1.26-0" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.1.2-0" + "version": "11.1.3-0" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.24-3" + "version": "8.1.26-4" }, "prestashop": { "arch": "amd64", @@ -33,6 +33,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-3" } } \ No newline at end of file diff --git a/bitnami/prestashop/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/prestashop/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/prestashop/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/prestashop/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/prestashop/8/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/prestashop/8/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/prestashop/8/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/prestashop/8/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/prestashop/8/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/prestashop/8/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh index 765d1d8ce1ed5..6a480ad4ddde9 100755 --- a/bitnami/prestashop/8/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh +++ b/bitnami/prestashop/8/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh @@ -46,6 +46,7 @@ apache_setup_bitnami_config() { local -a modules_to_disable=( "http2_module" "proxy_hcheck_module" + "proxy_html_module" "proxy_http2_module" ) for module in "${modules_to_disable[@]}"; do diff --git a/bitnami/prestashop/README.md b/bitnami/prestashop/README.md index 54dda180fe9df..6291a5f001682 100644 --- a/bitnami/prestashop/README.md +++ b/bitnami/prestashop/README.md @@ -1,4 +1,4 @@ -# PrestaShop packaged by Bitnami +# Bitnami package for PrestaShop ## What is PrestaShop? @@ -21,7 +21,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/prometheus-operator/0/debian-11/Dockerfile b/bitnami/prometheus-operator/0/debian-11/Dockerfile index 18492ab482599..c200b90adc4e3 100644 --- a/bitnami/prometheus-operator/0/debian-11/Dockerfile +++ b/bitnami/prometheus-operator/0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T07:51:57Z" \ + org.opencontainers.image.created="2023-12-06T20:43:34Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.68.0-debian-11-r27" \ + org.opencontainers.image.ref.name="0.70.0-debian-11-r1" \ org.opencontainers.image.title="prometheus-operator" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.68.0" + org.opencontainers.image.version="0.70.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "prometheus-operator-0.68.0-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "prometheus-operator-0.70.0-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -44,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami RUN ln -sf /opt/bitnami/prometheus-operator/bin/prometheus-config-reloader /bin/prometheus-config-reloader RUN ln -sf /opt/bitnami/prometheus-operator/bin/operator /bin/operator -ENV APP_VERSION="0.68.0" \ +ENV APP_VERSION="0.70.0" \ BITNAMI_APP_NAME="prometheus-operator" \ PATH="/opt/bitnami/prometheus-operator/bin:$PATH" diff --git a/bitnami/prometheus-operator/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/prometheus-operator/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index e85f88cd31271..e92fc4800d032 100644 --- a/bitnami/prometheus-operator/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/prometheus-operator/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.68.0-3" + "version": "0.70.0-1" } } \ No newline at end of file diff --git a/bitnami/prometheus-operator/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/prometheus-operator/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/prometheus-operator/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/prometheus-operator/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/prometheus-operator/0/debian-11/tags-info.yaml b/bitnami/prometheus-operator/0/debian-11/tags-info.yaml index 1acebce8ccdb5..a18247c00f211 100644 --- a/bitnami/prometheus-operator/0/debian-11/tags-info.yaml +++ b/bitnami/prometheus-operator/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.68.0 +- 0.70.0 - latest diff --git a/bitnami/prometheus-operator/README.md b/bitnami/prometheus-operator/README.md index 5e611badece38..3d911f6d22588 100644 --- a/bitnami/prometheus-operator/README.md +++ b/bitnami/prometheus-operator/README.md @@ -1,4 +1,4 @@ -# Prometheus Operator packaged by Bitnami +# Bitnami package for Prometheus Operator ## What is Prometheus Operator? @@ -16,7 +16,7 @@ Deploy [Prometheus Operator](https://github.com/coreos/prometheus-operator/tree/ * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/prometheus-rsocket-proxy/1/debian-11/Dockerfile b/bitnami/prometheus-rsocket-proxy/1/debian-11/Dockerfile index 8ffdce71a7e58..f9eb96e04bd65 100644 --- a/bitnami/prometheus-rsocket-proxy/1/debian-11/Dockerfile +++ b/bitnami/prometheus-rsocket-proxy/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T18:07:02Z" \ + org.opencontainers.image.created="2023-12-09T01:55:01Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.5.2-debian-11-r84" \ + org.opencontainers.image.ref.name="1.5.3-debian-11-r1" \ org.opencontainers.image.title="prometheus-rsocket-proxy" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.5.2" + org.opencontainers.image.version="1.5.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgcc-s1 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-1.8.382-6-6-linux-${OS_ARCH}-debian-11" \ - "prometheus-rsocket-proxy-1.5.2-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-1.8.392-9-8-linux-${OS_ARCH}-debian-11" \ + "prometheus-rsocket-proxy-1.5.3-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -44,7 +44,7 @@ RUN apt-get autoremove --purge -y curl && \ RUN chmod g+rwX /opt/bitnami RUN touch /opt/bitnami/prometheus-rsocket-proxy/prometheus-rsocket-proxy.log && chmod -R g+rwX /opt/bitnami/prometheus-rsocket-proxy -ENV APP_VERSION="1.5.2" \ +ENV APP_VERSION="1.5.3" \ BITNAMI_APP_NAME="prometheus-rsocket-proxy" \ PATH="/opt/bitnami/java/bin:$PATH" diff --git a/bitnami/prometheus-rsocket-proxy/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/prometheus-rsocket-proxy/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index f790664f6d8df..2ff0679ab1615 100644 --- a/bitnami/prometheus-rsocket-proxy/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/prometheus-rsocket-proxy/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.8.382-6-6" + "version": "1.8.392-9-8" }, "prometheus-rsocket-proxy": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.5.2-2" + "version": "1.5.3-0" } } \ No newline at end of file diff --git a/bitnami/prometheus-rsocket-proxy/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/prometheus-rsocket-proxy/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/prometheus-rsocket-proxy/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/prometheus-rsocket-proxy/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/prometheus-rsocket-proxy/1/debian-11/tags-info.yaml b/bitnami/prometheus-rsocket-proxy/1/debian-11/tags-info.yaml index 44ba769482b0d..cad988e8a93fb 100644 --- a/bitnami/prometheus-rsocket-proxy/1/debian-11/tags-info.yaml +++ b/bitnami/prometheus-rsocket-proxy/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.5.2 +- 1.5.3 - latest diff --git a/bitnami/prometheus-rsocket-proxy/README.md b/bitnami/prometheus-rsocket-proxy/README.md index e73b3df279545..b085ba96abb6e 100644 --- a/bitnami/prometheus-rsocket-proxy/README.md +++ b/bitnami/prometheus-rsocket-proxy/README.md @@ -1,4 +1,4 @@ -# Prometheus RSocket Proxy packaged by Bitnami +# Bitnami package for Prometheus RSocket Proxy ## What is Prometheus RSocket Proxy? @@ -21,7 +21,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/prometheus/2/debian-11/Dockerfile b/bitnami/prometheus/2/debian-11/Dockerfile index a17e14fe135fe..8fb43ae8c628f 100644 --- a/bitnami/prometheus/2/debian-11/Dockerfile +++ b/bitnami/prometheus/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-12T21:13:01Z" \ + org.opencontainers.image.created="2023-12-12T13:24:40Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.47.2-debian-11-r0" \ + org.opencontainers.image.ref.name="2.48.1-debian-11-r0" \ org.opencontainers.image.title="prometheus" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.47.2" + org.opencontainers.image.version="2.48.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "prometheus-2.47.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "prometheus-2.48.1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN ln -sf /opt/bitnami/prometheus/data /prometheus RUN chown -R 1001:1001 /opt/bitnami/prometheus RUN mkdir -p /opt/bitnami/prometheus/data/ && chmod g+rwX /opt/bitnami/prometheus/data/ -ENV APP_VERSION="2.47.2" \ +ENV APP_VERSION="2.48.1" \ BITNAMI_APP_NAME="prometheus" \ PATH="/opt/bitnami/prometheus/bin:$PATH" diff --git a/bitnami/prometheus/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/prometheus/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 3895a596cf7b5..bdc5c87c4d72e 100644 --- a/bitnami/prometheus/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/prometheus/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.47.2-0" + "version": "2.48.1-0" } } \ No newline at end of file diff --git a/bitnami/prometheus/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/prometheus/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/prometheus/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/prometheus/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/prometheus/2/debian-11/tags-info.yaml b/bitnami/prometheus/2/debian-11/tags-info.yaml index fccd8f1f69a07..2c39e7dd856db 100644 --- a/bitnami/prometheus/2/debian-11/tags-info.yaml +++ b/bitnami/prometheus/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.47.2 +- 2.48.1 - latest diff --git a/bitnami/prometheus/README.md b/bitnami/prometheus/README.md index 34963eb0683ab..29acf80bd83f7 100644 --- a/bitnami/prometheus/README.md +++ b/bitnami/prometheus/README.md @@ -1,4 +1,4 @@ -# Prometheus packaged by Bitnami +# Bitnami package for Prometheus ## What is Prometheus? @@ -18,7 +18,7 @@ docker run --name prometheus bitnami/prometheus:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/promtail/2/debian-11/Dockerfile b/bitnami/promtail/2/debian-11/Dockerfile index 1672354506b23..0b049604c396a 100644 --- a/bitnami/promtail/2/debian-11/Dockerfile +++ b/bitnami/promtail/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-16T16:48:23Z" \ + org.opencontainers.image.created="2023-12-13T22:54:16Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.9.2-debian-11-r0" \ + org.opencontainers.image.ref.name="2.9.3-debian-11-r0" \ org.opencontainers.image.title="promtail" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.9.2" + org.opencontainers.image.version="2.9.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "promtail-2.9.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "promtail-2.9.3-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="2.9.2" \ +ENV APP_VERSION="2.9.3" \ BITNAMI_APP_NAME="promtail" \ PATH="/opt/bitnami/promtail/bin:$PATH" diff --git a/bitnami/promtail/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/promtail/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8e83ecc3f7799..0bdb82b1c586f 100644 --- a/bitnami/promtail/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/promtail/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.9.2-0" + "version": "2.9.3-0" } } \ No newline at end of file diff --git a/bitnami/promtail/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/promtail/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/promtail/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/promtail/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/promtail/2/debian-11/tags-info.yaml b/bitnami/promtail/2/debian-11/tags-info.yaml index 0a5ea3b1a8061..07fad6e5b8326 100644 --- a/bitnami/promtail/2/debian-11/tags-info.yaml +++ b/bitnami/promtail/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.9.2 +- 2.9.3 - latest diff --git a/bitnami/promtail/README.md b/bitnami/promtail/README.md index e8a0e0ac3136c..5dd343688dd66 100644 --- a/bitnami/promtail/README.md +++ b/bitnami/promtail/README.md @@ -1,4 +1,4 @@ -# Promtail packaged by Bitnami +# Bitnami package for Promtail ## What is Promtail? @@ -18,7 +18,7 @@ docker run --name promtail bitnami/promtail:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/pushgateway/1/debian-11/Dockerfile b/bitnami/pushgateway/1/debian-11/Dockerfile index f91c2cfa6b810..bc806d54d77f7 100644 --- a/bitnami/pushgateway/1/debian-11/Dockerfile +++ b/bitnami/pushgateway/1/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T08:47:01Z" \ + org.opencontainers.image.created="2023-12-07T01:39:33Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.6.2-debian-11-r18" \ + org.opencontainers.image.ref.name="1.6.2-debian-11-r20" \ org.opencontainers.image.title="pushgateway" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.6.2" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "pushgateway-1.6.2-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "pushgateway-1.6.2-5-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/pushgateway/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/pushgateway/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 6ce178fe65d36..63e2bf40e7788 100644 --- a/bitnami/pushgateway/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/pushgateway/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.6.2-3" + "version": "1.6.2-5" } } \ No newline at end of file diff --git a/bitnami/pushgateway/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/pushgateway/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/pushgateway/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/pushgateway/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/pushgateway/README.md b/bitnami/pushgateway/README.md index c337acb36b271..34cf40f7b440c 100644 --- a/bitnami/pushgateway/README.md +++ b/bitnami/pushgateway/README.md @@ -1,4 +1,4 @@ -# Push Gateway packaged by Bitnami +# Bitnami package for Push Gateway ## What is Push Gateway? @@ -18,7 +18,7 @@ docker run --name pushgateway bitnami/pushgateway:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/pymilvus/2/debian-11/Dockerfile b/bitnami/pymilvus/2/debian-11/Dockerfile index 9adc256703e92..fb3a40ccf0ba3 100644 --- a/bitnami/pymilvus/2/debian-11/Dockerfile +++ b/bitnami/pymilvus/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T18:13:59Z" \ + org.opencontainers.image.created="2023-12-04T20:15:26Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.3.1-debian-11-r12" \ + org.opencontainers.image.ref.name="2.3.4-debian-11-r0" \ org.opencontainers.image.title="pymilvus" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.3.1" + org.opencontainers.image.version="2.3.4" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.8.18-2-linux-${OS_ARCH}-debian-11" \ - "pymilvus-2.3.1-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.6-12-linux-${OS_ARCH}-debian-11" \ + "pymilvus-2.3.4-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -45,7 +45,7 @@ RUN useradd -r -u 1001 -g root pymilvus RUN mkdir /.local && chmod g+rwX /.local RUN mkdir /app && chmod g+rwX /app -ENV APP_VERSION="2.3.1" \ +ENV APP_VERSION="2.3.4" \ BITNAMI_APP_NAME="pymilvus" \ PATH="/opt/bitnami/python/bin:$PATH" diff --git a/bitnami/pymilvus/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/pymilvus/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 944a43b21265f..38edfc2d0dc16 100644 --- a/bitnami/pymilvus/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/pymilvus/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.3.1-0" + "version": "2.3.4-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.8.18-2" + "version": "3.11.6-12" } } \ No newline at end of file diff --git a/bitnami/pymilvus/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/pymilvus/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/pymilvus/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/pymilvus/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/pymilvus/2/debian-11/tags-info.yaml b/bitnami/pymilvus/2/debian-11/tags-info.yaml index 95be3f4e047f1..be3c6ce460a94 100644 --- a/bitnami/pymilvus/2/debian-11/tags-info.yaml +++ b/bitnami/pymilvus/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.3.1 +- 2.3.4 - latest diff --git a/bitnami/pymilvus/README.md b/bitnami/pymilvus/README.md index bafd11a92cdae..065b95b3f33ea 100644 --- a/bitnami/pymilvus/README.md +++ b/bitnami/pymilvus/README.md @@ -1,4 +1,4 @@ -# PyMilvus packaged by Bitnami +# Bitnami package for PyMilvus ## What is PyMilvus? @@ -22,12 +22,12 @@ docker-compose up -d ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use PyMilvus in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. @@ -90,7 +90,7 @@ If your PyMilvus app has a `requirements.txt` defining your app's dependencies, ```console docker run -it --name pymilvus -v /path/to/app:/app bitnami/pymilvus \ - sh -c "pip install --file requirements.txt && python script.py" + sh -c "pip install -r requirements.txt && python script.py" ``` **Further Reading:** diff --git a/bitnami/python/3.10/debian-11/Dockerfile b/bitnami/python/3.10/debian-11/Dockerfile index 7b7de6c5b1e6f..199c784c1ebad 100644 --- a/bitnami/python/3.10/debian-11/Dockerfile +++ b/bitnami/python/3.10/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-26T11:16:04Z" \ + org.opencontainers.image.created="2023-12-18T10:11:06Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.10.13-debian-11-r42" \ + org.opencontainers.image.ref.name="3.10.13-debian-11-r49" \ org.opencontainers.image.title="python" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.10.13" @@ -20,20 +20,20 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages build-essential ca-certificates curl git libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libsqlite3-dev libssl-dev libssl1.1 libtinfo6 libtirpc3 pkg-config procps unzip wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.10.13-8-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.10.13-14-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/python/3.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/python/3.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 4d68abad780dd..3de65169d41fe 100644 --- a/bitnami/python/3.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/python/3.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.10.13-8" + "version": "3.10.13-14" } } \ No newline at end of file diff --git a/bitnami/python/3.10/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/python/3.10/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/python/3.10/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/python/3.10/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/python/3.11/debian-11/Dockerfile b/bitnami/python/3.11/debian-11/Dockerfile index 6ad5657df4112..13f650e2ec762 100644 --- a/bitnami/python/3.11/debian-11/Dockerfile +++ b/bitnami/python/3.11/debian-11/Dockerfile @@ -7,33 +7,33 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-26T21:03:09Z" \ + org.opencontainers.image.created="2023-12-18T13:16:26Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.11.6-debian-11-r10" \ + org.opencontainers.image.ref.name="3.11.7-debian-11-r2" \ org.opencontainers.image.title="python" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="3.11.6" + org.opencontainers.image.version="3.11.7" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages build-essential ca-certificates curl git libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libsqlite3-dev libssl-dev libssl1.1 libtinfo6 libtirpc3 pkg-config procps unzip wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-8-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.7-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -42,7 +42,7 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ sed -i 's/^PASS_MIN_DAYS.*/PASS_MIN_DAYS 0/' /etc/login.defs && \ sed -i 's/sha512/sha512 minlen=8/' /etc/pam.d/common-password -ENV APP_VERSION="3.11.6" \ +ENV APP_VERSION="3.11.7" \ BITNAMI_APP_NAME="python" \ PATH="/opt/bitnami/python/bin:$PATH" diff --git a/bitnami/python/3.11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/python/3.11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 7a548c020921f..6a17ad645b243 100644 --- a/bitnami/python/3.11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/python/3.11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-8" + "version": "3.11.7-2" } } \ No newline at end of file diff --git a/bitnami/python/3.11/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/python/3.11/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/python/3.11/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/python/3.11/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/python/3.11/debian-11/tags-info.yaml b/bitnami/python/3.11/debian-11/tags-info.yaml index e8d5fc8014fa9..24eb69e261e60 100644 --- a/bitnami/python/3.11/debian-11/tags-info.yaml +++ b/bitnami/python/3.11/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "3.11" - 3.11-debian-11 -- 3.11.6 +- 3.11.7 diff --git a/bitnami/python/3.12/debian-11/Dockerfile b/bitnami/python/3.12/debian-11/Dockerfile index 86f6d76fd1646..95080ba4e2041 100644 --- a/bitnami/python/3.12/debian-11/Dockerfile +++ b/bitnami/python/3.12/debian-11/Dockerfile @@ -7,33 +7,33 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-26T19:57:31Z" \ + org.opencontainers.image.created="2023-12-18T13:26:23Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.12.0-debian-11-r5" \ + org.opencontainers.image.ref.name="3.12.1-debian-11-r2" \ org.opencontainers.image.title="python" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="3.12.0" + org.opencontainers.image.version="3.12.1" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages build-essential ca-certificates curl git libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libsqlite3-dev libssl-dev libssl1.1 libtinfo6 libtirpc3 pkg-config procps unzip wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.12.0-5-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.12.1-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -42,7 +42,7 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ sed -i 's/^PASS_MIN_DAYS.*/PASS_MIN_DAYS 0/' /etc/login.defs && \ sed -i 's/sha512/sha512 minlen=8/' /etc/pam.d/common-password -ENV APP_VERSION="3.12.0" \ +ENV APP_VERSION="3.12.1" \ BITNAMI_APP_NAME="python" \ PATH="/opt/bitnami/python/bin:$PATH" diff --git a/bitnami/python/3.12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/python/3.12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 93d4a976dcef8..5a9d3832e7885 100644 --- a/bitnami/python/3.12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/python/3.12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.12.0-5" + "version": "3.12.1-2" } } \ No newline at end of file diff --git a/bitnami/python/3.12/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/python/3.12/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/python/3.12/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/python/3.12/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/python/3.12/debian-11/tags-info.yaml b/bitnami/python/3.12/debian-11/tags-info.yaml index 3e519decd407a..b667b86ea255b 100644 --- a/bitnami/python/3.12/debian-11/tags-info.yaml +++ b/bitnami/python/3.12/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "3.12" - 3.12-debian-11 -- 3.12.0 +- 3.12.1 - latest diff --git a/bitnami/python/3.8/debian-11/Dockerfile b/bitnami/python/3.8/debian-11/Dockerfile index 4c220c890e0f9..af75e08ab0ef8 100644 --- a/bitnami/python/3.8/debian-11/Dockerfile +++ b/bitnami/python/3.8/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-26T19:51:34Z" \ + org.opencontainers.image.created="2023-12-18T14:38:58Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.8.18-debian-11-r43" \ + org.opencontainers.image.ref.name="3.8.18-debian-11-r51" \ org.opencontainers.image.title="python" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.8.18" @@ -20,20 +20,20 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages build-essential ca-certificates curl git libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libsqlite3-dev libssl-dev libssl1.1 libtinfo6 libtirpc3 pkg-config procps unzip wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.8.18-8-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.8.18-15-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/python/3.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/python/3.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index d3aacba84a56e..1a4499a9bc5da 100644 --- a/bitnami/python/3.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/python/3.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.8.18-8" + "version": "3.8.18-15" } } \ No newline at end of file diff --git a/bitnami/python/3.8/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/python/3.8/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/python/3.8/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/python/3.8/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/python/3.9/debian-11/Dockerfile b/bitnami/python/3.9/debian-11/Dockerfile index c2870b144451c..ed3c258a67e32 100644 --- a/bitnami/python/3.9/debian-11/Dockerfile +++ b/bitnami/python/3.9/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-26T20:47:08Z" \ + org.opencontainers.image.created="2023-12-18T13:49:02Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.9.18-debian-11-r44" \ + org.opencontainers.image.ref.name="3.9.18-debian-11-r52" \ org.opencontainers.image.title="python" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.9.18" @@ -20,20 +20,20 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages build-essential ca-certificates curl git libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libsqlite3-dev libssl-dev libssl1.1 libtinfo6 libtirpc3 pkg-config procps unzip wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.9.18-9-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.9.18-16-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/python/3.9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/python/3.9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 6b7b881a82b4c..a57ca117a1e50 100644 --- a/bitnami/python/3.9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/python/3.9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.9.18-9" + "version": "3.9.18-16" } } \ No newline at end of file diff --git a/bitnami/python/3.9/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/python/3.9/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/python/3.9/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/python/3.9/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/python/README.md b/bitnami/python/README.md index f904fdd027465..888fc367882db 100644 --- a/bitnami/python/README.md +++ b/bitnami/python/README.md @@ -1,4 +1,4 @@ -# Python packaged by Bitnami +# Bitnami package for Python ## What is Python? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/pytorch/2/debian-11/Dockerfile b/bitnami/pytorch/2/debian-11/Dockerfile index 0fd4e0390d8d6..d15b0650f7254 100644 --- a/bitnami/pytorch/2/debian-11/Dockerfile +++ b/bitnami/pytorch/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-26T12:55:44Z" \ + org.opencontainers.image.created="2023-12-15T11:05:45Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.1.0-debian-11-r2" \ + org.opencontainers.image.ref.name="2.1.2-debian-11-r0" \ org.opencontainers.image.title="pytorch" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.1.0" + org.opencontainers.image.version="2.1.2" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgomp1 libgssapi-krb5-2 libjemalloc2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 numactl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-7-linux-${OS_ARCH}-debian-11" \ - "pytorch-2.1.0-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.7-0-linux-${OS_ARCH}-debian-11" \ + "pytorch-2.1.2-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN mkdir /.local && chmod g+rwX /.local COPY rootfs / RUN /opt/bitnami/scripts/pytorch/postunpack.sh -ENV APP_VERSION="2.1.0" \ +ENV APP_VERSION="2.1.2" \ BITNAMI_APP_NAME="pytorch" \ PATH="/opt/bitnami/python/bin:$PATH" diff --git a/bitnami/pytorch/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/pytorch/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index eee97339f824f..573bcf7cec122 100644 --- a/bitnami/pytorch/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/pytorch/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-7" + "version": "3.11.7-0" }, "pytorch": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.1.0-2" + "version": "2.1.2-0" } } \ No newline at end of file diff --git a/bitnami/pytorch/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/pytorch/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/pytorch/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/pytorch/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/pytorch/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/pytorch/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/pytorch/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/pytorch/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/pytorch/2/debian-11/tags-info.yaml b/bitnami/pytorch/2/debian-11/tags-info.yaml index e5f53c178e290..78c8c246c933e 100644 --- a/bitnami/pytorch/2/debian-11/tags-info.yaml +++ b/bitnami/pytorch/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.1.0 +- 2.1.2 - latest diff --git a/bitnami/pytorch/README.md b/bitnami/pytorch/README.md index aac53ed8ae42c..72de461b8d3bc 100644 --- a/bitnami/pytorch/README.md +++ b/bitnami/pytorch/README.md @@ -1,4 +1,4 @@ -# PyTorch packaged by Bitnami +# Bitnami package for PyTorch ## What is PyTorch? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/rabbitmq-cluster-operator/2/debian-11/Dockerfile b/bitnami/rabbitmq-cluster-operator/2/debian-11/Dockerfile index f90ae002fb386..b8dcd637bed17 100644 --- a/bitnami/rabbitmq-cluster-operator/2/debian-11/Dockerfile +++ b/bitnami/rabbitmq-cluster-operator/2/debian-11/Dockerfile @@ -8,21 +8,21 @@ ARG TARGETARCH ENV OS_ARCH="${TARGETARCH:-amd64}" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "rabbitmq-cluster-operator-2.5.0-3-linux-${OS_ARCH}-debian-11" \ - ) && \ + "rabbitmq-cluster-operator-2.6.0-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done @@ -36,19 +36,19 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="scratch" \ - org.opencontainers.image.created="2023-10-11T08:13:17Z" \ + org.opencontainers.image.created="2023-12-06T23:28:46Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.5.0-debian-11-r37" \ + org.opencontainers.image.ref.name="2.6.0-debian-11-r1" \ org.opencontainers.image.title="rabbitmq-cluster-operator" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.5.0" + org.opencontainers.image.version="2.6.0" COPY prebuildfs / COPY rootfs / COPY --from=builder /opt/bitnami/rabbitmq-cluster-operator/bin/manager /manager -ENV APP_VERSION="2.5.0" \ +ENV APP_VERSION="2.6.0" \ BITNAMI_APP_NAME="rabbitmq-cluster-operator" USER 1001 diff --git a/bitnami/rabbitmq-cluster-operator/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/rabbitmq-cluster-operator/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c49aecdcf8bca..8e651a9b31f7f 100644 --- a/bitnami/rabbitmq-cluster-operator/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/rabbitmq-cluster-operator/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.5.0-3" + "version": "2.6.0-1" } } \ No newline at end of file diff --git a/bitnami/rabbitmq-cluster-operator/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/rabbitmq-cluster-operator/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/rabbitmq-cluster-operator/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/rabbitmq-cluster-operator/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/rabbitmq-cluster-operator/2/debian-11/tags-info.yaml b/bitnami/rabbitmq-cluster-operator/2/debian-11/tags-info.yaml index 5c25042613fef..53f6ccbfbafe5 100644 --- a/bitnami/rabbitmq-cluster-operator/2/debian-11/tags-info.yaml +++ b/bitnami/rabbitmq-cluster-operator/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.5.0 +- 2.6.0 - latest diff --git a/bitnami/rabbitmq-cluster-operator/README.md b/bitnami/rabbitmq-cluster-operator/README.md index 0144148c6cbb1..9a1b9151b4e80 100644 --- a/bitnami/rabbitmq-cluster-operator/README.md +++ b/bitnami/rabbitmq-cluster-operator/README.md @@ -1,4 +1,4 @@ -# RabbitMQ Cluster Operator packaged by Bitnami +# Bitnami package for RabbitMQ Cluster Operator ## What is RabbitMQ Cluster Operator? @@ -15,12 +15,12 @@ docker run --name rabbitmq-cluster-operator bitnami/rabbitmq-cluster-operator:la ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use RabbitMQ Cluster Operator in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/rabbitmq/3.10/debian-11/Dockerfile b/bitnami/rabbitmq/3.10/debian-11/Dockerfile index 027379a91d12f..282b1d017c5bd 100644 --- a/bitnami/rabbitmq/3.10/debian-11/Dockerfile +++ b/bitnami/rabbitmq/3.10/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:51:02Z" \ + org.opencontainers.image.created="2023-12-17T11:11:09Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.10.25-debian-11-r71" \ + org.opencontainers.image.ref.name="3.10.25-debian-11-r76" \ org.opencontainers.image.title="rabbitmq" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.10.25" @@ -22,21 +22,21 @@ ENV HOME="/opt/bitnami/rabbitmq/.rabbitmq" \ PATH="/opt/bitnami/erlang/bin:/opt/bitnami/rabbitmq/sbin:$PATH" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgcc-s1 libssl1.1 libstdc++6 libtinfo6 locales procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "erlang-25.3.2-6-0-linux-${OS_ARCH}-debian-11" \ - "rabbitmq-3.10.25-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "erlang-25.3.2-7-2-linux-${OS_ARCH}-debian-11" \ + "rabbitmq-3.10.25-4-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index e62ee42edd73c..519e4e3f9165b 100644 --- a/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "25.3.2-6-0" + "version": "25.3.2-7-2" }, "rabbitmq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.10.25-2" + "version": "3.10.25-4" } } \ No newline at end of file diff --git a/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/rabbitmq/3.10/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/rabbitmq/3.10/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/rabbitmq/3.10/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/rabbitmq/3.10/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/rabbitmq/3.10/debian-11/rootfs/opt/bitnami/scripts/librabbitmq.sh b/bitnami/rabbitmq/3.10/debian-11/rootfs/opt/bitnami/scripts/librabbitmq.sh index c23b729563563..c8205f2f014df 100644 --- a/bitnami/rabbitmq/3.10/debian-11/rootfs/opt/bitnami/scripts/librabbitmq.sh +++ b/bitnami/rabbitmq/3.10/debian-11/rootfs/opt/bitnami/scripts/librabbitmq.sh @@ -277,8 +277,17 @@ rabbitmq_print_management_configuration() { # Assume SSL is disabled when no environment variables matching 'RABBITMQ_SSL_*' have been specified echo "management.tcp.ip = ${RABBITMQ_MANAGEMENT_BIND_IP}" echo "management.tcp.port = ${RABBITMQ_MANAGEMENT_PORT_NUMBER}" - echo fi + + # Allow access to web UI + if is_boolean_yes "$RABBITMQ_MANAGEMENT_ALLOW_WEB_ACCESS"; then + echo "loopback_users.${RABBITMQ_USERNAME} = false" + else + echo "loopback_users.${RABBITMQ_USERNAME} = true" + fi + + # End config file section + echo } ######################## diff --git a/bitnami/rabbitmq/3.10/debian-11/rootfs/opt/bitnami/scripts/rabbitmq-env.sh b/bitnami/rabbitmq/3.10/debian-11/rootfs/opt/bitnami/scripts/rabbitmq-env.sh index bf8aa49305aae..df0d413f41b64 100644 --- a/bitnami/rabbitmq/3.10/debian-11/rootfs/opt/bitnami/scripts/rabbitmq-env.sh +++ b/bitnami/rabbitmq/3.10/debian-11/rootfs/opt/bitnami/scripts/rabbitmq-env.sh @@ -36,6 +36,7 @@ rabbitmq_env_vars=( RABBITMQ_LOAD_DEFINITIONS RABBITMQ_MANAGEMENT_BIND_IP RABBITMQ_MANAGEMENT_PORT_NUMBER + RABBITMQ_MANAGEMENT_ALLOW_WEB_ACCESS RABBITMQ_NODE_NAME RABBITMQ_USE_LONGNAME RABBITMQ_NODE_PORT_NUMBER @@ -126,6 +127,7 @@ RABBITMQ_MANAGEMENT_BIND_IP="${RABBITMQ_MANAGEMENT_BIND_IP:-"${RABBITMQ_MANAGER_ export RABBITMQ_MANAGEMENT_BIND_IP="${RABBITMQ_MANAGEMENT_BIND_IP:-0.0.0.0}" RABBITMQ_MANAGEMENT_PORT_NUMBER="${RABBITMQ_MANAGEMENT_PORT_NUMBER:-"${RABBITMQ_MANAGER_PORT_NUMBER:-}"}" export RABBITMQ_MANAGEMENT_PORT_NUMBER="${RABBITMQ_MANAGEMENT_PORT_NUMBER:-15672}" +export RABBITMQ_MANAGEMENT_ALLOW_WEB_ACCESS="${RABBITMQ_MANAGEMENT_ALLOW_WEB_ACCESS:-false}" export RABBITMQ_NODE_NAME="${RABBITMQ_NODE_NAME:-rabbit@localhost}" export RABBITMQ_USE_LONGNAME="${RABBITMQ_USE_LONGNAME:-false}" export RABBITMQ_NODE_PORT_NUMBER="${RABBITMQ_NODE_PORT_NUMBER:-5672}" diff --git a/bitnami/rabbitmq/3.11/debian-11/Dockerfile b/bitnami/rabbitmq/3.11/debian-11/Dockerfile index b0a6fb77c6c34..e1b9dfcddec06 100644 --- a/bitnami/rabbitmq/3.11/debian-11/Dockerfile +++ b/bitnami/rabbitmq/3.11/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-18T01:14:32Z" \ + org.opencontainers.image.created="2023-12-17T10:56:11Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.11.24-debian-11-r0" \ + org.opencontainers.image.ref.name="3.11.27-debian-11-r1" \ org.opencontainers.image.title="rabbitmq" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="3.11.24" + org.opencontainers.image.version="3.11.27" ENV HOME="/opt/bitnami/rabbitmq/.rabbitmq" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,21 +22,21 @@ ENV HOME="/opt/bitnami/rabbitmq/.rabbitmq" \ PATH="/opt/bitnami/erlang/bin:/opt/bitnami/rabbitmq/sbin:$PATH" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgcc-s1 libssl1.1 libstdc++6 libtinfo6 locales procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "erlang-25.3.2-7-0-linux-${OS_ARCH}-debian-11" \ - "rabbitmq-3.11.24-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "erlang-25.3.2-7-2-linux-${OS_ARCH}-debian-11" \ + "rabbitmq-3.11.27-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -51,7 +51,7 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen COPY rootfs / RUN /opt/bitnami/scripts/rabbitmq/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh -ENV APP_VERSION="3.11.24" \ +ENV APP_VERSION="3.11.27" \ BITNAMI_APP_NAME="rabbitmq" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" diff --git a/bitnami/rabbitmq/3.11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/rabbitmq/3.11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 9e8af7a653ac0..9403a5c7bed56 100644 --- a/bitnami/rabbitmq/3.11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/rabbitmq/3.11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "25.3.2-7-0" + "version": "25.3.2-7-2" }, "rabbitmq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.24-0" + "version": "3.11.27-1" } } \ No newline at end of file diff --git a/bitnami/rabbitmq/3.11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/rabbitmq/3.11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/rabbitmq/3.11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/rabbitmq/3.11/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/rabbitmq/3.11/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/rabbitmq/3.11/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/rabbitmq/3.11/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/rabbitmq/3.11/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/rabbitmq/3.11/debian-11/rootfs/opt/bitnami/scripts/librabbitmq.sh b/bitnami/rabbitmq/3.11/debian-11/rootfs/opt/bitnami/scripts/librabbitmq.sh index c23b729563563..c8205f2f014df 100644 --- a/bitnami/rabbitmq/3.11/debian-11/rootfs/opt/bitnami/scripts/librabbitmq.sh +++ b/bitnami/rabbitmq/3.11/debian-11/rootfs/opt/bitnami/scripts/librabbitmq.sh @@ -277,8 +277,17 @@ rabbitmq_print_management_configuration() { # Assume SSL is disabled when no environment variables matching 'RABBITMQ_SSL_*' have been specified echo "management.tcp.ip = ${RABBITMQ_MANAGEMENT_BIND_IP}" echo "management.tcp.port = ${RABBITMQ_MANAGEMENT_PORT_NUMBER}" - echo fi + + # Allow access to web UI + if is_boolean_yes "$RABBITMQ_MANAGEMENT_ALLOW_WEB_ACCESS"; then + echo "loopback_users.${RABBITMQ_USERNAME} = false" + else + echo "loopback_users.${RABBITMQ_USERNAME} = true" + fi + + # End config file section + echo } ######################## diff --git a/bitnami/rabbitmq/3.11/debian-11/rootfs/opt/bitnami/scripts/rabbitmq-env.sh b/bitnami/rabbitmq/3.11/debian-11/rootfs/opt/bitnami/scripts/rabbitmq-env.sh index bf8aa49305aae..df0d413f41b64 100644 --- a/bitnami/rabbitmq/3.11/debian-11/rootfs/opt/bitnami/scripts/rabbitmq-env.sh +++ b/bitnami/rabbitmq/3.11/debian-11/rootfs/opt/bitnami/scripts/rabbitmq-env.sh @@ -36,6 +36,7 @@ rabbitmq_env_vars=( RABBITMQ_LOAD_DEFINITIONS RABBITMQ_MANAGEMENT_BIND_IP RABBITMQ_MANAGEMENT_PORT_NUMBER + RABBITMQ_MANAGEMENT_ALLOW_WEB_ACCESS RABBITMQ_NODE_NAME RABBITMQ_USE_LONGNAME RABBITMQ_NODE_PORT_NUMBER @@ -126,6 +127,7 @@ RABBITMQ_MANAGEMENT_BIND_IP="${RABBITMQ_MANAGEMENT_BIND_IP:-"${RABBITMQ_MANAGER_ export RABBITMQ_MANAGEMENT_BIND_IP="${RABBITMQ_MANAGEMENT_BIND_IP:-0.0.0.0}" RABBITMQ_MANAGEMENT_PORT_NUMBER="${RABBITMQ_MANAGEMENT_PORT_NUMBER:-"${RABBITMQ_MANAGER_PORT_NUMBER:-}"}" export RABBITMQ_MANAGEMENT_PORT_NUMBER="${RABBITMQ_MANAGEMENT_PORT_NUMBER:-15672}" +export RABBITMQ_MANAGEMENT_ALLOW_WEB_ACCESS="${RABBITMQ_MANAGEMENT_ALLOW_WEB_ACCESS:-false}" export RABBITMQ_NODE_NAME="${RABBITMQ_NODE_NAME:-rabbit@localhost}" export RABBITMQ_USE_LONGNAME="${RABBITMQ_USE_LONGNAME:-false}" export RABBITMQ_NODE_PORT_NUMBER="${RABBITMQ_NODE_PORT_NUMBER:-5672}" diff --git a/bitnami/rabbitmq/3.11/debian-11/tags-info.yaml b/bitnami/rabbitmq/3.11/debian-11/tags-info.yaml index 2adb5865e5eca..3e11520e09e8a 100644 --- a/bitnami/rabbitmq/3.11/debian-11/tags-info.yaml +++ b/bitnami/rabbitmq/3.11/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "3.11" - 3.11-debian-11 -- 3.11.24 +- 3.11.27 diff --git a/bitnami/rabbitmq/3.12/debian-11/Dockerfile b/bitnami/rabbitmq/3.12/debian-11/Dockerfile index 9a263503f16ed..4943704872b5f 100644 --- a/bitnami/rabbitmq/3.12/debian-11/Dockerfile +++ b/bitnami/rabbitmq/3.12/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-18T01:29:04Z" \ + org.opencontainers.image.created="2023-12-17T11:01:25Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.12.7-debian-11-r0" \ + org.opencontainers.image.ref.name="3.12.10-debian-11-r3" \ org.opencontainers.image.title="rabbitmq" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="3.12.7" + org.opencontainers.image.version="3.12.10" ENV HOME="/opt/bitnami/rabbitmq/.rabbitmq" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,21 +22,21 @@ ENV HOME="/opt/bitnami/rabbitmq/.rabbitmq" \ PATH="/opt/bitnami/erlang/bin:/opt/bitnami/rabbitmq/sbin:$PATH" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgcc-s1 libssl1.1 libstdc++6 libtinfo6 locales procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "erlang-26.1.2-0-linux-${OS_ARCH}-debian-11" \ - "rabbitmq-3.12.7-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "erlang-26.2.0-0-linux-${OS_ARCH}-debian-11" \ + "rabbitmq-3.12.10-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -51,7 +51,7 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen COPY rootfs / RUN /opt/bitnami/scripts/rabbitmq/postunpack.sh RUN /opt/bitnami/scripts/locales/add-extra-locales.sh -ENV APP_VERSION="3.12.7" \ +ENV APP_VERSION="3.12.10" \ BITNAMI_APP_NAME="rabbitmq" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" diff --git a/bitnami/rabbitmq/3.12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/rabbitmq/3.12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 186a99a75948e..97e74ea531831 100644 --- a/bitnami/rabbitmq/3.12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/rabbitmq/3.12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "26.1.2-0" + "version": "26.2.0-0" }, "rabbitmq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.12.7-0" + "version": "3.12.10-1" } } \ No newline at end of file diff --git a/bitnami/rabbitmq/3.12/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/rabbitmq/3.12/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/rabbitmq/3.12/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/rabbitmq/3.12/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/rabbitmq/3.12/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/rabbitmq/3.12/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/rabbitmq/3.12/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/rabbitmq/3.12/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/rabbitmq/3.12/debian-11/rootfs/opt/bitnami/scripts/librabbitmq.sh b/bitnami/rabbitmq/3.12/debian-11/rootfs/opt/bitnami/scripts/librabbitmq.sh index c23b729563563..c8205f2f014df 100644 --- a/bitnami/rabbitmq/3.12/debian-11/rootfs/opt/bitnami/scripts/librabbitmq.sh +++ b/bitnami/rabbitmq/3.12/debian-11/rootfs/opt/bitnami/scripts/librabbitmq.sh @@ -277,8 +277,17 @@ rabbitmq_print_management_configuration() { # Assume SSL is disabled when no environment variables matching 'RABBITMQ_SSL_*' have been specified echo "management.tcp.ip = ${RABBITMQ_MANAGEMENT_BIND_IP}" echo "management.tcp.port = ${RABBITMQ_MANAGEMENT_PORT_NUMBER}" - echo fi + + # Allow access to web UI + if is_boolean_yes "$RABBITMQ_MANAGEMENT_ALLOW_WEB_ACCESS"; then + echo "loopback_users.${RABBITMQ_USERNAME} = false" + else + echo "loopback_users.${RABBITMQ_USERNAME} = true" + fi + + # End config file section + echo } ######################## diff --git a/bitnami/rabbitmq/3.12/debian-11/rootfs/opt/bitnami/scripts/rabbitmq-env.sh b/bitnami/rabbitmq/3.12/debian-11/rootfs/opt/bitnami/scripts/rabbitmq-env.sh index bf8aa49305aae..df0d413f41b64 100644 --- a/bitnami/rabbitmq/3.12/debian-11/rootfs/opt/bitnami/scripts/rabbitmq-env.sh +++ b/bitnami/rabbitmq/3.12/debian-11/rootfs/opt/bitnami/scripts/rabbitmq-env.sh @@ -36,6 +36,7 @@ rabbitmq_env_vars=( RABBITMQ_LOAD_DEFINITIONS RABBITMQ_MANAGEMENT_BIND_IP RABBITMQ_MANAGEMENT_PORT_NUMBER + RABBITMQ_MANAGEMENT_ALLOW_WEB_ACCESS RABBITMQ_NODE_NAME RABBITMQ_USE_LONGNAME RABBITMQ_NODE_PORT_NUMBER @@ -126,6 +127,7 @@ RABBITMQ_MANAGEMENT_BIND_IP="${RABBITMQ_MANAGEMENT_BIND_IP:-"${RABBITMQ_MANAGER_ export RABBITMQ_MANAGEMENT_BIND_IP="${RABBITMQ_MANAGEMENT_BIND_IP:-0.0.0.0}" RABBITMQ_MANAGEMENT_PORT_NUMBER="${RABBITMQ_MANAGEMENT_PORT_NUMBER:-"${RABBITMQ_MANAGER_PORT_NUMBER:-}"}" export RABBITMQ_MANAGEMENT_PORT_NUMBER="${RABBITMQ_MANAGEMENT_PORT_NUMBER:-15672}" +export RABBITMQ_MANAGEMENT_ALLOW_WEB_ACCESS="${RABBITMQ_MANAGEMENT_ALLOW_WEB_ACCESS:-false}" export RABBITMQ_NODE_NAME="${RABBITMQ_NODE_NAME:-rabbit@localhost}" export RABBITMQ_USE_LONGNAME="${RABBITMQ_USE_LONGNAME:-false}" export RABBITMQ_NODE_PORT_NUMBER="${RABBITMQ_NODE_PORT_NUMBER:-5672}" diff --git a/bitnami/rabbitmq/3.12/debian-11/tags-info.yaml b/bitnami/rabbitmq/3.12/debian-11/tags-info.yaml index a2f9600462b7b..4178304d46dce 100644 --- a/bitnami/rabbitmq/3.12/debian-11/tags-info.yaml +++ b/bitnami/rabbitmq/3.12/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "3.12" - 3.12-debian-11 -- 3.12.7 +- 3.12.10 - latest diff --git a/bitnami/rabbitmq/README.md b/bitnami/rabbitmq/README.md index c7f7af99d8d5d..ee57413e3d2af 100644 --- a/bitnami/rabbitmq/README.md +++ b/bitnami/rabbitmq/README.md @@ -1,4 +1,4 @@ -# RabbitMQ packaged by Bitnami +# Bitnami package for RabbitMQ ## What is RabbitMQ? @@ -27,7 +27,7 @@ You can find the default credentials and available configuration options in the * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. @@ -207,6 +207,7 @@ Available variables: * `RABBITMQ_MANAGEMENT_BIND_IP`: RabbitMQ management server bind IP address. Default: **0.0.0.0** * `RABBITMQ_MANAGEMENT_PORT_NUMBER`: RabbitMQ management server port number. Default: **15672** +* `RABBITMQ_MANAGEMENT_ALLOW_WEB_ACCESS`: Allow web access to RabbitMQ management portal for `RABBITMQ_USERNAME`. Default: **false** * `RABBITMQ_MANAGEMENT_SSL_PORT_NUMBER`: RabbitMQ management server port number for SSL/TLS connections. No defaults. * `RABBITMQ_MANAGEMENT_SSL_CACERTFILE`: Path to the RabbitMQ management server SSL CA certificate file. No defaults. * `RABBITMQ_MANAGEMENT_SSL_CERTFILE`: Path to the RabbitMQ management server SSL certificate file. No defaults. diff --git a/bitnami/rails/7/debian-11/Dockerfile b/bitnami/rails/7/debian-11/Dockerfile index b447c28f51f8c..5c6f4b1439cfb 100644 --- a/bitnami/rails/7/debian-11/Dockerfile +++ b/bitnami/rails/7/debian-11/Dockerfile @@ -7,38 +7,38 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-26T09:59:02Z" \ + org.opencontainers.image.created="2023-12-18T21:29:04Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.1.1-debian-11-r1" \ + org.opencontainers.image.ref.name="7.1.2-debian-11-r4" \ org.opencontainers.image.title="rails" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.1.1" + org.opencontainers.image.version="7.1.2" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages ca-certificates curl git libaudit1 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmariadb3 libncurses6 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpam0g libpq5 libreadline-dev libreadline8 libsasl2-2 libsqlite3-0 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libxml2 libyaml-0-2 libyaml-dev procps sqlite3 sudo zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN install_packages build-essential ca-certificates curl git libaudit1 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmariadb3 libncurses6 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpam0g libpq5 libreadline-dev libreadline8 libsasl2-2 libsqlite3-0 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libxml2 libyaml-0-2 libyaml-dev pkg-config procps sqlite3 sudo unzip zlib1g zlib1g-dev +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "ruby-3.2.2-8-linux-${OS_ARCH}-debian-11" \ - "node-18.18.2-0-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.11.5-1-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "rails-7.1.1-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.7-2-linux-${OS_ARCH}-debian-11" \ + "ruby-3.2.2-9-linux-${OS_ARCH}-debian-11" \ + "node-18.19.0-0-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.11.6-1-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "rails-7.1.2-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -47,7 +47,7 @@ RUN /build/bitnami-user.sh COPY rootfs / RUN /opt/bitnami/scripts/rails/postunpack.sh -ENV APP_VERSION="7.1.1" \ +ENV APP_VERSION="7.1.2" \ BITNAMI_APP_NAME="rails" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/ruby/bin:/opt/bitnami/node/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/rails/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/rails/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index e552c3b233abf..77399b4efb7f9 100644 --- a/bitnami/rails/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/rails/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,36 +3,36 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.11.5-1" + "version": "10.11.6-1" }, "node": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "18.18.2-0" + "version": "18.19.0-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.7-2" }, "rails": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.1.1-1" + "version": "7.1.2-2" }, "ruby": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.2.2-8" + "version": "3.2.2-9" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" } } \ No newline at end of file diff --git a/bitnami/rails/7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/rails/7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/rails/7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/rails/7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/rails/7/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/rails/7/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/rails/7/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/rails/7/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/rails/7/debian-11/tags-info.yaml b/bitnami/rails/7/debian-11/tags-info.yaml index e0242ba166386..de83ff02feea6 100644 --- a/bitnami/rails/7/debian-11/tags-info.yaml +++ b/bitnami/rails/7/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "7" - 7-debian-11 -- 7.1.1 +- 7.1.2 - latest diff --git a/bitnami/rails/README.md b/bitnami/rails/README.md index 7876e77b9dcdc..cd668aaf9b6d0 100644 --- a/bitnami/rails/README.md +++ b/bitnami/rails/README.md @@ -1,4 +1,4 @@ -# Rails packaged by Bitnami +# Bitnami package for Rails ## What is Rails? @@ -24,7 +24,7 @@ docker-compose up * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/ray/2/debian-11/Dockerfile b/bitnami/ray/2/debian-11/Dockerfile new file mode 100644 index 0000000000000..d1ae3a1797579 --- /dev/null +++ b/bitnami/ray/2/debian-11/Dockerfile @@ -0,0 +1,54 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +FROM docker.io/bitnami/minideb:bullseye + +ARG TARGETARCH + +LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-12-18T14:42:44Z" \ + org.opencontainers.image.description="Application packaged by VMware, Inc" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.ref.name="2.8.1-debian-11-r1" \ + org.opencontainers.image.title="ray" \ + org.opencontainers.image.vendor="VMware, Inc." \ + org.opencontainers.image.version="2.8.1" + +ENV HOME="/" \ + OS_ARCH="${TARGETARCH:-amd64}" \ + OS_FLAVOUR="debian-11" \ + OS_NAME="linux" + +COPY prebuildfs / +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] +# Install required system packages and dependencies +RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps zlib1g +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ + COMPONENTS=( \ + "python-3.11.7-2-linux-${OS_ARCH}-debian-11" \ + "ray-2.8.1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ + for COMPONENT in "${COMPONENTS[@]}"; do \ + if [ ! -f "${COMPONENT}.tar.gz" ]; then \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ + rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ + done +RUN apt-get autoremove --purge -y curl && \ + apt-get update && apt-get upgrade -y && \ + apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives +RUN useradd -r -u 1001 -g root ray +RUN mkdir /.local && chmod g+rwX /.local + +RUN mkdir /app && chmod g+rwX /app && ln -s /opt/bitnami/python/bin/ray /usr/bin/ray && ln -s /opt/bitnami/python/bin/python /usr/bin/python +ENV APP_VERSION="2.8.1" \ + BITNAMI_APP_NAME="ray" \ + PATH="/opt/bitnami/python/bin:$PATH" + +WORKDIR /app +USER 1001 +ENTRYPOINT [ "python" ] diff --git a/bitnami/ray/2/debian-11/docker-compose.yml b/bitnami/ray/2/debian-11/docker-compose.yml new file mode 100644 index 0000000000000..de6a908bb3167 --- /dev/null +++ b/bitnami/ray/2/debian-11/docker-compose.yml @@ -0,0 +1,11 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +version: '2' + +services: + ray: + tty: true + image: docker.io/bitnami/ray:2 + volumes: + - '.:/app' diff --git a/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json similarity index 71% rename from bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json rename to bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c16f46168f1be..8abe180b589c2 100644 --- a/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,14 +1,14 @@ { - "mxnet": { + "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.9.1-169" + "version": "3.11.7-2" }, - "python": { + "ray": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.9.18-2" + "version": "2.8.1-0" } } \ No newline at end of file diff --git a/bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt new file mode 100644 index 0000000000000..76956b38e82c6 --- /dev/null +++ b/bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt @@ -0,0 +1,2 @@ +Bitnami containers ship with software bundles. You can find the licenses under: +/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh similarity index 76% rename from bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh rename to bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh similarity index 100% rename from bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh rename to bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh diff --git a/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh similarity index 100% rename from bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh rename to bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh diff --git a/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh b/bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh similarity index 100% rename from bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh rename to bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh diff --git a/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh similarity index 100% rename from bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh rename to bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh diff --git a/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh similarity index 100% rename from bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh rename to bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh diff --git a/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh similarity index 100% rename from bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh rename to bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh diff --git a/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh similarity index 100% rename from bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh rename to bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh diff --git a/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh similarity index 100% rename from bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh rename to bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh diff --git a/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh similarity index 100% rename from bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh rename to bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh diff --git a/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh similarity index 100% rename from bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh rename to bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh diff --git a/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh similarity index 100% rename from bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh rename to bitnami/ray/2/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh diff --git a/bitnami/ray/2/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/ray/2/debian-11/prebuildfs/usr/sbin/install_packages new file mode 100755 index 0000000000000..acbc3173208c0 --- /dev/null +++ b/bitnami/ray/2/debian-11/prebuildfs/usr/sbin/install_packages @@ -0,0 +1,27 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -eu + +n=0 +max=2 +export DEBIAN_FRONTEND=noninteractive + +until [ $n -gt $max ]; do + set +e + ( + apt-get update -qq && + apt-get install -y --no-install-recommends "$@" + ) + CODE=$? + set -e + if [ $CODE -eq 0 ]; then + break + fi + if [ $n -eq $max ]; then + exit $CODE + fi + echo "apt failed, retrying" + n=$(($n + 1)) +done +apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/ray/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/ray/2/debian-11/prebuildfs/usr/sbin/run-script new file mode 100755 index 0000000000000..b7a5bf1e50bff --- /dev/null +++ b/bitnami/ray/2/debian-11/prebuildfs/usr/sbin/run-script @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -u + +if [ $# -eq 0 ]; then + >&2 echo "No arguments provided" + exit 1 +fi + +script=$1 +exit_code="${2:-96}" +fail_if_not_present="${3:-y}" + +if test -f "$script"; then + sh $script + + if [ $? -ne 0 ]; then + exit $((exit_code)) + fi +elif [ "$fail_if_not_present" = "y" ]; then + >&2 echo "script not found: $script" + exit 127 +fi diff --git a/bitnami/ray/2/debian-11/tags-info.yaml b/bitnami/ray/2/debian-11/tags-info.yaml new file mode 100644 index 0000000000000..bd9d3572b8842 --- /dev/null +++ b/bitnami/ray/2/debian-11/tags-info.yaml @@ -0,0 +1,5 @@ +rolling-tags: +- "2" +- 2-debian-11 +- 2.8.1 +- latest diff --git a/bitnami/mxnet/README.md b/bitnami/ray/README.md similarity index 62% rename from bitnami/mxnet/README.md rename to bitnami/ray/README.md index 6496edf74d8b1..5667336748a5e 100644 --- a/bitnami/mxnet/README.md +++ b/bitnami/ray/README.md @@ -1,35 +1,35 @@ -# Apache MXNet (Incubating) packaged by Bitnami +# Bitnami package for Ray -## What is Apache MXNet (Incubating)? +## What is Ray? -> Apache MXNet (Incubating) is a flexible and efficient library for deep learning designed to work as a neural network. Bitnami image ships OpenBLAS as math library. +> Ray is a Python library for scaling AI and Python applications. Provides an API and consists of a core distributed runtime and a set of AI libraries for simplifying ML compute -[Overview of Apache MXNet (Incubating)](https://mxnet.incubator.apache.org/) +[Overview of Ray](https://ray.io) Trademarks: This software listing is packaged by Bitnami. The respective trademarks mentioned in the offering are owned by the respective companies, and use of them does not imply any affiliation or endorsement. ## TL;DR ```console -docker run -it --name mxnet bitnami/mxnet +docker run -it --name ray bitnami/ray ``` ### Docker Compose ```console -curl -sSL https://raw.githubusercontent.com/bitnami/containers/main/bitnami/mxnet/docker-compose.yml > docker-compose.yml +curl -sSL https://raw.githubusercontent.com/bitnami/containers/main/bitnami/ray/docker-compose.yml > docker-compose.yml docker-compose up -d ``` ## Why use Bitnami Images? -* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -* With Bitnami images the latest bug fixes and features are available as soon as possible. -* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -* Bitnami container images are released on a regular basis with the latest distribution packages available. +- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +- With Bitnami images the latest bug fixes and features are available as soon as possible. +- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +- Bitnami container images are released on a regular basis with the latest distribution packages available. -Looking to use Apache MXNet (Incubating) in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. +Looking to use Ray in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. ## Why use a non-root container? @@ -45,16 +45,16 @@ Subscribe to project updates by watching the [bitnami/containers GitHub repo](ht ## Get this image -The recommended way to get the Bitnami Apache MXNet (Incubating) Docker Image is to pull the prebuilt image from the [Docker Hub Registry](https://hub.docker.com/r/bitnami/mxnet). +The recommended way to get the Bitnami Ray Docker Image is to pull the prebuilt image from the [Docker Hub Registry](https://hub.docker.com/r/bitnami/ray). ```console -docker pull bitnami/mxnet:latest +docker pull bitnami/ray:latest ``` -To use a specific version, you can pull a versioned tag. You can view the [list of available versions](https://hub.docker.com/r/bitnami/mxnet/tags/) in the Docker Hub Registry. +To use a specific version, you can pull a versioned tag. You can view the [list of available versions](https://hub.docker.com/r/bitnami/ray/tags/) in the Docker Hub Registry. ```console -docker pull bitnami/mxnet:[TAG] +docker pull bitnami/ray:[TAG] ``` If you wish, you can also build the image yourself by cloning the repository, changing to the directory containing the Dockerfile and executing the `docker build` command. Remember to replace the `APP`, `VERSION` and `OPERATING-SYSTEM` path placeholders in the example command below with the correct values. @@ -67,56 +67,60 @@ docker build -t bitnami/APP:latest . ## Entering the REPL -By default, running this image will drop you into the Python REPL, where you can interactively test and try things out with mxnet in Python. +By default, running this image will drop you into the Python REPL, where you can interactively test and try things out with Ray in Python. ```console -docker run -it --name mxnet bitnami/mxnet +docker run -it --name ray bitnami/ray ``` ## Configuration -### Running your Apache MXNet (Incubating) app +### Running your Ray app -The default work directory for the mxnet image is `/app`. You can mount a folder from your host here that includes your mxnet script, and run it normally using the `python` command. +The default work directory for the Ray image is `/app`. You can mount a folder from your host here that includes your Ray script, and run it normally using the `python` command. ```console -docker run -it --name mxnet -v /path/to/app:/app bitnami/mxnet \ +docker run -it --name ray -v /path/to/app:/app bitnami/ray \ python script.py ``` -### Running an Apache MXNet (Incubating) app with package dependencies +### Running a Ray app with package dependencies -If your mxnet app has a `requirements.txt` defining your app's dependencies, you can install the dependencies before running your app. +If your Ray app has a `requirements.txt` defining your app's dependencies, you can install the dependencies before running your app. ```console -docker run -it --name mxnet -v /path/to/app:/app bitnami/mxnet \ - sh -c "pip install -y --file requirements.txt && python script.py" +docker run -it --name ray -v /path/to/app:/app bitnami/ray \ + sh -c "pip install --file requirements.txt && python script.py" ``` +**Further Reading:** + +- [ray documentation](https://ray.iodocs/) + ## Maintenance ### Upgrade this image -Bitnami provides up-to-date versions of Apache MXNet (Incubating), including security patches, soon after they are made upstream. We recommend that you follow these steps to upgrade your container. +Bitnami provides up-to-date versions of Ray, including security patches, soon after they are made upstream. We recommend that you follow these steps to upgrade your container. #### Step 1: Get the updated image ```console -docker pull bitnami/mxnet:latest +docker pull bitnami/ray:latest ``` -or if you're using Docker Compose, update the value of the image property to `bitnami/mxnet:latest`. +or if you're using Docker Compose, update the value of the image property to `bitnami/ray:latest`. #### Step 2: Remove the currently running container ```console -docker rm -v mxnet +docker rm -v ray ``` or using Docker Compose: ```console -docker-compose rm -v mxnet +docker-compose rm -v ray ``` #### Step 3: Run the new image @@ -124,13 +128,13 @@ docker-compose rm -v mxnet Re-create your container from the new image. ```console -docker run --name mxnet bitnami/mxnet:latest +docker run --name ray bitnami/ray:latest ``` or using Docker Compose: ```console -docker-compose up mxnet +docker-compose up ray ``` ## Contributing @@ -149,7 +153,7 @@ 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 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/bitnami/ray/docker-compose.yml b/bitnami/ray/docker-compose.yml new file mode 100644 index 0000000000000..de6a908bb3167 --- /dev/null +++ b/bitnami/ray/docker-compose.yml @@ -0,0 +1,11 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +version: '2' + +services: + ray: + tty: true + image: docker.io/bitnami/ray:2 + volumes: + - '.:/app' diff --git a/bitnami/rclone/1/debian-11/Dockerfile b/bitnami/rclone/1/debian-11/Dockerfile index 9c8bf5d78908c..d7e488f20e2fd 100644 --- a/bitnami/rclone/1/debian-11/Dockerfile +++ b/bitnami/rclone/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-19T13:58:54Z" \ + org.opencontainers.image.created="2023-12-07T02:01:43Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.64.2-debian-11-r0" \ + org.opencontainers.image.ref.name="1.65.0-debian-11-r1" \ org.opencontainers.image.title="rclone" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.64.2" + org.opencontainers.image.version="1.65.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN install_packages ca-certificates curl fuse3 procps +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "rclone-1.64.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "rclone-1.65.0-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="1.64.2" \ +ENV APP_VERSION="1.65.0" \ BITNAMI_APP_NAME="rclone" \ PATH="/opt/bitnami/rclone/bin:$PATH" diff --git a/bitnami/rclone/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/rclone/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 9ae5a6aa9985b..bf36b6fe242e3 100644 --- a/bitnami/rclone/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/rclone/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.64.2-0" + "version": "1.65.0-1" } } \ No newline at end of file diff --git a/bitnami/rclone/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/rclone/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/rclone/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/rclone/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/rclone/1/debian-11/tags-info.yaml b/bitnami/rclone/1/debian-11/tags-info.yaml index a365c9985bf17..d2962cfea44d9 100644 --- a/bitnami/rclone/1/debian-11/tags-info.yaml +++ b/bitnami/rclone/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.64.2 +- 1.65.0 - latest diff --git a/bitnami/rclone/README.md b/bitnami/rclone/README.md index cd700c5e16894..fe549c187e513 100644 --- a/bitnami/rclone/README.md +++ b/bitnami/rclone/README.md @@ -1,4 +1,4 @@ -# rClone packaged by Bitnami +# Bitnami package for rClone ## What is rClone? @@ -18,7 +18,7 @@ docker run --name rclone bitnami/rclone:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/redis-cluster/6.2/debian-11/Dockerfile b/bitnami/redis-cluster/6.2/debian-11/Dockerfile index 76e01c4b9839d..1030f2b777eec 100644 --- a/bitnami/redis-cluster/6.2/debian-11/Dockerfile +++ b/bitnami/redis-cluster/6.2/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-18T10:24:43Z" \ + org.opencontainers.image.created="2023-12-09T18:22:47Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.2.14-debian-11-r0" \ + org.opencontainers.image.ref.name="6.2.14-debian-11-r2" \ org.opencontainers.image.title="redis-cluster" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="6.2.14" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgomp1 libssl1.1 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ "redis-6.2.14-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/redis-cluster/6.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/redis-cluster/6.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/redis-cluster/6.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/redis-cluster/6.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/redis-cluster/6.2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/redis-cluster/6.2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/redis-cluster/6.2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/redis-cluster/6.2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/redis-cluster/6.2/debian-11/rootfs/opt/bitnami/scripts/librediscluster.sh b/bitnami/redis-cluster/6.2/debian-11/rootfs/opt/bitnami/scripts/librediscluster.sh index 56371df225906..16daba0d84673 100644 --- a/bitnami/redis-cluster/6.2/debian-11/rootfs/opt/bitnami/scripts/librediscluster.sh +++ b/bitnami/redis-cluster/6.2/debian-11/rootfs/opt/bitnami/scripts/librediscluster.sh @@ -224,7 +224,7 @@ redis_cluster_update_ips() { newIP=$(wait_for_dns_lookup "${host_and_port[0]}" "$REDIS_DNS_RETRIES" 5) # The node can be new if we are updating the cluster, so catch the unbound variable error if [[ ${host_2_ip_array[$node]+true} ]]; then - echo "Changing old IP ${host_2_ip_array[$node]} by the new one ${newIP}" + info "Changing old IP ${host_2_ip_array[$node]} by the new one ${newIP}" nodesFile=$(sed "s/ ${host_2_ip_array[$node]}:/ $newIP:/g" "${REDIS_DATA_DIR}/nodes.conf") echo "$nodesFile" >"${REDIS_DATA_DIR}/nodes.conf" fi diff --git a/bitnami/redis-cluster/7.0/debian-11/Dockerfile b/bitnami/redis-cluster/7.0/debian-11/Dockerfile index ba70dc5e5db64..4c5214b70da08 100644 --- a/bitnami/redis-cluster/7.0/debian-11/Dockerfile +++ b/bitnami/redis-cluster/7.0/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-18T10:17:30Z" \ + org.opencontainers.image.created="2023-12-09T20:49:27Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.0.14-debian-11-r0" \ + org.opencontainers.image.ref.name="7.0.14-debian-11-r2" \ org.opencontainers.image.title="redis-cluster" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="7.0.14" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgomp1 libssl1.1 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ "redis-7.0.14-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/redis-cluster/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/redis-cluster/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/redis-cluster/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/redis-cluster/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/redis-cluster/7.0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/redis-cluster/7.0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/redis-cluster/7.0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/redis-cluster/7.0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/librediscluster.sh b/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/librediscluster.sh index 56371df225906..16daba0d84673 100644 --- a/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/librediscluster.sh +++ b/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/librediscluster.sh @@ -224,7 +224,7 @@ redis_cluster_update_ips() { newIP=$(wait_for_dns_lookup "${host_and_port[0]}" "$REDIS_DNS_RETRIES" 5) # The node can be new if we are updating the cluster, so catch the unbound variable error if [[ ${host_2_ip_array[$node]+true} ]]; then - echo "Changing old IP ${host_2_ip_array[$node]} by the new one ${newIP}" + info "Changing old IP ${host_2_ip_array[$node]} by the new one ${newIP}" nodesFile=$(sed "s/ ${host_2_ip_array[$node]}:/ $newIP:/g" "${REDIS_DATA_DIR}/nodes.conf") echo "$nodesFile" >"${REDIS_DATA_DIR}/nodes.conf" fi diff --git a/bitnami/redis-cluster/7.2/debian-11/Dockerfile b/bitnami/redis-cluster/7.2/debian-11/Dockerfile index fc2f18698753c..af0507062a1a5 100644 --- a/bitnami/redis-cluster/7.2/debian-11/Dockerfile +++ b/bitnami/redis-cluster/7.2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-18T10:15:59Z" \ + org.opencontainers.image.created="2023-12-09T18:26:25Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.2.2-debian-11-r0" \ + org.opencontainers.image.ref.name="7.2.3-debian-11-r2" \ org.opencontainers.image.title="redis-cluster" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.2.2" + org.opencontainers.image.version="7.2.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgomp1 libssl1.1 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "redis-7.2.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "redis-7.2.3-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -44,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/redis-cluster/postunpack.sh -ENV APP_VERSION="7.2.2" \ +ENV APP_VERSION="7.2.3" \ BITNAMI_APP_NAME="redis-cluster" \ PATH="/opt/bitnami/redis/bin:$PATH" diff --git a/bitnami/redis-cluster/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/redis-cluster/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 9a8586ba17fc6..0e89440cd8885 100644 --- a/bitnami/redis-cluster/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/redis-cluster/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.2.2-0" + "version": "7.2.3-1" } } \ No newline at end of file diff --git a/bitnami/redis-cluster/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/redis-cluster/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/redis-cluster/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/redis-cluster/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/redis-cluster/7.2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/redis-cluster/7.2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/redis-cluster/7.2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/redis-cluster/7.2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/redis-cluster/7.2/debian-11/rootfs/opt/bitnami/scripts/librediscluster.sh b/bitnami/redis-cluster/7.2/debian-11/rootfs/opt/bitnami/scripts/librediscluster.sh index 56371df225906..16daba0d84673 100644 --- a/bitnami/redis-cluster/7.2/debian-11/rootfs/opt/bitnami/scripts/librediscluster.sh +++ b/bitnami/redis-cluster/7.2/debian-11/rootfs/opt/bitnami/scripts/librediscluster.sh @@ -224,7 +224,7 @@ redis_cluster_update_ips() { newIP=$(wait_for_dns_lookup "${host_and_port[0]}" "$REDIS_DNS_RETRIES" 5) # The node can be new if we are updating the cluster, so catch the unbound variable error if [[ ${host_2_ip_array[$node]+true} ]]; then - echo "Changing old IP ${host_2_ip_array[$node]} by the new one ${newIP}" + info "Changing old IP ${host_2_ip_array[$node]} by the new one ${newIP}" nodesFile=$(sed "s/ ${host_2_ip_array[$node]}:/ $newIP:/g" "${REDIS_DATA_DIR}/nodes.conf") echo "$nodesFile" >"${REDIS_DATA_DIR}/nodes.conf" fi diff --git a/bitnami/redis-cluster/7.2/debian-11/tags-info.yaml b/bitnami/redis-cluster/7.2/debian-11/tags-info.yaml index 13d3f0d544574..6980a8dead585 100644 --- a/bitnami/redis-cluster/7.2/debian-11/tags-info.yaml +++ b/bitnami/redis-cluster/7.2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "7.2" - 7.2-debian-11 -- 7.2.2 +- 7.2.3 - latest diff --git a/bitnami/redis-cluster/README.md b/bitnami/redis-cluster/README.md index 095430ff7c163..a64ffdb84d889 100644 --- a/bitnami/redis-cluster/README.md +++ b/bitnami/redis-cluster/README.md @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/redis-exporter/1/debian-11/Dockerfile b/bitnami/redis-exporter/1/debian-11/Dockerfile index 9b678fcea295e..54afd76ace23b 100644 --- a/bitnami/redis-exporter/1/debian-11/Dockerfile +++ b/bitnami/redis-exporter/1/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T08:31:20Z" \ + org.opencontainers.image.created="2023-12-07T12:04:55Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.55.0-debian-11-r0" \ + org.opencontainers.image.ref.name="1.55.0-debian-11-r3" \ org.opencontainers.image.title="redis-exporter" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.55.0" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "redis-exporter-1.55.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "redis-exporter-1.55.0-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/redis-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/redis-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 9b3085ad472b2..ca94da4510448 100644 --- a/bitnami/redis-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/redis-exporter/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.55.0-0" + "version": "1.55.0-2" } } \ No newline at end of file diff --git a/bitnami/redis-exporter/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/redis-exporter/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/redis-exporter/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/redis-exporter/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/redis-exporter/README.md b/bitnami/redis-exporter/README.md index 34b5f5eed285e..7c02575108f2c 100644 --- a/bitnami/redis-exporter/README.md +++ b/bitnami/redis-exporter/README.md @@ -1,4 +1,4 @@ -# Redis Exporter packaged by Bitnami +# Bitnami package for Redis Exporter ## What is Redis Exporter? @@ -18,7 +18,7 @@ docker run --name redis-exporter bitnami/redis-exporter:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/redis-sentinel/6.2/debian-11/Dockerfile b/bitnami/redis-sentinel/6.2/debian-11/Dockerfile index daf9b6f7f3383..9890d24ab871e 100644 --- a/bitnami/redis-sentinel/6.2/debian-11/Dockerfile +++ b/bitnami/redis-sentinel/6.2/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-19T15:44:39Z" \ + org.opencontainers.image.created="2023-12-09T20:49:11Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.2.14-debian-11-r0" \ + org.opencontainers.image.ref.name="6.2.14-debian-11-r2" \ org.opencontainers.image.title="redis-sentinel" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="6.2.14" @@ -22,20 +22,20 @@ ENV HOME="/" \ PATH="/opt/bitnami/redis-sentinel/bin:$PATH" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libssl1.1 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ "redis-sentinel-6.2.14-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/redis-sentinel/6.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/redis-sentinel/6.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/redis-sentinel/6.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/redis-sentinel/6.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/redis-sentinel/6.2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/redis-sentinel/6.2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/redis-sentinel/6.2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/redis-sentinel/6.2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/redis-sentinel/7.0/debian-11/Dockerfile b/bitnami/redis-sentinel/7.0/debian-11/Dockerfile index 2ca9f018eb35d..317c4bb55db1f 100644 --- a/bitnami/redis-sentinel/7.0/debian-11/Dockerfile +++ b/bitnami/redis-sentinel/7.0/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-19T15:31:26Z" \ + org.opencontainers.image.created="2023-12-09T20:57:07Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.0.14-debian-11-r0" \ + org.opencontainers.image.ref.name="7.0.14-debian-11-r2" \ org.opencontainers.image.title="redis-sentinel" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="7.0.14" @@ -22,20 +22,20 @@ ENV HOME="/" \ PATH="/opt/bitnami/redis-sentinel/bin:$PATH" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libssl1.1 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ "redis-sentinel-7.0.14-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/redis-sentinel/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/redis-sentinel/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/redis-sentinel/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/redis-sentinel/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/redis-sentinel/7.0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/redis-sentinel/7.0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/redis-sentinel/7.0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/redis-sentinel/7.0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/redis-sentinel/7.2/debian-11/Dockerfile b/bitnami/redis-sentinel/7.2/debian-11/Dockerfile index 04ffb4fb65acf..dccb1e77cae22 100644 --- a/bitnami/redis-sentinel/7.2/debian-11/Dockerfile +++ b/bitnami/redis-sentinel/7.2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-19T10:59:21Z" \ + org.opencontainers.image.created="2023-12-09T18:32:59Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.2.2-debian-11-r0" \ + org.opencontainers.image.ref.name="7.2.3-debian-11-r2" \ org.opencontainers.image.title="redis-sentinel" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.2.2" + org.opencontainers.image.version="7.2.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,20 +22,20 @@ ENV HOME="/" \ PATH="/opt/bitnami/redis-sentinel/bin:$PATH" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libssl1.1 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "redis-sentinel-7.2.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "redis-sentinel-7.2.3-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -45,7 +45,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/redis-sentinel/postunpack.sh -ENV APP_VERSION="7.2.2" \ +ENV APP_VERSION="7.2.3" \ BITNAMI_APP_NAME="redis-sentinel" EXPOSE 26379 diff --git a/bitnami/redis-sentinel/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/redis-sentinel/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index fc2aa2b7dabfe..a2da799b2a0c2 100644 --- a/bitnami/redis-sentinel/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/redis-sentinel/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.2.2-0" + "version": "7.2.3-1" } } \ No newline at end of file diff --git a/bitnami/redis-sentinel/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/redis-sentinel/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/redis-sentinel/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/redis-sentinel/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/redis-sentinel/7.2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/redis-sentinel/7.2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/redis-sentinel/7.2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/redis-sentinel/7.2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/redis-sentinel/7.2/debian-11/tags-info.yaml b/bitnami/redis-sentinel/7.2/debian-11/tags-info.yaml index 13d3f0d544574..6980a8dead585 100644 --- a/bitnami/redis-sentinel/7.2/debian-11/tags-info.yaml +++ b/bitnami/redis-sentinel/7.2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "7.2" - 7.2-debian-11 -- 7.2.2 +- 7.2.3 - latest diff --git a/bitnami/redis-sentinel/README.md b/bitnami/redis-sentinel/README.md index 9f92442f403bc..dbebcd245ee28 100644 --- a/bitnami/redis-sentinel/README.md +++ b/bitnami/redis-sentinel/README.md @@ -27,7 +27,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/redis/6.2/debian-11/Dockerfile b/bitnami/redis/6.2/debian-11/Dockerfile index b9be714c377b7..1a29b8bb41057 100644 --- a/bitnami/redis/6.2/debian-11/Dockerfile +++ b/bitnami/redis/6.2/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-18T10:54:34Z" \ + org.opencontainers.image.created="2023-12-09T19:49:28Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.2.14-debian-11-r0" \ + org.opencontainers.image.ref.name="6.2.14-debian-11-r2" \ org.opencontainers.image.title="redis" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="6.2.14" @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgomp1 libssl1.1 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ "redis-6.2.14-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/redis/6.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/redis/6.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 2ad362adf5bac..f3c4b5e31b1d6 100644 --- a/bitnami/redis/6.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/redis/6.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,6 +9,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" } } \ No newline at end of file diff --git a/bitnami/redis/6.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/redis/6.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/redis/6.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/redis/6.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/redis/6.2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/redis/6.2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/redis/6.2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/redis/6.2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/redis/7.0/debian-11/Dockerfile b/bitnami/redis/7.0/debian-11/Dockerfile index 88a14ce9d0cc3..1f279fe85bfc9 100644 --- a/bitnami/redis/7.0/debian-11/Dockerfile +++ b/bitnami/redis/7.0/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-18T10:15:13Z" \ + org.opencontainers.image.created="2023-12-09T18:39:26Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.0.14-debian-11-r0" \ + org.opencontainers.image.ref.name="7.0.14-debian-11-r2" \ org.opencontainers.image.title="redis" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="7.0.14" @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgomp1 libssl1.1 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ "redis-7.0.14-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/redis/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/redis/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 45c9780523bf7..a7cef175303f8 100644 --- a/bitnami/redis/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/redis/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,6 +9,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" } } \ No newline at end of file diff --git a/bitnami/redis/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/redis/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/redis/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/redis/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/redis/7.0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/redis/7.0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/redis/7.0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/redis/7.0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/redis/7.2/debian-11/Dockerfile b/bitnami/redis/7.2/debian-11/Dockerfile index 61c11ae526869..0a9dd4a6b4b72 100644 --- a/bitnami/redis/7.2/debian-11/Dockerfile +++ b/bitnami/redis/7.2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-18T10:15:45Z" \ + org.opencontainers.image.created="2023-12-09T18:45:27Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.2.2-debian-11-r0" \ + org.opencontainers.image.ref.name="7.2.3-debian-11-r2" \ org.opencontainers.image.title="redis" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.2.2" + org.opencontainers.image.version="7.2.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgomp1 libssl1.1 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "redis-7.2.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ + "redis-7.2.3-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -47,7 +47,7 @@ RUN ln -s /opt/bitnami/scripts/redis/run.sh /run.sh COPY rootfs / RUN /opt/bitnami/scripts/redis/postunpack.sh -ENV APP_VERSION="7.2.2" \ +ENV APP_VERSION="7.2.3" \ BITNAMI_APP_NAME="redis" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/redis/bin:$PATH" diff --git a/bitnami/redis/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/redis/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c5ff168debb6a..accbd2ca83cc3 100644 --- a/bitnami/redis/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/redis/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.2.2-0" + "version": "7.2.3-1" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-4" } } \ No newline at end of file diff --git a/bitnami/redis/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/redis/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/redis/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/redis/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/redis/7.2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/redis/7.2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/redis/7.2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/redis/7.2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/redis/7.2/debian-11/tags-info.yaml b/bitnami/redis/7.2/debian-11/tags-info.yaml index 13d3f0d544574..6980a8dead585 100644 --- a/bitnami/redis/7.2/debian-11/tags-info.yaml +++ b/bitnami/redis/7.2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "7.2" - 7.2-debian-11 -- 7.2.2 +- 7.2.3 - latest diff --git a/bitnami/redis/README.md b/bitnami/redis/README.md index 3b9098fced951..ddbea3107c9d5 100644 --- a/bitnami/redis/README.md +++ b/bitnami/redis/README.md @@ -27,7 +27,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/redmine/5/debian-11/Dockerfile b/bitnami/redmine/5/debian-11/Dockerfile index bc260c4f39ae5..71d5dd4401735 100644 --- a/bitnami/redmine/5/debian-11/Dockerfile +++ b/bitnami/redmine/5/debian-11/Dockerfile @@ -7,37 +7,37 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-31T04:27:11Z" \ + org.opencontainers.image.created="2023-12-02T07:24:37Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.1.0-debian-11-r0" \ + org.opencontainers.image.ref.name="5.1.1-debian-11-r1" \ org.opencontainers.image.title="redmine" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="5.1.0" + org.opencontainers.image.version="5.1.1" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages acl ca-certificates curl ghostscript git gsfonts imagemagick libaudit1 libbsd0 libcap-ng0 libcom-err2 libcrypt1 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblz4-1 liblzma5 libmariadb3 libmd0 libncurses6 libnettle8 libp11-kit0 libpam0g libpq5 libreadline-dev libreadline8 libsasl2-2 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 libyaml-dev procps sqlite3 zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN install_packages acl ca-certificates curl ghostscript git gsfonts imagemagick libaudit1 libbrotli1 libbsd0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libedit2 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblz4-1 liblzma5 libmariadb3 libmd0 libncurses6 libnettle8 libnghttp2-14 libp11-kit0 libpam0g libpcre2-8-0 libpq5 libpsl5 libreadline-dev libreadline8 librtmp1 libsasl2-2 libssh2-1 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 libyaml-dev procps sqlite3 zlib1g +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ - "ruby-3.0.6-8-linux-${OS_ARCH}-debian-11" \ - "postgresql-client-16.0.0-0-linux-${OS_ARCH}-debian-11" \ - "mysql-client-11.1.2-2-linux-${OS_ARCH}-debian-11" \ - "redmine-5.1.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "yq-4.40.3-0-linux-${OS_ARCH}-debian-11" \ + "ruby-3.0.6-9-linux-${OS_ARCH}-debian-11" \ + "postgresql-client-16.1.0-0-linux-${OS_ARCH}-debian-11" \ + "mysql-client-11.1.3-0-linux-${OS_ARCH}-debian-11" \ + "redmine-5.1.1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -47,7 +47,7 @@ RUN apt-get autoremove --purge -y curl && \ COPY rootfs / RUN /opt/bitnami/scripts/mysql-client/postunpack.sh RUN /opt/bitnami/scripts/redmine/postunpack.sh -ENV APP_VERSION="5.1.0" \ +ENV APP_VERSION="5.1.1" \ BITNAMI_APP_NAME="redmine" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/ruby/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/mysql/bin:$PATH" diff --git a/bitnami/redmine/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/redmine/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index f622b89c4673a..3ef5f8daf01bb 100644 --- a/bitnami/redmine/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/redmine/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,30 +3,30 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.1.2-2" + "version": "11.1.3-0" }, "postgresql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.0.0-0" + "version": "16.1.0-0" }, "redmine": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "5.1.0-0" + "version": "5.1.1-0" }, "ruby": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.0.6-8" + "version": "3.0.6-9" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.3-0" } } \ No newline at end of file diff --git a/bitnami/redmine/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/redmine/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/redmine/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/redmine/5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/redmine/5/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/redmine/5/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/redmine/5/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/redmine/5/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/libredmine.sh b/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/libredmine.sh index 0951c013e516c..6099109a59fe2 100644 --- a/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/libredmine.sh +++ b/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/libredmine.sh @@ -161,6 +161,7 @@ redmine_initialize() { info "Configuring Redmine application with settings provided via environment variables" redmine_conf_set "default_language.default" "$REDMINE_LANGUAGE" "" "${REDMINE_CONF_DIR}/settings.yml" redmine_conf_set "rest_api_enabled.default" "$REDMINE_REST_API_ENABLED" "int" "${REDMINE_CONF_DIR}/settings.yml" + echo "config.active_job.queue_adapter = :${REDMINE_QUEUE_ADAPTER}" >> "${REDMINE_CONF_DIR}/additional_environment.rb" # SMTP configuration if ! is_empty_value "$REDMINE_SMTP_HOST"; then diff --git a/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/redmine-env.sh b/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/redmine-env.sh index e4fc03597907a..1d21bd0a6aa53 100644 --- a/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/redmine-env.sh +++ b/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/redmine-env.sh @@ -31,6 +31,7 @@ redmine_env_vars=( REDMINE_REST_API_ENABLED REDMINE_LOAD_DEFAULT_DATA REDMINE_SKIP_BOOTSTRAP + REDMINE_QUEUE_ADAPTER REDMINE_USERNAME REDMINE_PASSWORD REDMINE_EMAIL @@ -103,6 +104,7 @@ export REDMINE_LANGUAGE="${REDMINE_LANGUAGE:-en}" # only used during the first i export REDMINE_REST_API_ENABLED="${REDMINE_REST_API_ENABLED:-0}" # only used during the first initialization export REDMINE_LOAD_DEFAULT_DATA="${REDMINE_LOAD_DEFAULT_DATA:-yes}" # only used during the first initialization export REDMINE_SKIP_BOOTSTRAP="${REDMINE_SKIP_BOOTSTRAP:-}" # only used during the first initialization +export REDMINE_QUEUE_ADAPTER="${REDMINE_QUEUE_ADAPTER:-inline}" # Redmine credentials export REDMINE_USERNAME="${REDMINE_USERNAME:-user}" # only used during the first initialization diff --git a/bitnami/redmine/5/debian-11/tags-info.yaml b/bitnami/redmine/5/debian-11/tags-info.yaml index 6e8828e19670b..1b71c542be817 100644 --- a/bitnami/redmine/5/debian-11/tags-info.yaml +++ b/bitnami/redmine/5/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "5" - 5-debian-11 -- 5.1.0 +- 5.1.1 - latest diff --git a/bitnami/redmine/README.md b/bitnami/redmine/README.md index 2a1670a89af3b..c02f0c899e586 100644 --- a/bitnami/redmine/README.md +++ b/bitnami/redmine/README.md @@ -1,4 +1,4 @@ -# Redmine packaged by Bitnami +# Bitnami package for Redmine ## What is Redmine? @@ -18,12 +18,12 @@ docker-compose up -d ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use Redmine in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. @@ -228,6 +228,7 @@ Available environment variables: - `REDMINE_REST_API_ENABLED`: Whether to allow REST API calls to Redmine. Default: **0** - `REDMINE_LOAD_DEFAULT_DATA`: Whether to load default configuration data for Redmine. Default: **yes** - `REDMINE_SKIP_BOOTSTRAP`: Whether to skip performing the initial bootstrapping for the application. This is necessary in case you use a database that already has Redmine data. Default: **no** +- `REDMINE_QUEUE_ADAPTER`: Active job queue adapter. You may need to install additional dependencies if you select a value other than `async` or `inline`. Notice `async` is [not recommended](https://www.redmine.org/issues/36695) by Redmine developers in production environments. Default: **inline** #### Database connection configuration diff --git a/bitnami/reportserver/4/debian-11/Dockerfile b/bitnami/reportserver/4/debian-11/Dockerfile index f7181d7dca0e8..9dc5d24d3dc35 100644 --- a/bitnami/reportserver/4/debian-11/Dockerfile +++ b/bitnami/reportserver/4/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T19:10:51Z" \ + org.opencontainers.image.created="2023-12-08T11:39:11Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.6.1-6098-debian-11-r9" \ + org.opencontainers.image.ref.name="4.6.2-6102-debian-11-r0" \ org.opencontainers.image.title="reportserver" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="4.6.1-6098" + org.opencontainers.image.version="4.6.2-6102" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,24 +22,24 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libaudit1 libcap-ng0 libgcc-s1 libicu67 liblzma5 libncurses6 libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 procps xmlstarlet zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "tomcat-9.0.80-1-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.11.5-1-linux-${OS_ARCH}-debian-11" \ - "reportserver-4.6.1-6098-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "tomcat-9.0.83-4-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.11.6-0-linux-${OS_ARCH}-debian-11" \ + "reportserver-4.6.2-6102-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -52,7 +52,7 @@ RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh RUN /opt/bitnami/scripts/reportserver/postunpack.sh RUN /opt/bitnami/scripts/tomcat/postunpack.sh -ENV APP_VERSION="4.6.1-6098" \ +ENV APP_VERSION="4.6.2-6102" \ BITNAMI_APP_NAME="reportserver" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/tomcat/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH" \ diff --git a/bitnami/reportserver/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/reportserver/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 5a0f8c455ae61..12861d43b2d05 100644 --- a/bitnami/reportserver/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/reportserver/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,30 +3,30 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.11.5-1" + "version": "10.11.6-0" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-1" + "version": "1.0.6-4" }, "reportserver": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.6.1-6098-0" + "version": "4.6.2-6102-0" }, "tomcat": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "9.0.80-1" + "version": "9.0.83-4" } } \ No newline at end of file diff --git a/bitnami/reportserver/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/reportserver/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/reportserver/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/reportserver/4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/reportserver/4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/reportserver/4/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/reportserver/4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/reportserver/4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/reportserver/4/debian-11/tags-info.yaml b/bitnami/reportserver/4/debian-11/tags-info.yaml index 2bac466d749f0..258f77e12d59d 100644 --- a/bitnami/reportserver/4/debian-11/tags-info.yaml +++ b/bitnami/reportserver/4/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "4" - 4-debian-11 -- 4.6.1-6098 +- 4.6.2-6102 - latest diff --git a/bitnami/reportserver/README.md b/bitnami/reportserver/README.md index 61855bdcfbb22..621e615e6a51e 100644 --- a/bitnami/reportserver/README.md +++ b/bitnami/reportserver/README.md @@ -1,4 +1,4 @@ -# ReportServer Community packaged by Bitnami +# Bitnami package for ReportServer Community ## What is ReportServer Community? @@ -18,12 +18,12 @@ docker-compose up -d ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use ReportServer Community in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/rmq-default-credential-updater/1/debian-11/Dockerfile b/bitnami/rmq-default-credential-updater/1/debian-11/Dockerfile index b01293353259b..ba906344846a6 100644 --- a/bitnami/rmq-default-credential-updater/1/debian-11/Dockerfile +++ b/bitnami/rmq-default-credential-updater/1/debian-11/Dockerfile @@ -8,21 +8,21 @@ ARG TARGETARCH ENV OS_ARCH="${TARGETARCH:-amd64}" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "rmq-default-credential-updater-1.0.4-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "rmq-default-credential-updater-1.0.4-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done @@ -36,10 +36,10 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="scratch" \ - org.opencontainers.image.created="2023-10-11T15:27:31Z" \ + org.opencontainers.image.created="2023-12-06T22:20:22Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.0.4-debian-11-r0" \ + org.opencontainers.image.ref.name="1.0.4-debian-11-r3" \ org.opencontainers.image.title="rmq-default-credential-updater" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.0.4" diff --git a/bitnami/rmq-default-credential-updater/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/rmq-default-credential-updater/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index d05b981289bc4..bf8aad351a859 100644 --- a/bitnami/rmq-default-credential-updater/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/rmq-default-credential-updater/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.4-0" + "version": "1.0.4-2" } } \ No newline at end of file diff --git a/bitnami/rmq-default-credential-updater/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/rmq-default-credential-updater/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/rmq-default-credential-updater/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/rmq-default-credential-updater/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/rmq-default-credential-updater/README.md b/bitnami/rmq-default-credential-updater/README.md index 66cc625663f3a..bdfb3f4375711 100644 --- a/bitnami/rmq-default-credential-updater/README.md +++ b/bitnami/rmq-default-credential-updater/README.md @@ -15,12 +15,12 @@ docker run --name rmq-default-credential-updater bitnami/rmq-default-credential- ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use RabbitMQ Default User Credential Updater in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/rmq-messaging-topology-operator/1/debian-11/Dockerfile b/bitnami/rmq-messaging-topology-operator/1/debian-11/Dockerfile index 7be5c970d36f5..109b32034baa0 100644 --- a/bitnami/rmq-messaging-topology-operator/1/debian-11/Dockerfile +++ b/bitnami/rmq-messaging-topology-operator/1/debian-11/Dockerfile @@ -8,21 +8,21 @@ ARG TARGETARCH ENV OS_ARCH="${TARGETARCH:-amd64}" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "rmq-messaging-topology-operator-1.12.0-6-linux-${OS_ARCH}-debian-11" \ - ) && \ + "rmq-messaging-topology-operator-1.12.2-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done @@ -36,19 +36,19 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="scratch" \ - org.opencontainers.image.created="2023-10-11T08:36:11Z" \ + org.opencontainers.image.created="2023-12-11T15:54:09Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.12.0-debian-11-r58" \ + org.opencontainers.image.ref.name="1.12.2-debian-11-r0" \ org.opencontainers.image.title="rmq-messaging-topology-operator" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.12.0" + org.opencontainers.image.version="1.12.2" COPY prebuildfs / COPY rootfs / COPY --from=builder /opt/bitnami/rmq-messaging-topology-operator/bin/manager /manager -ENV APP_VERSION="1.12.0" \ +ENV APP_VERSION="1.12.2" \ BITNAMI_APP_NAME="rmq-messaging-topology-operator" USER 1001 diff --git a/bitnami/rmq-messaging-topology-operator/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/rmq-messaging-topology-operator/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index aa5bf5ec3abf7..199c1f86136e8 100644 --- a/bitnami/rmq-messaging-topology-operator/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/rmq-messaging-topology-operator/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.12.0-6" + "version": "1.12.2-0" } } \ No newline at end of file diff --git a/bitnami/rmq-messaging-topology-operator/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/rmq-messaging-topology-operator/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/rmq-messaging-topology-operator/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/rmq-messaging-topology-operator/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/rmq-messaging-topology-operator/1/debian-11/tags-info.yaml b/bitnami/rmq-messaging-topology-operator/1/debian-11/tags-info.yaml index 0f2a072e1b77e..69d6b836a2c84 100644 --- a/bitnami/rmq-messaging-topology-operator/1/debian-11/tags-info.yaml +++ b/bitnami/rmq-messaging-topology-operator/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.12.0 +- 1.12.2 - latest diff --git a/bitnami/rmq-messaging-topology-operator/README.md b/bitnami/rmq-messaging-topology-operator/README.md index 04e4b39b94737..5cf44d7a504d8 100644 --- a/bitnami/rmq-messaging-topology-operator/README.md +++ b/bitnami/rmq-messaging-topology-operator/README.md @@ -1,4 +1,4 @@ -# RabbitMQ Messaging Topology Operator packaged by Bitnami +# Bitnami package for RabbitMQ Messaging Topology Operator ## What is RabbitMQ Messaging Topology Operator? @@ -15,12 +15,12 @@ docker run --name rmq-default-credential-updater bitnami/rmq-messaging-topology- ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use RabbitMQ Messaging Topology Operator in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/ruby/3.0/debian-11/Dockerfile b/bitnami/ruby/3.0/debian-11/Dockerfile index 95184e0f39501..77fdc532e9c7a 100644 --- a/bitnami/ruby/3.0/debian-11/Dockerfile +++ b/bitnami/ruby/3.0/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T17:39:41Z" \ + org.opencontainers.image.created="2023-12-02T08:05:16Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.0.6-debian-11-r171" \ + org.opencontainers.image.ref.name="3.0.6-debian-11-r173" \ org.opencontainers.image.title="ruby" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.0.6" @@ -20,20 +20,20 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages build-essential ca-certificates curl git libcrypt1 libreadline-dev libreadline8 libsqlite3-dev libssl-dev libssl1.1 libtinfo6 libyaml-dev pkg-config procps sqlite3 unzip wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ruby-3.0.6-8-linux-${OS_ARCH}-debian-11" \ - ) && \ + "ruby-3.0.6-9-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/ruby/3.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/ruby/3.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index de27f7c061af6..072bcd52a59be 100644 --- a/bitnami/ruby/3.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/ruby/3.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.0.6-8" + "version": "3.0.6-9" } } \ No newline at end of file diff --git a/bitnami/ruby/3.0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/ruby/3.0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/ruby/3.0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/ruby/3.0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/ruby/3.1/debian-11/Dockerfile b/bitnami/ruby/3.1/debian-11/Dockerfile index 3dfa668be780f..0f44b34d2c97c 100644 --- a/bitnami/ruby/3.1/debian-11/Dockerfile +++ b/bitnami/ruby/3.1/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T17:40:01Z" \ + org.opencontainers.image.created="2023-12-02T07:41:37Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.1.4-debian-11-r173" \ + org.opencontainers.image.ref.name="3.1.4-debian-11-r175" \ org.opencontainers.image.title="ruby" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.1.4" @@ -20,20 +20,20 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages build-essential ca-certificates curl git libcrypt1 libreadline-dev libreadline8 libsqlite3-dev libssl-dev libssl1.1 libtinfo6 libyaml-dev pkg-config procps sqlite3 unzip wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ruby-3.1.4-8-linux-${OS_ARCH}-debian-11" \ - ) && \ + "ruby-3.1.4-9-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/ruby/3.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/ruby/3.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c8fc52dcc6c61..a6c3b48348166 100644 --- a/bitnami/ruby/3.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/ruby/3.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.1.4-8" + "version": "3.1.4-9" } } \ No newline at end of file diff --git a/bitnami/ruby/3.1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/ruby/3.1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/ruby/3.1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/ruby/3.1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/ruby/3.2/debian-11/Dockerfile b/bitnami/ruby/3.2/debian-11/Dockerfile index cda892ca3efb1..069f6315b6e99 100644 --- a/bitnami/ruby/3.2/debian-11/Dockerfile +++ b/bitnami/ruby/3.2/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T16:49:59Z" \ + org.opencontainers.image.created="2023-12-02T09:28:05Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.2.2-debian-11-r172" \ + org.opencontainers.image.ref.name="3.2.2-debian-11-r174" \ org.opencontainers.image.title="ruby" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.2.2" @@ -20,20 +20,20 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages build-essential ca-certificates curl git libcrypt1 libffi7 libreadline-dev libreadline8 libsqlite3-dev libssl-dev libssl1.1 libtinfo6 libyaml-0-2 libyaml-dev pkg-config procps sqlite3 unzip wget zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ruby-3.2.2-8-linux-${OS_ARCH}-debian-11" \ - ) && \ + "ruby-3.2.2-9-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/ruby/3.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/ruby/3.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8afd17a9a2c87..1fb100666d4a4 100644 --- a/bitnami/ruby/3.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/ruby/3.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.2.2-8" + "version": "3.2.2-9" } } \ No newline at end of file diff --git a/bitnami/ruby/3.2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/ruby/3.2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/ruby/3.2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/ruby/3.2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/ruby/README.md b/bitnami/ruby/README.md index cf83c85cc8d4d..1ebfd1e02dfe0 100644 --- a/bitnami/ruby/README.md +++ b/bitnami/ruby/README.md @@ -1,4 +1,4 @@ -# Ruby packaged by Bitnami +# Bitnami package for Ruby ## What is Ruby? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/schema-registry/7.1/debian-11/Dockerfile b/bitnami/schema-registry/7.1/debian-11/Dockerfile index e6217019448cb..9da33de6185b5 100644 --- a/bitnami/schema-registry/7.1/debian-11/Dockerfile +++ b/bitnami/schema-registry/7.1/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T19:19:57Z" \ + org.opencontainers.image.created="2023-12-07T17:23:00Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.1.9-debian-11-r3" \ + org.opencontainers.image.ref.name="7.1.10-debian-11-r1" \ org.opencontainers.image.title="schema-registry" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.1.9" + org.opencontainers.image.version="7.1.10" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,21 +22,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl netcat-openbsd procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "schema-registry-7.1.9-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "schema-registry-7.1.10-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -47,7 +47,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/schema-registry/postunpack.sh -ENV APP_VERSION="7.1.9" \ +ENV APP_VERSION="7.1.10" \ BITNAMI_APP_NAME="schema-registry" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:/opt/bitnami/schema-registry/bin:$PATH" diff --git a/bitnami/schema-registry/7.1/debian-11/docker-compose.yml b/bitnami/schema-registry/7.1/debian-11/docker-compose.yml index 8e2d583458635..6caf49a250d69 100644 --- a/bitnami/schema-registry/7.1/debian-11/docker-compose.yml +++ b/bitnami/schema-registry/7.1/debian-11/docker-compose.yml @@ -5,7 +5,7 @@ version: '2' services: kafka-0: - image: docker.io/bitnami/kafka:3.5 + image: docker.io/bitnami/kafka:3.6 environment: # KRaft settings - KAFKA_CFG_NODE_ID=0 @@ -21,7 +21,7 @@ services: volumes: - 'kafka0_data:/bitnami/kafka' kafka-1: - image: docker.io/bitnami/kafka:3.5 + image: docker.io/bitnami/kafka:3.6 environment: # KRaft settings - KAFKA_CFG_NODE_ID=1 diff --git a/bitnami/schema-registry/7.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/schema-registry/7.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 31ef1989ad5d3..447d159b365b6 100644 --- a/bitnami/schema-registry/7.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/schema-registry/7.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "schema-registry": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.1.9-0" + "version": "7.1.10-0" } } \ No newline at end of file diff --git a/bitnami/schema-registry/7.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/schema-registry/7.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/schema-registry/7.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/schema-registry/7.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/schema-registry/7.1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/schema-registry/7.1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/schema-registry/7.1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/schema-registry/7.1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/schema-registry/7.1/debian-11/tags-info.yaml b/bitnami/schema-registry/7.1/debian-11/tags-info.yaml index c951656683a36..2bc4fc24bdcb9 100644 --- a/bitnami/schema-registry/7.1/debian-11/tags-info.yaml +++ b/bitnami/schema-registry/7.1/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "7.1" - 7.1-debian-11 -- 7.1.9 +- 7.1.10 diff --git a/bitnami/schema-registry/7.2/debian-11/Dockerfile b/bitnami/schema-registry/7.2/debian-11/Dockerfile index 9e8f2e52e9e43..24a3ae1ae0478 100644 --- a/bitnami/schema-registry/7.2/debian-11/Dockerfile +++ b/bitnami/schema-registry/7.2/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T19:23:51Z" \ + org.opencontainers.image.created="2023-12-09T05:48:06Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.2.7-debian-11-r3" \ + org.opencontainers.image.ref.name="7.2.8-debian-11-r2" \ org.opencontainers.image.title="schema-registry" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.2.7" + org.opencontainers.image.version="7.2.8" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,21 +22,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl netcat-openbsd procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "schema-registry-7.2.7-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "schema-registry-7.2.8-1-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -47,7 +47,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/schema-registry/postunpack.sh -ENV APP_VERSION="7.2.7" \ +ENV APP_VERSION="7.2.8" \ BITNAMI_APP_NAME="schema-registry" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:/opt/bitnami/schema-registry/bin:$PATH" diff --git a/bitnami/schema-registry/7.2/debian-11/docker-compose.yml b/bitnami/schema-registry/7.2/debian-11/docker-compose.yml index f0804eed02e14..3d65d4ebe8021 100644 --- a/bitnami/schema-registry/7.2/debian-11/docker-compose.yml +++ b/bitnami/schema-registry/7.2/debian-11/docker-compose.yml @@ -5,7 +5,7 @@ version: '2' services: kafka-0: - image: docker.io/bitnami/kafka:3.5 + image: docker.io/bitnami/kafka:3.6 environment: # KRaft settings - KAFKA_CFG_NODE_ID=0 @@ -21,7 +21,7 @@ services: volumes: - 'kafka0_data:/bitnami/kafka' kafka-1: - image: docker.io/bitnami/kafka:3.5 + image: docker.io/bitnami/kafka:3.6 environment: # KRaft settings - KAFKA_CFG_NODE_ID=1 diff --git a/bitnami/schema-registry/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/schema-registry/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index fb619e4ba2ca0..eb40ae4b7f8b4 100644 --- a/bitnami/schema-registry/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/schema-registry/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "schema-registry": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.2.7-0" + "version": "7.2.8-1" } } \ No newline at end of file diff --git a/bitnami/schema-registry/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/schema-registry/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/schema-registry/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/schema-registry/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/schema-registry/7.2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/schema-registry/7.2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/schema-registry/7.2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/schema-registry/7.2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/schema-registry/7.2/debian-11/tags-info.yaml b/bitnami/schema-registry/7.2/debian-11/tags-info.yaml index f3a82e32d2b9d..3cb75c00a4f84 100644 --- a/bitnami/schema-registry/7.2/debian-11/tags-info.yaml +++ b/bitnami/schema-registry/7.2/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "7.2" - 7.2-debian-11 -- 7.2.7 +- 7.2.8 diff --git a/bitnami/schema-registry/7.3/debian-11/Dockerfile b/bitnami/schema-registry/7.3/debian-11/Dockerfile index 1cbd01c1456f0..06a62581a5a1f 100644 --- a/bitnami/schema-registry/7.3/debian-11/Dockerfile +++ b/bitnami/schema-registry/7.3/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-10T06:53:50Z" \ + org.opencontainers.image.created="2023-12-01T14:54:11Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.3.3-debian-11-r149" \ + org.opencontainers.image.ref.name="7.3.6-debian-11-r0" \ org.opencontainers.image.title="schema-registry" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.3.3" + org.opencontainers.image.version="7.3.6" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,21 +22,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl netcat-openbsd procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "schema-registry-7.3.3-4-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "schema-registry-7.3.6-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -47,7 +47,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/schema-registry/postunpack.sh -ENV APP_VERSION="7.3.3" \ +ENV APP_VERSION="7.3.6" \ BITNAMI_APP_NAME="schema-registry" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:/opt/bitnami/schema-registry/bin:$PATH" diff --git a/bitnami/schema-registry/7.3/debian-11/docker-compose.yml b/bitnami/schema-registry/7.3/debian-11/docker-compose.yml index 374cef7534411..34803948394b8 100644 --- a/bitnami/schema-registry/7.3/debian-11/docker-compose.yml +++ b/bitnami/schema-registry/7.3/debian-11/docker-compose.yml @@ -5,7 +5,7 @@ version: '2' services: kafka-0: - image: docker.io/bitnami/kafka:3.5 + image: docker.io/bitnami/kafka:3.6 environment: # KRaft settings - KAFKA_CFG_NODE_ID=0 @@ -21,7 +21,7 @@ services: volumes: - 'kafka0_data:/bitnami/kafka' kafka-1: - image: docker.io/bitnami/kafka:3.5 + image: docker.io/bitnami/kafka:3.6 environment: # KRaft settings - KAFKA_CFG_NODE_ID=1 diff --git a/bitnami/schema-registry/7.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/schema-registry/7.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index d9be46273c5c2..9f4ed24e3540c 100644 --- a/bitnami/schema-registry/7.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/schema-registry/7.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "schema-registry": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.3.3-4" + "version": "7.3.6-0" } } \ No newline at end of file diff --git a/bitnami/schema-registry/7.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/schema-registry/7.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/schema-registry/7.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/schema-registry/7.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/schema-registry/7.3/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/schema-registry/7.3/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/schema-registry/7.3/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/schema-registry/7.3/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/schema-registry/7.3/debian-11/tags-info.yaml b/bitnami/schema-registry/7.3/debian-11/tags-info.yaml index 7098049a16b4d..92708e16d0cbb 100644 --- a/bitnami/schema-registry/7.3/debian-11/tags-info.yaml +++ b/bitnami/schema-registry/7.3/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "7.3" - 7.3-debian-11 -- 7.3.3 +- 7.3.6 diff --git a/bitnami/schema-registry/7.4/debian-11/Dockerfile b/bitnami/schema-registry/7.4/debian-11/Dockerfile index 5ab95fc46ef8e..6ce22d52fdad5 100644 --- a/bitnami/schema-registry/7.4/debian-11/Dockerfile +++ b/bitnami/schema-registry/7.4/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T19:34:37Z" \ + org.opencontainers.image.created="2023-12-01T20:35:38Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.4.1-debian-11-r60" \ + org.opencontainers.image.ref.name="7.4.3-debian-11-r0" \ org.opencontainers.image.title="schema-registry" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.4.1" + org.opencontainers.image.version="7.4.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,21 +22,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl netcat-openbsd procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "schema-registry-7.4.1-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "schema-registry-7.4.3-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -47,7 +47,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/schema-registry/postunpack.sh -ENV APP_VERSION="7.4.1" \ +ENV APP_VERSION="7.4.3" \ BITNAMI_APP_NAME="schema-registry" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:/opt/bitnami/schema-registry/bin:$PATH" diff --git a/bitnami/schema-registry/7.4/debian-11/docker-compose.yml b/bitnami/schema-registry/7.4/debian-11/docker-compose.yml index 803dde4646933..5f050ca1af928 100644 --- a/bitnami/schema-registry/7.4/debian-11/docker-compose.yml +++ b/bitnami/schema-registry/7.4/debian-11/docker-compose.yml @@ -5,7 +5,7 @@ version: '2' services: kafka-0: - image: docker.io/bitnami/kafka:3.5 + image: docker.io/bitnami/kafka:3.6 environment: # KRaft settings - KAFKA_CFG_NODE_ID=0 @@ -21,7 +21,7 @@ services: volumes: - 'kafka0_data:/bitnami/kafka' kafka-1: - image: docker.io/bitnami/kafka:3.5 + image: docker.io/bitnami/kafka:3.6 environment: # KRaft settings - KAFKA_CFG_NODE_ID=1 diff --git a/bitnami/schema-registry/7.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/schema-registry/7.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 211ac338e082e..30f07b8b8c9d1 100644 --- a/bitnami/schema-registry/7.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/schema-registry/7.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "schema-registry": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.4.1-2" + "version": "7.4.3-0" } } \ No newline at end of file diff --git a/bitnami/schema-registry/7.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/schema-registry/7.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/schema-registry/7.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/schema-registry/7.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/schema-registry/7.4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/schema-registry/7.4/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/schema-registry/7.4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/schema-registry/7.4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/schema-registry/7.4/debian-11/tags-info.yaml b/bitnami/schema-registry/7.4/debian-11/tags-info.yaml index 10ce81319c866..de6d988feceb4 100644 --- a/bitnami/schema-registry/7.4/debian-11/tags-info.yaml +++ b/bitnami/schema-registry/7.4/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "7.4" - 7.4-debian-11 -- 7.4.1 +- 7.4.3 diff --git a/bitnami/schema-registry/7.5/debian-11/Dockerfile b/bitnami/schema-registry/7.5/debian-11/Dockerfile index c5e4e2ea3f146..f877c755dbc56 100644 --- a/bitnami/schema-registry/7.5/debian-11/Dockerfile +++ b/bitnami/schema-registry/7.5/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T12:08:23Z" \ + org.opencontainers.image.created="2023-12-09T08:02:15Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.5.1-debian-11-r1" \ + org.opencontainers.image.ref.name="7.5.2-debian-11-r1" \ org.opencontainers.image.title="schema-registry" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.5.1" + org.opencontainers.image.version="7.5.2" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,21 +22,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl netcat-openbsd procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "schema-registry-7.5.1-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "schema-registry-7.5.2-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -47,7 +47,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/schema-registry/postunpack.sh -ENV APP_VERSION="7.5.1" \ +ENV APP_VERSION="7.5.2" \ BITNAMI_APP_NAME="schema-registry" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:/opt/bitnami/schema-registry/bin:$PATH" diff --git a/bitnami/schema-registry/7.5/debian-11/docker-compose.yml b/bitnami/schema-registry/7.5/debian-11/docker-compose.yml index d4c799b8dd903..3bb61cd5739df 100644 --- a/bitnami/schema-registry/7.5/debian-11/docker-compose.yml +++ b/bitnami/schema-registry/7.5/debian-11/docker-compose.yml @@ -5,7 +5,7 @@ version: '2' services: kafka-0: - image: docker.io/bitnami/kafka:3.5 + image: docker.io/bitnami/kafka:3.6 environment: # KRaft settings - KAFKA_CFG_NODE_ID=0 @@ -21,7 +21,7 @@ services: volumes: - 'kafka0_data:/bitnami/kafka' kafka-1: - image: docker.io/bitnami/kafka:3.5 + image: docker.io/bitnami/kafka:3.6 environment: # KRaft settings - KAFKA_CFG_NODE_ID=1 diff --git a/bitnami/schema-registry/7.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/schema-registry/7.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index fdd07053cc47e..b1998eae6bab4 100644 --- a/bitnami/schema-registry/7.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/schema-registry/7.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "schema-registry": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.5.1-1" + "version": "7.5.2-0" } } \ No newline at end of file diff --git a/bitnami/schema-registry/7.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/schema-registry/7.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/schema-registry/7.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/schema-registry/7.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/schema-registry/7.5/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/schema-registry/7.5/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/schema-registry/7.5/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/schema-registry/7.5/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/schema-registry/7.5/debian-11/tags-info.yaml b/bitnami/schema-registry/7.5/debian-11/tags-info.yaml index db4a18fcfd6b6..f3b17a067bed8 100644 --- a/bitnami/schema-registry/7.5/debian-11/tags-info.yaml +++ b/bitnami/schema-registry/7.5/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "7.5" - 7.5-debian-11 -- 7.5.1 +- 7.5.2 - latest diff --git a/bitnami/schema-registry/README.md b/bitnami/schema-registry/README.md index 74cd15e9239aa..2333c53ea4abc 100644 --- a/bitnami/schema-registry/README.md +++ b/bitnami/schema-registry/README.md @@ -1,4 +1,4 @@ -# Confluent Schema Registry packaged by Bitnami +# Bitnami package for Confluent Schema Registry ## What is Confluent Schema Registry? @@ -18,7 +18,7 @@ docker run --name schema-registry bitnami/schema-registry:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/schema-registry/docker-compose.yml b/bitnami/schema-registry/docker-compose.yml index d4c799b8dd903..3bb61cd5739df 100644 --- a/bitnami/schema-registry/docker-compose.yml +++ b/bitnami/schema-registry/docker-compose.yml @@ -5,7 +5,7 @@ version: '2' services: kafka-0: - image: docker.io/bitnami/kafka:3.5 + image: docker.io/bitnami/kafka:3.6 environment: # KRaft settings - KAFKA_CFG_NODE_ID=0 @@ -21,7 +21,7 @@ services: volumes: - 'kafka0_data:/bitnami/kafka' kafka-1: - image: docker.io/bitnami/kafka:3.5 + image: docker.io/bitnami/kafka:3.6 environment: # KRaft settings - KAFKA_CFG_NODE_ID=1 diff --git a/bitnami/sealed-secrets-kubeseal/0/debian-11/Dockerfile b/bitnami/sealed-secrets-kubeseal/0/debian-11/Dockerfile new file mode 100644 index 0000000000000..3dc68f3013909 --- /dev/null +++ b/bitnami/sealed-secrets-kubeseal/0/debian-11/Dockerfile @@ -0,0 +1,56 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +FROM docker.io/bitnami/minideb:bullseye as builder + +ARG TARGETARCH + +ENV OS_ARCH="${TARGETARCH:-amd64}" + +COPY prebuildfs / +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] + +# Install required system packages and dependencies +RUN install_packages ca-certificates curl +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ + COMPONENTS=( \ + "sealed-secrets-kubeseal-0.24.5-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ + for COMPONENT in "${COMPONENTS[@]}"; do \ + if [ ! -f "${COMPONENT}.tar.gz" ]; then \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ + rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ + done + +###### + +FROM scratch + +ARG TARGETARCH + +ENV OS_ARCH="${TARGETARCH:-amd64}" + +LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ + org.opencontainers.image.base.name="scratch" \ + org.opencontainers.image.created="2023-12-15T13:34:01Z" \ + org.opencontainers.image.description="Application packaged by VMware, Inc" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.ref.name="0.24.5-debian-11-r0" \ + org.opencontainers.image.title="sealed-secrets-kubeseal" \ + org.opencontainers.image.vendor="VMware, Inc." \ + org.opencontainers.image.version="0.24.5" + +COPY prebuildfs / +COPY rootfs / +COPY --from=builder /opt/bitnami/sealed-secrets-kubeseal/bin/kubeseal /kubeseal + +ENV APP_VERSION="0.24.5" \ + BITNAMI_APP_NAME="sealed-secrets-kubeseal" + +USER 1001 + +ENTRYPOINT [ "/kubeseal" ] diff --git a/bitnami/sealed-secrets-kubeseal/0/debian-11/docker-compose.yml b/bitnami/sealed-secrets-kubeseal/0/debian-11/docker-compose.yml new file mode 100644 index 0000000000000..56ccca10ccd6c --- /dev/null +++ b/bitnami/sealed-secrets-kubeseal/0/debian-11/docker-compose.yml @@ -0,0 +1,7 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +version: '2' +services: + kubeseal: + image: docker.io/bitnami/sealed-secrets-kubeseal:0 diff --git a/bitnami/sealed-secrets-kubeseal/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/sealed-secrets-kubeseal/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json new file mode 100644 index 0000000000000..9d8d124e4a288 --- /dev/null +++ b/bitnami/sealed-secrets-kubeseal/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -0,0 +1,8 @@ +{ + "sealed-secrets-kubeseal": { + "arch": "amd64", + "distro": "debian-11", + "type": "NAMI", + "version": "0.24.5-0" + } +} \ No newline at end of file diff --git a/bitnami/sealed-secrets-kubeseal/0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/sealed-secrets-kubeseal/0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt new file mode 100644 index 0000000000000..76956b38e82c6 --- /dev/null +++ b/bitnami/sealed-secrets-kubeseal/0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt @@ -0,0 +1,2 @@ +Bitnami containers ship with software bundles. You can find the licenses under: +/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/sealed-secrets-kubeseal/0/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/sealed-secrets-kubeseal/0/debian-11/prebuildfs/usr/sbin/install_packages new file mode 100755 index 0000000000000..acbc3173208c0 --- /dev/null +++ b/bitnami/sealed-secrets-kubeseal/0/debian-11/prebuildfs/usr/sbin/install_packages @@ -0,0 +1,27 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -eu + +n=0 +max=2 +export DEBIAN_FRONTEND=noninteractive + +until [ $n -gt $max ]; do + set +e + ( + apt-get update -qq && + apt-get install -y --no-install-recommends "$@" + ) + CODE=$? + set -e + if [ $CODE -eq 0 ]; then + break + fi + if [ $n -eq $max ]; then + exit $CODE + fi + echo "apt failed, retrying" + n=$(($n + 1)) +done +apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/sealed-secrets-kubeseal/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/sealed-secrets-kubeseal/0/debian-11/prebuildfs/usr/sbin/run-script new file mode 100755 index 0000000000000..b7a5bf1e50bff --- /dev/null +++ b/bitnami/sealed-secrets-kubeseal/0/debian-11/prebuildfs/usr/sbin/run-script @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -u + +if [ $# -eq 0 ]; then + >&2 echo "No arguments provided" + exit 1 +fi + +script=$1 +exit_code="${2:-96}" +fail_if_not_present="${3:-y}" + +if test -f "$script"; then + sh $script + + if [ $? -ne 0 ]; then + exit $((exit_code)) + fi +elif [ "$fail_if_not_present" = "y" ]; then + >&2 echo "script not found: $script" + exit 127 +fi diff --git a/bitnami/sealed-secrets-kubeseal/0/debian-11/rootfs/etc/ssl/certs/ca-certificates.crt b/bitnami/sealed-secrets-kubeseal/0/debian-11/rootfs/etc/ssl/certs/ca-certificates.crt new file mode 100644 index 0000000000000..2d584626cce62 --- /dev/null +++ b/bitnami/sealed-secrets-kubeseal/0/debian-11/rootfs/etc/ssl/certs/ca-certificates.crt @@ -0,0 +1,3864 @@ +-----BEGIN CERTIFICATE----- +MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UE +AwwJQUNDVlJBSVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQsw +CQYDVQQGEwJFUzAeFw0xMTA1MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQ +BgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwHUEtJQUNDVjENMAsGA1UECgwEQUND +VjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCb +qau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gMjmoY +HtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWo +G2ioPej0RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpA +lHPrzg5XPAOBOp0KoVdDaaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhr +IA8wKFSVf+DuzgpmndFALW4ir50awQUZ0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/ +0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDGWuzndN9wrqODJerWx5eH +k6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs78yM2x/47 +4KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMO +m3WR5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpa +cXpkatcnYGMN285J9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPl +uUsXQA+xtrn13k/c4LOsOxFwYIRKQ26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYI +KwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRwOi8vd3d3LmFjY3YuZXMvZmls +ZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEuY3J0MB8GCCsG +AQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2 +VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeT +VfZW6oHlNsyMHj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIG +CCsGAQUFBwICMIIBFB6CARAAQQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUA +cgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBhAO0AegAgAGQAZQAgAGwAYQAgAEEA +QwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUAYwBuAG8AbABvAGcA +7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBjAHQA +cgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAA +QwBQAFMAIABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUA +czAwBggrBgEFBQcCARYkaHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2Mu +aHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRt +aW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2MV9kZXIuY3JsMA4GA1Ud +DwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZIhvcNAQEF +BQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdp +D70ER9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gU +JyCpZET/LtZ1qmxNYEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+m +AM/EKXMRNt6GGT6d7hmKG9Ww7Y49nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepD +vV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJTS+xJlsndQAJxGJ3KQhfnlms +tn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3sCPdK6jT2iWH +7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h +I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szA +h1xA2syVP1XgNce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xF +d3+YJ5oyXSrjhO7FmGYvliAd3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2H +pPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3pEfbRD0tVNEYqi4Y7 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFgzCCA2ugAwIBAgIPXZONMGc2yAYdGsdUhGkHMA0GCSqGSIb3DQEBCwUAMDsx +CzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJ +WiBGTk1ULVJDTTAeFw0wODEwMjkxNTU5NTZaFw0zMDAxMDEwMDAwMDBaMDsxCzAJ +BgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJWiBG +Tk1ULVJDTTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALpxgHpMhm5/ +yBNtwMZ9HACXjywMI7sQmkCpGreHiPibVmr75nuOi5KOpyVdWRHbNi63URcfqQgf +BBckWKo3Shjf5TnUV/3XwSyRAZHiItQDwFj8d0fsjz50Q7qsNI1NOHZnjrDIbzAz +WHFctPVrbtQBULgTfmxKo0nRIBnuvMApGGWn3v7v3QqQIecaZ5JCEJhfTzC8PhxF +tBDXaEAUwED653cXeuYLj2VbPNmaUtu1vZ5Gzz3rkQUCwJaydkxNEJY7kvqcfw+Z +374jNUUeAlz+taibmSXaXvMiwzn15Cou08YfxGyqxRxqAQVKL9LFwag0Jl1mpdIC +IfkYtwb1TplvqKtMUejPUBjFd8g5CSxJkjKZqLsXF3mwWsXmo8RZZUc1g16p6DUL +mbvkzSDGm0oGObVo/CK67lWMK07q87Hj/LaZmtVC+nFNCM+HHmpxffnTtOmlcYF7 +wk5HlqX2doWjKI/pgG6BU6VtX7hI+cL5NqYuSf+4lsKMB7ObiFj86xsc3i1w4peS +MKGJ47xVqCfWS+2QrYv6YyVZLag13cqXM7zlzced0ezvXg5KkAYmY6252TUtB7p2 +ZSysV4999AeU14ECll2jB0nVetBX+RvnU0Z1qrB5QstocQjpYL05ac70r8NWQMet +UqIJ5G+GR4of6ygnXYMgrwTJbFaai0b1AgMBAAGjgYMwgYAwDwYDVR0TAQH/BAUw +AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFPd9xf3E6Jobd2Sn9R2gzL+H +YJptMD4GA1UdIAQ3MDUwMwYEVR0gADArMCkGCCsGAQUFBwIBFh1odHRwOi8vd3d3 +LmNlcnQuZm5tdC5lcy9kcGNzLzANBgkqhkiG9w0BAQsFAAOCAgEAB5BK3/MjTvDD +nFFlm5wioooMhfNzKWtN/gHiqQxjAb8EZ6WdmF/9ARP67Jpi6Yb+tmLSbkyU+8B1 +RXxlDPiyN8+sD8+Nb/kZ94/sHvJwnvDKuO+3/3Y3dlv2bojzr2IyIpMNOmqOFGYM +LVN0V2Ue1bLdI4E7pWYjJ2cJj+F3qkPNZVEI7VFY/uY5+ctHhKQV8Xa7pO6kO8Rf +77IzlhEYt8llvhjho6Tc+hj507wTmzl6NLrTQfv6MooqtyuGC2mDOL7Nii4LcK2N +JpLuHvUBKwrZ1pebbuCoGRw6IYsMHkCtA+fdZn71uSANA+iW+YJF1DngoABd15jm +fZ5nc8OaKveri6E6FO80vFIOiZiaBECEHX5FaZNXzuvO+FB8TxxuBEOb+dY7Ixjp +6o7RTUaN8Tvkasq6+yO3m/qZASlaWFot4/nUbQ4mrcFuNLwy+AwF+mWj2zs3gyLp +1txyM/1d8iC9djwj2ij3+RvrWWTV3F9yfiD8zYm1kGdNYno/Tq0dwzn+evQoFt9B +9kiABdcPUXmsEKvU7ANm5mqwujGSQkBqvjrTcuFqN1W8rB2Vt2lh8kORdOag0wok +RqEIr9baRRmW1FMdW4R58MD3R++Lj8UGrp1MYp3/RgT408m2ECVAdf4WqslKYIYv +uu8wd+RU4riEmViAqhOLUTpPSPaLtrM= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsx +CzAJBgNVBAYTAkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRp +ZmljYWNpw7NuIERpZ2l0YWwgLSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwa +QUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4wHhcNMDYxMTI3MjA0NjI5WhcNMzAw +NDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+U29jaWVkYWQgQ2Ft +ZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJhIFMu +QS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkq +hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeG +qentLhM0R7LQcNzJPNCNyu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzL +fDe3fezTf3MZsGqy2IiKLUV0qPezuMDU2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQ +Y5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU34ojC2I+GdV75LaeHM/J4 +Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP2yYe68yQ +54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+b +MMCm8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48j +ilSH5L887uvDdUhfHjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++Ej +YfDIJss2yKHzMI+ko6Kh3VOz3vCaMh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/zt +A/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK5lw1omdMEWux+IBkAC1vImHF +rEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1bczwmPS9KvqfJ +pxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE +AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCB +lTCBkgYEVR0gADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFy +YS5jb20vZHBjLzBaBggrBgEFBQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW50 +7WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2UgcHVlZGVuIGVuY29udHJhciBlbiBs +YSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEfAygPU3zmpFmps4p6 +xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuXEpBc +unvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/ +Jre7Ir5v/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dp +ezy4ydV/NgIlqmjCMRW3MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42 +gzmRkBDI8ck1fj+404HGIGQatlDCIaR43NAvO2STdPCWkPHv+wlaNECW8DYSwaN0 +jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wkeZBWN7PGKX6jD/EpOe9+ +XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f/RWmnkJD +W2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/ +RL5hRqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35r +MDOhYil/SrnhLecUIw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxk +BYn8eNZcLCZDqQ== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UE +BhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8w +MzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290 +IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDkyMjExMjIwMlowazELMAkGA1UEBhMC +SVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1 +ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENB +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNv +UTufClrJwkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX +4ay8IMKx4INRimlNAJZaby/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9 +KK3giq0itFZljoZUj5NDKd45RnijMCO6zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/ +gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1fYVEiVRvjRuPjPdA1Yprb +rxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2oxgkg4YQ +51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2F +be8lEfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxe +KF+w6D9Fz8+vm2/7hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4F +v6MGn8i1zeQf1xcGDXqVdFUNaBr8EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbn +fpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5jF66CyCU3nuDuP/jVo23Eek7 +jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLYiDrIn3hm7Ynz +ezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt +ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQAL +e3KHwGCmSUyIWOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70 +jsNjLiNmsGe+b7bAEzlgqqI0JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDz +WochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKxK3JCaKygvU5a2hi/a5iB0P2avl4V +SM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+Xlff1ANATIGk0k9j +pwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC4yyX +X04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+Ok +fcvHlXHo2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7R +K4X9p2jIugErsWx0Hbhzlefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btU +ZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXemOR/qnuOf0GZvBeyqdn6/axag67XH/JJU +LysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9vwGYT7JZVEc+NHt4bVaT +LnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU +MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs +IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290 +MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux +FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h +bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v +dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt +H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9 +uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX +mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX +a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN +E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0 +WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD +VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0 +Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU +cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx +IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN +AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH +YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5 +6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC +Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX +c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a +mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU +MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3 +b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw +MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML +QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD +VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA +A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul +CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n +tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl +dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch +PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC ++Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O +BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E +BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl +MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk +ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB +IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X +7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz +43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY +eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl +pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA +WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE +BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz +dCBDb21tZXJjaWFsMB4XDTEwMDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDEL +MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp +cm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6EqdbDuKP +Hx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yr +ba0F8PrVC8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPAL +MeIrJmqbTFeurCA+ukV6BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1 +yHp52UKqK39c/s4mT6NmgTWvRLpUHhwwMmWd5jyTXlBOeuM61G7MGvv50jeuJCqr +VwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNVHQ4EFgQUnZPGU4teyq8/ +nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ +KoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYG +XUPGhi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNj +vbz4YYCanrHOQnDiqX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivt +Z8SOyUOyXGsViQK8YvxO8rUzqrJv0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9g +N53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0khsUlHRUe072o0EclNmsxZt9YC +nlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE +BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz +dCBOZXR3b3JraW5nMB4XDTEwMDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDEL +MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp +cm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SEHi3y +YJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbua +kCNrmreIdIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRL +QESxG9fhwoXA3hA/Pe24/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp +6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gbh+0t+nvujArjqWaJGctB+d1ENmHP4ndG +yH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNVHQ4EFgQUBx/S55zawm6i +QLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ +KoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfO +tDIuUFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzu +QY0x2+c06lkh1QF612S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZ +Lgo/bNjR9eUJtGxUAArgFU2HdW23WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4u +olu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9/ZFvgrG+CJPbFEfxojfHRZ48 +x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE +BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVz +dCBQcmVtaXVtMB4XDTEwMDEyOTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkG +A1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1U +cnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxBLf +qV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtnBKAQ +JG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ ++jjeRFcV5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrS +s8PhaJyJ+HoAVt70VZVs+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5 +HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmdGPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d7 +70O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5Rp9EixAqnOEhss/n/fauG +V+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NIS+LI+H+S +qHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S +5u046uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4Ia +C1nEWTJ3s7xgaVY5/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TX +OwF0lkLgAOIua+rF7nKsu7/+6qqo+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYE +FJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/ +BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByvMiPIs0laUZx2 +KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg +Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B +8OWycvpEgjNC6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQ +MKSOyARiqcTtNd56l+0OOF6SL5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc +0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK+4w1IX2COPKpVJEZNZOUbWo6xbLQ +u4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmVBtWVyuEklut89pMF +u+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFgIxpH +YoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8 +GKa1qF60g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaO +RtGdFNrHF+QFlozEJLUbzxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6e +KeC2uAloGRwYQw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMC +VVMxFDASBgNVBAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQ +cmVtaXVtIEVDQzAeFw0xMDAxMjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJ +BgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwXQWZmaXJt +VHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNMF4bFZ0D +0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQN8O9 +ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0G +A1UdDgQWBBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4G +A1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/Vs +aobgxCd05DhT1wV/GzTjxi+zygk8N53X57hG8f2h4nECMEJZh0PUUd+60wkyWs6I +flc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKMeQ== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsF +ADA5MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6 +b24gUm9vdCBDQSAxMB4XDTE1MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTEL +MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv +b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj +ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM +9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw +IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6 +VOujw5H5SNz/0egwLX0tdHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L +93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm +jgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC +AYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3DQEBCwUA +A4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDI +U5PMCCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUs +N+gDS63pYaACbvXy8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vv +o/ufQJVtMVT8QtPHRh8jrdkPSHCa2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU +5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2xJNDd2ZhwLnoQdeXeGADbkpy +rqXRfboQnoZsG4q5WTP468SQvvG5 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFQTCCAymgAwIBAgITBmyf0pY1hp8KD+WGePhbJruKNzANBgkqhkiG9w0BAQwF +ADA5MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6 +b24gUm9vdCBDQSAyMB4XDTE1MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTEL +MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv +b3QgQ0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK2Wny2cSkxK +gXlRmeyKy2tgURO8TW0G/LAIjd0ZEGrHJgw12MBvIITplLGbhQPDW9tK6Mj4kHbZ +W0/jTOgGNk3Mmqw9DJArktQGGWCsN0R5hYGCrVo34A3MnaZMUnbqQ523BNFQ9lXg +1dKmSYXpN+nKfq5clU1Imj+uIFptiJXZNLhSGkOQsL9sBbm2eLfq0OQ6PBJTYv9K +8nu+NQWpEjTj82R0Yiw9AElaKP4yRLuH3WUnAnE72kr3H9rN9yFVkE8P7K6C4Z9r +2UXTu/Bfh+08LDmG2j/e7HJV63mjrdvdfLC6HM783k81ds8P+HgfajZRRidhW+me +z/CiVX18JYpvL7TFz4QuK/0NURBs+18bvBt+xa47mAExkv8LV/SasrlX6avvDXbR +8O70zoan4G7ptGmh32n2M8ZpLpcTnqWHsFcQgTfJU7O7f/aS0ZzQGPSSbtqDT6Zj +mUyl+17vIWR6IF9sZIUVyzfpYgwLKhbcAS4y2j5L9Z469hdAlO+ekQiG+r5jqFoz +7Mt0Q5X5bGlSNscpb/xVA1wf+5+9R+vnSUeVC06JIglJ4PVhHvG/LopyboBZ/1c6 ++XUyo05f7O0oYtlNc/LMgRdg7c3r3NunysV+Ar3yVAhU/bQtCSwXVEqY0VThUWcI +0u1ufm8/0i2BWSlmy5A5lREedCf+3euvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMB +Af8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSwDPBMMPQFWAJI/TPlUq9LhONm +UjANBgkqhkiG9w0BAQwFAAOCAgEAqqiAjw54o+Ci1M3m9Zh6O+oAA7CXDpO8Wqj2 +LIxyh6mx/H9z/WNxeKWHWc8w4Q0QshNabYL1auaAn6AFC2jkR2vHat+2/XcycuUY ++gn0oJMsXdKMdYV2ZZAMA3m3MSNjrXiDCYZohMr/+c8mmpJ5581LxedhpxfL86kS +k5Nrp+gvU5LEYFiwzAJRGFuFjWJZY7attN6a+yb3ACfAXVU3dJnJUH/jWS5E4ywl +7uxMMne0nxrpS10gxdr9HIcWxkPo1LsmmkVwXqkLN1PiRnsn/eBG8om3zEK2yygm +btmlyTrIQRNg91CMFa6ybRoVGld45pIq2WWQgj9sAq+uEjonljYE1x2igGOpm/Hl +urR8FLBOybEfdF849lHqm/osohHUqS0nGkWxr7JOcQ3AWEbWaQbLU8uz/mtBzUF+ +fUwPfHJ5elnNXkoOrJupmHN5fLT0zLm4BwyydFy4x2+IoZCn9Kr5v2c69BoVYh63 +n749sSmvZ6ES8lgQGVMDMBu4Gon2nL2XA46jCfMdiyHxtN/kHNGfZQIG6lzWE7OE +76KlXIx3KadowGuuQNKotOrN8I1LOJwZmhsoVLiJkO/KdYE+HvJkJMcYr07/R54H +9jVlpNMKVv/1F2Rs76giJUmTtt8AF9pYfl3uxRuw0dFfIRDH+fO6AgonB8Xx1sfT +4PsJYGw= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIBtjCCAVugAwIBAgITBmyf1XSXNmY/Owua2eiedgPySjAKBggqhkjOPQQDAjA5 +MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24g +Um9vdCBDQSAzMB4XDTE1MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkG +A1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJvb3Qg +Q0EgMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCmXp8ZBf8ANm+gBG1bG8lKl +ui2yEujSLtf6ycXYqm0fc4E7O5hrOXwzpcVOho6AF2hiRVd9RFgdszflZwjrZt6j +QjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSr +ttvXBp43rDCGB5Fwx5zEGbF4wDAKBggqhkjOPQQDAgNJADBGAiEA4IWSoxe3jfkr +BqWTrBqYaGFy+uGh0PsceGCmQ5nFuMQCIQCcAu/xlJyzlvnrxir4tiz+OpAUFteM +YyRIHN8wfdVoOw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIB8jCCAXigAwIBAgITBmyf18G7EEwpQ+Vxe3ssyBrBDjAKBggqhkjOPQQDAzA5 +MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24g +Um9vdCBDQSA0MB4XDTE1MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkG +A1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJvb3Qg +Q0EgNDB2MBAGByqGSM49AgEGBSuBBAAiA2IABNKrijdPo1MN/sGKe0uoe0ZLY7Bi +9i0b2whxIdIA6GO9mif78DluXeo9pcmBqqNbIJhFXRbb/egQbeOc4OO9X4Ri83Bk +M6DLJC9wuoihKqB1+IGuYgbEgds5bimwHvouXKNCMEAwDwYDVR0TAQH/BAUwAwEB +/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNPsxzplbszh2naaVvuc84ZtV+WB +MAoGCCqGSM49BAMDA2gAMGUCMDqLIfG9fhGt0O9Yli/W651+kI0rz2ZVwyzjKKlw +CkcO8DdZEv8tmZQoTipPNU0zWgIxAOp1AE47xDqUEpHJWEadIRNyp4iciuRMStuW +1KyLa2tJElMzrdfkviT8tQp21KW8EA== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDdzCCAl+gAwIBAgIIXDPLYixfszIwDQYJKoZIhvcNAQELBQAwPDEeMBwGA1UE +AwwVQXRvcyBUcnVzdGVkUm9vdCAyMDExMQ0wCwYDVQQKDARBdG9zMQswCQYDVQQG +EwJERTAeFw0xMTA3MDcxNDU4MzBaFw0zMDEyMzEyMzU5NTlaMDwxHjAcBgNVBAMM +FUF0b3MgVHJ1c3RlZFJvb3QgMjAxMTENMAsGA1UECgwEQXRvczELMAkGA1UEBhMC +REUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVhTuXbyo7LjvPpvMp +Nb7PGKw+qtn4TaA+Gke5vJrf8v7MPkfoepbCJI419KkM/IL9bcFyYie96mvr54rM +VD6QUM+A1JX76LWC1BTFtqlVJVfbsVD2sGBkWXppzwO3bw2+yj5vdHLqqjAqc2K+ +SZFhyBH+DgMq92og3AIVDV4VavzjgsG1xZ1kCWyjWZgHJ8cblithdHFsQ/H3NYkQ +4J7sVaE3IqKHBAUsR320HLliKWYoyrfhk/WklAOZuXCFteZI6o1Q/NnezG8HDt0L +cp2AMBYHlT8oDv3FdU9T1nSatCQujgKRz3bFmx5VdJx4IbHwLfELn8LVlhgf8FQi +eowHAgMBAAGjfTB7MB0GA1UdDgQWBBSnpQaxLKYJYO7Rl+lwrrw7GWzbITAPBgNV +HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKelBrEspglg7tGX6XCuvDsZbNshMBgG +A1UdIAQRMA8wDQYLKwYBBAGwLQMEAQEwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3 +DQEBCwUAA4IBAQAmdzTblEiGKkGdLD4GkGDEjKwLVLgfuXvTBznk+j57sj1O7Z8j +vZfza1zv7v1Apt+hk6EKhqzvINB5Ab149xnYJDE0BAGmuhWawyfc2E8PzBhj/5kP +DpFrdRbhIfzYJsdHt6bPWHJxfrrhTZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pc +maHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a961qn8FYiqTxlVMYVqL2Gns2D +lmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G3mB/ufNPRJLv +KrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UE +BhMCRVMxQjBABgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1h +cHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEy +MzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUg +Q2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBBNjI2MzQwNjgwggIi +MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDDUtd9 +thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQM +cas9UX4PB99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefG +L9ItWY16Ck6WaVICqjaY7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15i +NA9wBj4gGFrO93IbJWyTdBSTo3OxDqqHECNZXyAFGUftaI6SEspd/NYrspI8IM/h +X68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyIplD9amML9ZMWGxmPsu2b +m8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctXMbScyJCy +Z/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirja +EbsXLZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/T +KI8xWVvTyQKmtFLKbpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF +6NkBiDkal4ZkQdU7hwxu+g/GvUgUvzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVh +OSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD +VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNHDhpkLzCBpgYD +VR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp +cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBv +ACAAZABlACAAbABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBl +AGwAbwBuAGEAIAAwADgAMAAxADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF +661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx51tkljYyGOylMnfX40S2wBEqgLk9 +am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qkR71kMrv2JYSiJ0L1 +ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaPT481 +PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS +3a/DTg4fJl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5k +SeTy36LssUzAKh3ntLFlosS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF +3dvd6qJ2gHN99ZwExEWN57kci57q13XRcrHedUTnQn3iV2t93Jm8PYMo6oCTjcVM +ZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoRsaS8I8nkvof/uZS2+F0g +StRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTDKCOM/icz +Q0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQB +jLMi6Et8Vcad+qMUu2WFbm5PEn4KPJ2V +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ +RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD +VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX +DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y +ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy +VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr +mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr +IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK +mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu +XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy +dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye +jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1 +BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3 +DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92 +9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx +jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0 +Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz +ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS +R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd +MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg +Q2xhc3MgMiBSb290IENBMB4XDTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1ow +TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw +HgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB +BQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1g1Lr +6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPV +L4O2fuPn9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC91 +1K2GScuVr1QGbNgGE41b/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHx +MlAQTn/0hpPshNOOvEu/XAFOBz3cFIqUCqTqc/sLUegTBxj6DvEr0VQVfTzh97QZ +QmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeffawrbD02TTqigzXsu8lkB +arcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgIzRFo1clr +Us3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLi +FRhnBkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRS +P/TizPJhk9H9Z2vXUq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN +9SG9dKpN6nIDSdvHXx1iY8f93ZHsM+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxP +AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMmAd+BikoL1Rpzz +uvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAU18h +9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s +A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3t +OluwlN5E40EIosHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo ++fsicdl9sz1Gv7SEr5AcD48Saq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7 +KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYdDnkM/crqJIByw5c/8nerQyIKx+u2 +DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWDLfJ6v9r9jv6ly0Us +H8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0oyLQ +I+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK7 +5t98biGCwWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h +3PFaTWwyI0PurKju7koSCTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPz +Y11aWOIv4x3kqdbQCtCev9eBCfHJxyYNrJgWVqA= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd +MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg +Q2xhc3MgMyBSb290IENBMB4XDTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFow +TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw +HgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB +BQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRHsJ8Y +ZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3E +N3coTRiR5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9 +tznDDgFHmV0ST9tD+leh7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX +0DJq1l1sDPGzbjniazEuOQAnFN44wOwZZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c +/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH2xc519woe2v1n/MuwU8X +KhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV/afmiSTY +zIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvS +O1UQRwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D +34xFMFbG02SrZvPAXpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgP +K9Dx2hzLabjKSWJtyNBjYt1gD1iqj6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3 +AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFEe4zf/lb+74suwv +Tg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAACAj +QTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV +cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXS +IGrs/CIBKM+GuIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2 +HJLw5QY33KbmkJs4j1xrG0aGQ0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsa +O5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8ZORK15FTAaggiG6cX0S5y2CBNOxv +033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2KSb12tjE8nVhz36u +dmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz6MkE +kbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg41 +3OEMXbugUZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvD +u79leNKGef9JOxqDDPDeeOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq +4/g7u9xN12TyUb7mqqta6THuBrxzvxNiCp/HuZc= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNV +BAYTAlNLMRMwEQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMu +MRkwFwYDVQQDExBDQSBEaXNpZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQy +MDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sxEzARBgNVBAcTCkJyYXRpc2xhdmEx +EzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERpc2lnIFJvb3QgUjIw +ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbCw3Oe +NcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNH +PWSb6WiaxswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3I +x2ymrdMxp7zo5eFm1tL7A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbe +QTg06ov80egEFGEtQX6sx3dOy1FU+16SGBsEWmjGycT6txOgmLcRK7fWV8x8nhfR +yyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqVg8NTEQxzHQuyRpDRQjrO +QG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa5Beny912 +H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJ +QfYEkoopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUD +i/ZnWejBBhG93c+AAk9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORs +nLMOPReisjQS1n6yqEm70XooQL6iFh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1 +rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud +DwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5uQu0wDQYJKoZI +hvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM +tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqf +GopTpti72TVVsRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkb +lvdhuDvEK7Z4bLQjb/D907JedR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka ++elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W81k/BfDxujRNt+3vrMNDcTa/F1bal +TFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjxmHHEt38OFdAlab0i +nSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01utI3 +gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18Dr +G5gPcFw0sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3Os +zMOl6W8KjptlwlCFtaOgUxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8x +L4ysEr3vQCj8KWefshNPZiTEUxnpHikV7+ZtsH8tZ/3zbBt1RqPlShfppNcL +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJD +TjEwMC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9y +aXR5MRUwEwYDVQQDDAxDRkNBIEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkx +MjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEwMC4GA1UECgwnQ2hpbmEgRmluYW5j +aWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNBIEVWIFJP +T1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnVBU03 +sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpL +TIpTUnrD7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5 +/ZOkVIBMUtRSqy5J35DNuF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp +7hZZLDRJGqgG16iI0gNyejLi6mhNbiyWZXvKWfry4t3uMCz7zEasxGPrb382KzRz +EpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7xzbh72fROdOXW3NiGUgt +hxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9fpy25IGvP +a931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqot +aK8KgWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNg +TnYGmE69g60dWIolhdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfV +PKPtl8MeNPo4+QgO48BdK4PRVmrJtqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hv +cWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAfBgNVHSMEGDAWgBTj/i39KNAL +tbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAd +BgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB +ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObT +ej/tUxPQ4i9qecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdL +jOztUmCypAbqTuv0axn96/Ua4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBS +ESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sGE5uPhnEFtC+NiWYzKXZUmhH4J/qy +P5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfXBDrDMlI1Dlb4pd19 +xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjnaH9d +Ci77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN +5mydLIhyPDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe +/v5WOaHIz16eGWRGENoXkbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+Z +AAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3CekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ +5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCB +gTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G +A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNV +BAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEyMDEwMDAw +MDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3Jl +YXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01P +RE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0 +aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3 +UcEbVASY06m/weaKXTuH+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI +2GqGd0S7WWaXUF601CxwRM/aN5VCaTwwxHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8 +Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV4EajcNxo2f8ESIl33rXp ++2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA1KGzqSX+ +DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5O +nKVIrLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW +/zAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6g +PKA6hjhodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9u +QXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOCAQEAPpiem/Yb6dc5t3iuHXIY +SdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CPOGEIqB6BCsAv +IC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/ +RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4 +zJVSk/BwJVmcIGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5dd +BA6+C4OmF4O5MBKgxTMVBbkN+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IB +ZQ== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTEL +MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE +BxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMT +IkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwMzA2MDAw +MDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdy +ZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09N +T0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlv +biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSR +FtSrYpn1PlILBs5BAH+X4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0J +cfRK9ChQtP6IHG4/bC8vCVlbpVsLM5niwz2J+Wos77LTBumjQjBAMB0GA1UdDgQW +BBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/ +BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VGFAkK+qDm +fQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdv +GDeAU/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCB +hTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G +A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNV +BAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAwMTE5 +MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgT +EkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR +Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR +6FSS0gpWsawNJN3Fz0RndJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8X +pz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZFGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC +9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+5eNu/Nio5JIk2kNrYrhV +/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pGx8cgoLEf +Zd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z ++pUX2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7w +qP/0uK3pN/u6uPQLOvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZah +SL0896+1DSJMwBGB7FY79tOi4lu3sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVIC +u9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+CGCe01a60y1Dma/RMhnEw6abf +Fobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5WdYgGq/yapiq +crxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E +FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB +/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvl +wFTPoCWOAvn9sKIN9SCYPBMtrFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM +4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+nq6PK7o9mfjYcwlYRm6mnPTXJ9OV +2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSgtZx8jb8uk2Intzna +FxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwWsRqZ +CuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiK +boHGhfKppC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmcke +jkk9u+UJueBPSZI9FoJAzMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yL +S0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHqZJx64SIDqZxubw5lT2yHh17zbqD5daWb +QOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk527RH89elWsn2/x20Kk4yl +0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7ILaZRfyHB +NVOFBkpdn627G190 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn +MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL +ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMg +b2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAxNjEzNDNaFw0zNzA5MzAxNjEzNDRa +MH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZpcm1hIFNBIENJRiBB +ODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3JnMSIw +IAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0B +AQEFAAOCAQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtb +unXF/KGIJPov7coISjlUxFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0d +BmpAPrMMhe5cG3nCYsS4No41XQEMIwRHNaqbYE6gZj3LJgqcQKH0XZi/caulAGgq +7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jWDA+wWFjbw2Y3npuRVDM3 +0pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFVd9oKDMyX +roDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIG +A1UdEwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5j +aGFtYmVyc2lnbi5vcmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p +26EpW1eLTXYGduHRooowDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIA +BzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hhbWJlcnNpZ24ub3JnMCcGA1Ud +EgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYDVR0gBFEwTzBN +BgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz +aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEB +AAxBl8IahsAifJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZd +p0AJPaxJRUXcLo0waLIJuvvDL8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi +1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wNUPf6s+xCX6ndbcj0dc97wXImsQEc +XCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/nADydb47kMgkdTXg0 +eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1erfu +tGWaIZDgqtCYvDi1czyL+Nw= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEn +MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL +ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENo +YW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYxNDE4WhcNMzcwOTMwMTYxNDE4WjB9 +MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgy +NzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4G +A1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUA +A4IBDQAwggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0 +Mi+ITaFgCPS3CU6gSS9J1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/s +QJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8Oby4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpV +eAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl6DJWk0aJqCWKZQbua795 +B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c8lCrEqWh +z0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0T +AQH/BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1i +ZXJzaWduLm9yZy9jaGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4w +TcbOX60Qq+UDpfqpFDAOBgNVHQ8BAf8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAH +MCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBjaGFtYmVyc2lnbi5vcmcwKgYD +VR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9yZzBbBgNVHSAE +VDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh +bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0B +AQUFAAOCAQEAPDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUM +bKGKfKX0j//U2K0X1S0E0T9YgOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXi +ryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJPJ7oKXqJ1/6v/2j1pReQvayZzKWG +VwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4IBHNfTIzSJRUTN3c +ecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREest2d/ +AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNV +BAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4X +DTA3MDYyOTE1MTMwNVoXDTI3MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQ +BgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwIQ2VydGlnbmEwggEiMA0GCSqGSIb3 +DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7qXOEm7RFHYeGifBZ4 +QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyHGxny +gQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbw +zBfsV1/pogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q +130yGLMLLGq/jj8UEYkgDncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2 +JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKfIrjxwo1p3Po6WAbfAgMBAAGjgbwwgbkw +DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQtCRZvgHyUtVF9lo53BEw +ZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJBgNVBAYT +AkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzj +AQ/JSP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG +9w0BAQUFAAOCAQEAhQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8h +bV6lUmPOEvjvKtpv6zf+EwLHyzs+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFnc +fca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1kluPBS1xp81HlDQwY9qcEQCYsuu +HWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY1gkIl2PlwS6w +t0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw +WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjET +MBEGA1UEChMKQ2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAb +BgNVBAMTFENlcnRpbm9taXMgLSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMz +MTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIxEzARBgNVBAoTCkNlcnRpbm9taXMx +FzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRDZXJ0aW5vbWlzIC0g +Um9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQosP5L2 +fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJfl +LieY6pOod5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9n+ws+hQV +WZUKxkd8aRi5pwP5ynapz8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDF +TKWrteoB4owuZH9kb/2jJZOLyKIOSY008B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb +5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09xRLWtwHkziOC/7aOgFLSc +CbAK42C++PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE6OXWk6Ri +wsXm9E/G+Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJ +wx3tFvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SG +m/lg0h9tkQPTYKbVPZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4 +F2iw4lNVYC2vPsKD2NkJK/DAZNuHi5HMkesE/Xa0lZrmFAYb1TQdvtj/dBxThZng +WVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIB +BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I6tNxIqSSaHh0 +2TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF +AAOCAgEAfj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/ +0KGRHCwPT5iVWVO90CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWw +F6YSjNRieOpWauwK0kDDPAUwPk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZS +g081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAXlCOotQqSD7J6wWAsOMwaplv/8gzj +qh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5nU7aJ+BIJy29SWwNyhlCVCNSN +h4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrjcOa4pvi2WsS9Iff/ +ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu6AdBBR8V +btaw5BngDwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwj +Y/M50n92Uaf0yKHxDHYiI0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ +8ow7bkrHxuaAKzyBvBGAFhAn1/DNP3nMcyrDflOR1m749fPH0FFNjkulW+YZFzvW +gQncItzujrnEj1PhZ7szuIgVRs/taTX/dQ1G885x4cVrhkIGuUE= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAw +PTELMAkGA1UEBhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFz +cyAyIFByaW1hcnkgQ0EwHhcNOTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9 +MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2VydHBsdXMxGzAZBgNVBAMTEkNsYXNz +IDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxQ +ltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR5aiR +VhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyL +kcAbmXuZVg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCd +EgETjdyAYveVqUSISnFOYFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yas +H7WLO7dDWWuwJKZtkIvEcupdM5i3y95ee++U8Rs+yskhwcWYAqqi9lt3m/V+llU0 +HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRMECDAGAQH/AgEKMAsGA1Ud +DwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJYIZIAYb4 +QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMu +Y29tL0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/ +AN9WM2K191EBkOvDP9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8 +yfFC82x/xXp8HVGIutIKPidd3i1RTtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMR +FcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+7UCmnYR0ObncHoUW2ikbhiMA +ybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW//1IMwrh3KWB +kJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7 +l7+ijrRU +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFazCCA1OgAwIBAgISESBVg+QtPlRWhS2DN7cs3EYRMA0GCSqGSIb3DQEBDQUA +MD4xCzAJBgNVBAYTAkZSMREwDwYDVQQKDAhDZXJ0cGx1czEcMBoGA1UEAwwTQ2Vy +dHBsdXMgUm9vdCBDQSBHMTAeFw0xNDA1MjYwMDAwMDBaFw0zODAxMTUwMDAwMDBa +MD4xCzAJBgNVBAYTAkZSMREwDwYDVQQKDAhDZXJ0cGx1czEcMBoGA1UEAwwTQ2Vy +dHBsdXMgUm9vdCBDQSBHMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB +ANpQh7bauKk+nWT6VjOaVj0W5QOVsjQcmm1iBdTYj+eJZJ+622SLZOZ5KmHNr49a +iZFluVj8tANfkT8tEBXgfs+8/H9DZ6itXjYj2JizTfNDnjl8KvzsiNWI7nC9hRYt +6kuJPKNxQv4c/dMcLRC4hlTqQ7jbxofaqK6AJc96Jh2qkbBIb6613p7Y1/oA/caP +0FG7Yn2ksYyy/yARujVjBYZHYEMzkPZHogNPlk2dT8Hq6pyi/jQu3rfKG3akt62f +6ajUeD94/vI4CTYd0hYCyOwqaK/1jpTvLRN6HkJKHRUxrgwEV/xhc/MxVoYxgKDE +EW4wduOU8F8ExKyHcomYxZ3MVwia9Az8fXoFOvpHgDm2z4QTd28n6v+WZxcIbekN +1iNQMLAVdBM+5S//Ds3EC0pd8NgAM0lm66EYfFkuPSi5YXHLtaW6uOrc4nBvCGrc +h2c0798wct3zyT8j/zXhviEpIDCB5BmlIOklynMxdCm+4kLV87ImZsdo/Rmz5yCT +mehd4F6H50boJZwKKSTUzViGUkAksnsPmBIgJPaQbEfIDbsYIC7Z/fyL8inqh3SV +4EJQeIQEQWGw9CEjjy3LKCHyamz0GqbFFLQ3ZU+V/YDI+HLlJWvEYLF7bY5KinPO +WftwenMGE9nTdDckQQoRb5fc5+R+ob0V8rqHDz1oihYHAgMBAAGjYzBhMA4GA1Ud +DwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSowcCbkahDFXxd +Bie0KlHYlwuBsTAfBgNVHSMEGDAWgBSowcCbkahDFXxdBie0KlHYlwuBsTANBgkq +hkiG9w0BAQ0FAAOCAgEAnFZvAX7RvUz1isbwJh/k4DgYzDLDKTudQSk0YcbX8ACh +66Ryj5QXvBMsdbRX7gp8CXrc1cqh0DQT+Hern+X+2B50ioUHj3/MeXrKls3N/U/7 +/SMNkPX0XtPGYX2eEeAC7gkE2Qfdpoq3DIMku4NQkv5gdRE+2J2winq14J2by5BS +S7CTKtQ+FjPlnsZlFT5kOwQ/2wyPX1wdaR+v8+khjPPvl/aatxm2hHSco1S1cE5j +2FddUyGbQJJD+tZ3VTNPZNX70Cxqjm0lpu+F6ALEUz65noe8zDUa3qHpimOHZR4R +Kttjd5cUvpoUmRGywO6wT/gUITJDT5+rosuoD6o7BlXGEilXCNQ314cnrUlZp5Gr +RHpejXDbl85IULFzk/bwg2D5zfHhMf1bfHEhYxQUqq/F3pN+aLHsIqKqkHWetUNy +6mSjhEv9DKgma3GX7lZjZuhCVPnHHd/Qj1vfyDBviP4NxDMcU6ij/UgQ8uQKTuEV +V/xuZDDCVRHc6qnNSlSsKWNEz0pAoNZoWRsz+e86i9sgktxChL8Bq4fA1SCC28a5 +g4VCXA9DO2pJNdWY9BW/+mGBDAkgGNLQFwzLSABQ6XaCjGTXOqAHVcweMcDvOrRl +++O/QmueD6i9a5jc2NvLi6Td11n0bt3+qsOR0C5CB8AMTVPNJLFMWx5R9N/pkvo= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICHDCCAaKgAwIBAgISESDZkc6uo+jF5//pAq/Pc7xVMAoGCCqGSM49BAMDMD4x +CzAJBgNVBAYTAkZSMREwDwYDVQQKDAhDZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBs +dXMgUm9vdCBDQSBHMjAeFw0xNDA1MjYwMDAwMDBaFw0zODAxMTUwMDAwMDBaMD4x +CzAJBgNVBAYTAkZSMREwDwYDVQQKDAhDZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBs +dXMgUm9vdCBDQSBHMjB2MBAGByqGSM49AgEGBSuBBAAiA2IABM0PW1aC3/BFGtat +93nwHcmsltaeTpwftEIRyoa/bfuFo8XlGVzX7qY/aWfYeOKmycTbLXku54uNAm8x +Ik0G42ByRZ0OQneezs/lf4WbGOT8zC5y0xaTTsqZY1yhBSpsBqNjMGEwDgYDVR0P +AQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNqDYwJ5jtpMxjwj +FNiPwyCrKGBZMB8GA1UdIwQYMBaAFNqDYwJ5jtpMxjwjFNiPwyCrKGBZMAoGCCqG +SM49BAMDA2gAMGUCMHD+sAvZ94OX7PNVHdTcswYO/jOYnYs5kGuUIe22113WTNch +p+e/IQ8rzfcq3IUHnQIxAIYUFuXcsGXCwI4Un78kFmjlvPl5adytRSv3tjFzzAal +U5ORGpOucGpnutee5WEaXw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM +MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD +QTAeFw0wMjA2MTExMDQ2MzlaFw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBM +MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD +QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6xwS7TT3zNJc4YPk/E +jG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdLkKWo +ePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GI +ULdtlkIJ89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapu +Ob7kky/ZR6By6/qmW6/KUz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUg +AKpoC6EahQGcxEZjgoi2IrHu/qpGWX7PNSzVttpd90gzFFS269lvzs2I1qsb2pY7 +HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA +uI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+GXYkHAQa +TOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTg +xSvgGrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1q +CjqTE5s7FCMTY5w/0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5x +O/fIR/RpbxXyEV6DHpx8Uq79AtoSqFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs +6GAqm4VKQPNriiTsBhYscw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBM +MSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5D +ZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBU +cnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIyMTIwNzM3WhcNMjkxMjMxMTIwNzM3 +WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMg +Uy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSIw +IAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rH +UV+rpDKmYYe2bg+G0jACl/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LM +TXPb865Px1bVWqeWifrzq2jUI4ZZJ88JJ7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVU +BBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4fOQtf/WsX+sWn7Et0brM +kUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0cvW0QM8x +AcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNV +HRMBAf8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNV +HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15y +sHhE49wcrwn9I0j6vSrEuVUEtRCjjSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfL +I9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1mS1FhIrlQgnXdAIv94nYmem8 +J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5ajZt3hrvJBW8qY +VoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI +03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIF0jCCA7qgAwIBAgIQIdbQSk8lD8kyN/yqXhKN6TANBgkqhkiG9w0BAQ0FADCB +gDELMAkGA1UEBhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMu +QS4xJzAlBgNVBAsTHkNlcnR1bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEkMCIG +A1UEAxMbQ2VydHVtIFRydXN0ZWQgTmV0d29yayBDQSAyMCIYDzIwMTExMDA2MDgz +OTU2WhgPMjA0NjEwMDYwODM5NTZaMIGAMQswCQYDVQQGEwJQTDEiMCAGA1UEChMZ +VW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRp +ZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3 +b3JrIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9+Xj45tWA +DGSdhhuWZGc/IjoedQF97/tcZ4zJzFxrqZHmuULlIEub2pt7uZld2ZuAS9eEQCsn +0+i6MLs+CRqnSZXvK0AkwpfHp+6bJe+oCgCXhVqqndwpyeI1B+twTUrWwbNWuKFB +OJvR+zF/j+Bf4bE/D44WSWDXBo0Y+aomEKsq09DRZ40bRr5HMNUuctHFY9rnY3lE +fktjJImGLjQ/KUxSiyqnwOKRKIm5wFv5HdnnJ63/mgKXwcZQkpsCLL2puTRZCr+E +Sv/f/rOf69me4Jgj7KZrdxYq28ytOxykh9xGc14ZYmhFV+SQgkK7QtbwYeDBoz1m +o130GO6IyY0XRSmZMnUCMe4pJshrAua1YkV/NxVaI2iJ1D7eTiew8EAMvE0Xy02i +sx7QBlrd9pPPV3WZ9fqGGmd4s7+W/jTcvedSVuWz5XV710GRBdxdaeOVDUO5/IOW +OZV7bIBaTxNyxtd9KXpEulKkKtVBRgkg/iKgtlswjbyJDNXXcPiHUv3a76xRLgez +Tv7QCdpw75j6VuZt27VXS9zlLCUVyJ4ueE742pyehizKV/Ma5ciSixqClnrDvFAS +adgOWkaLOusm+iPJtrCBvkIApPjW/jAux9JG9uWOdf3yzLnQh1vMBhBgu4M1t15n +3kfsmUjxpKEV/q2MYo45VU85FrmxY53/twIDAQABo0IwQDAPBgNVHRMBAf8EBTAD +AQH/MB0GA1UdDgQWBBS2oVQ5AsOgP46KvPrU+Bym0ToO/TAOBgNVHQ8BAf8EBAMC +AQYwDQYJKoZIhvcNAQENBQADggIBAHGlDs7k6b8/ONWJWsQCYftMxRQXLYtPU2sQ +F/xlhMcQSZDe28cmk4gmb3DWAl45oPePq5a1pRNcgRRtDoGCERuKTsZPpd1iHkTf +CVn0W3cLN+mLIMb4Ck4uWBzrM9DPhmDJ2vuAL55MYIR4PSFk1vtBHxgP58l1cb29 +XN40hz5BsA72udY/CROWFC/emh1auVbONTqwX3BNXuMp8SMoclm2q8KMZiYcdywm +djWLKKdpoPk79SPdhRB0yZADVpHnr7pH1BKXESLjokmUbOe3lEu6LaTaM4tMpkT/ +WjzGHWTYtTHkpjx6qFcL2+1hGsvxznN3Y6SHb0xRONbkX8eftoEq5IVIeVheO/jb +AoJnwTnbw3RLPTYe+SmTiGhbqEQZIfCn6IENLOiTNrQ3ssqwGyZ6miUfmpqAnksq +P/ujmv5zMnHCnsZy4YpoJ/HkD7TETKVhk/iXEAcqMCWpuchxuO9ozC1+9eB+D4Ko +b7a6bINDd82Kkhehnlt4Fj1F4jNy3eFmypnTycUm/Q1oBEauttmbjL4ZvrHG8hnj +XALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLXis7VmFxWlgPF7ncGNf/P +5O4/E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7zAYspsbi +DrW5viSP +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD +VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0 +IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3 +MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xKTAnBgNVBAMTIENoYW1iZXJz +IG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEyMjk1MFoXDTM4MDcz +MTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBj +dXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIw +EAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEp +MCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0G +CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW9 +28sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKAXuFixrYp4YFs8r/lfTJq +VKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorjh40G072Q +DuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR +5gN/ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfL +ZEFHcpOrUMPrCXZkNNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05a +Sd+pZgvMPMZ4fKecHePOjlO+Bd5gD2vlGts/4+EhySnB8esHnFIbAURRPHsl18Tl +UlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331lubKgdaX8ZSD6e2wsWsSaR6s ++12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ0wlf2eOKNcx5 +Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj +ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAx +hduub+84Mxh2EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNV +HQ4EFgQU+SSsD7K1+HnA+mCIG8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1 ++HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpN +YWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29t +L2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVy +ZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAt +IDIwMDiCCQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRV +HSAAMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20w +DQYJKoZIhvcNAQEFBQADggIBAJASryI1wqM58C7e6bXpeHxIvj99RZJe6dqxGfwW +PJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH3qLPaYRgM+gQDROpI9CF +5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbURWpGqOt1 +glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaH +FoI6M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2 +pSB7+R5KBWIBpih1YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MD +xvbxrN8y8NmBGuScvfaAFPDRLLmF9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QG +tjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcKzBIKinmwPQN/aUv0NCB9szTq +jktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvGnrDQWzilm1De +fhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg +OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZ +d0jQ +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDkzCCAnugAwIBAgIQFBOWgxRVjOp7Y+X8NId3RDANBgkqhkiG9w0BAQUFADA0 +MRMwEQYDVQQDEwpDb21TaWduIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQG +EwJJTDAeFw0wNDAzMjQxMTMyMThaFw0yOTAzMTkxNTAyMThaMDQxEzARBgNVBAMT +CkNvbVNpZ24gQ0ExEDAOBgNVBAoTB0NvbVNpZ24xCzAJBgNVBAYTAklMMIIBIjAN +BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8ORUaSvTx49qROR+WCf4C9DklBKK +8Rs4OC8fMZwG1Cyn3gsqrhqg455qv588x26i+YtkbDqthVVRVKU4VbirgwTyP2Q2 +98CNQ0NqZtH3FyrV7zb6MBBC11PN+fozc0yz6YQgitZBJzXkOPqUm7h65HkfM/sb +2CEJKHxNGGleZIp6GZPKfuzzcuc3B1hZKKxC+cX/zT/npfo4sdAMx9lSGlPWgcxC +ejVb7Us6eva1jsz/D3zkYDaHL63woSV9/9JLEYhwVKZBqGdTUkJe5DSe5L6j7Kpi +Xd3DTKaCQeQzC6zJMw9kglcq/QytNuEMrkvF7zuZ2SOzW120V+x0cAwqTwIDAQAB +o4GgMIGdMAwGA1UdEwQFMAMBAf8wPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL2Zl +ZGlyLmNvbXNpZ24uY28uaWwvY3JsL0NvbVNpZ25DQS5jcmwwDgYDVR0PAQH/BAQD +AgGGMB8GA1UdIwQYMBaAFEsBmz5WGmU2dst7l6qSBe4y5ygxMB0GA1UdDgQWBBRL +AZs+VhplNnbLe5eqkgXuMucoMTANBgkqhkiG9w0BAQUFAAOCAQEA0Nmlfv4pYEWd +foPPbrxHbvUanlR2QnG0PFg/LUAlQvaBnPGJEMgOqnhPOAlXsDzACPw1jvFIUY0M +cXS6hMTXcpuEfDhOZAYnKuGntewImbQKDdSFc8gS4TXt8QUxHXOZDOuWyt3T5oWq +8Ir7dcHyCTxlZWTzTNity4hp8+SDtwy9F1qWF8pb/627HOkthIDYIb6FUtnUdLlp +hbpN7Sgy6/lhSuTENh4Z3G+EER+V9YMoGKgzkkMn3V0TBEVPh9VGzT2ouvDzuFYk +Res3x+F2T3I5GN9+dHLHcy056mDmrRGiVod7w2ia/viMcKjfZTL0pECMocJEAw6U +AGegcQCCSA== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb +MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow +GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj +YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL +MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE +BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM +GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua +BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe +3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4 +YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR +rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm +ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU +oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF +MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v +QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t +b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF +AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q +GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz +Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2 +G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi +l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3 +smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYG +A1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2Jh +bCBSb290MB4XDTA2MTIxNTA4MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UE +ChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBS +b290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+Mi8vRRQZhP/8NN5 +7CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW0ozS +J8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2y +HLtgwEZLAfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iP +t3sMpTjr3kfb1V05/Iin89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNz +FtApD0mpSPCzqrdsxacwOUBdrsTiXSZT8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAY +XSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/ +MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2MDSgMqAw +hi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3Js +MB8GA1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUA +A4IBAQBW7wojoFROlZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMj +Wqd8BfP9IjsO0QbE2zZMcwSO5bAi5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUx +XOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2hO0j9n0Hq0V+09+zv+mKts2o +omcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+TX3EJIrduPuoc +A06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW +WL1WMRJOEcgh4LMRkWXbtKaIOM5V +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEDjCCAvagAwIBAgIDD92sMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNVBAYTAkRF +MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxHzAdBgNVBAMMFkQtVFJVU1QgUm9vdCBD +QSAzIDIwMTMwHhcNMTMwOTIwMDgyNTUxWhcNMjgwOTIwMDgyNTUxWjBFMQswCQYD +VQQGEwJERTEVMBMGA1UECgwMRC1UcnVzdCBHbWJIMR8wHQYDVQQDDBZELVRSVVNU +IFJvb3QgQ0EgMyAyMDEzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA +xHtCkoIf7O1UmI4SwMoJ35NuOpNcG+QQd55OaYhs9uFp8vabomGxvQcgdJhl8Ywm +CM2oNcqANtFjbehEeoLDbF7eu+g20sRoNoyfMr2EIuDcwu4QRjltr5M5rofmw7wJ +ySxrZ1vZm3Z1TAvgu8XXvD558l++0ZBX+a72Zl8xv9Ntj6e6SvMjZbu376Ml1wrq +WLbviPr6ebJSWNXwrIyhUXQplapRO5AyA58ccnSQ3j3tYdLl4/1kR+W5t0qp9x+u +loYErC/jpIF3t1oW/9gPP/a3eMykr/pbPBJbqFKJcu+I89VEgYaVI5973bzZNO98 +lDyqwEHC451QGsDkGSL8swIDAQABo4IBBTCCAQEwDwYDVR0TAQH/BAUwAwEB/zAd +BgNVHQ4EFgQUP5DIfccVb/Mkj6nDL0uiDyGyL+cwDgYDVR0PAQH/BAQDAgEGMIG+ +BgNVHR8EgbYwgbMwdKByoHCGbmxkYXA6Ly9kaXJlY3RvcnkuZC10cnVzdC5uZXQv +Q049RC1UUlVTVCUyMFJvb3QlMjBDQSUyMDMlMjAyMDEzLE89RC1UcnVzdCUyMEdt +YkgsQz1ERT9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0MDugOaA3hjVodHRwOi8v +Y3JsLmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2FfM18yMDEzLmNybDAN +BgkqhkiG9w0BAQsFAAOCAQEADlkOWOR0SCNEzzQhtZwUGq2aS7eziG1cqRdw8Cqf +jXv5e4X6xznoEAiwNStfzwLS05zICx7uBVSuN5MECX1sj8J0vPgclL4xAUAt8yQg +t4RVLFzI9XRKEBmLo8ftNdYJSNMOwLo5qLBGArDbxohZwr78e7Erz35ih1WWzAFv +m2chlTWL+BD8cRu3SzdppjvW7IvuwbDzJcmPkn2h6sPKRL8mpXSSnON065102ctN +h9j8tGlsi6BDB2B4l+nZk3zCRrybN1Kj7Yo8E6l7U0tJmhEFLAtuVqwfLoJs4Gln +tQ5tLdnkwBXxP/oYcuEVbSdbLTAoK59ImmQrme/ydUlfXA== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRF +MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBD +bGFzcyAzIENBIDIgMjAwOTAeFw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NTha +ME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMM +HkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIwDQYJKoZIhvcNAQEB +BQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOADER03 +UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42 +tSHKXzlABF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9R +ySPocq60vFYJfxLLHLGvKZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsM +lFqVlNpQmvH/pStmMaTJOKDfHR+4CS7zp+hnUquVH+BGPtikw8paxTGA6Eian5Rp +/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUCAwEAAaOCARowggEWMA8G +A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ4PGEMA4G +A1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVj +dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUy +MENBJTIwMiUyMDIwMDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRl +cmV2b2NhdGlvbmxpc3QwQ6BBoD+GPWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3Js +L2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAwOS5jcmwwDQYJKoZIhvcNAQEL +BQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm2H6NMLVwMeni +acfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0 +o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4K +zCUqNQT4YJEVdT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8 +PIWmawomDeCTmGCufsYkl4phX5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3Y +Johw1+qRzT65ysCQblrGXnRl11z+o+I= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRF +MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBD +bGFzcyAzIENBIDIgRVYgMjAwOTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUw +NDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNV +BAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAwOTCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfSegpn +ljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM0 +3TP1YtHhzRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6Z +qQTMFexgaDbtCHu39b+T7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lR +p75mpoo6Kr3HGrHhFPC+Oh25z1uxav60sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8 +HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure3511H3a6UCAwEAAaOCASQw +ggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyvcop9Ntea +HNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFw +Oi8vZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xh +c3MlMjAzJTIwQ0ElMjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1E +RT9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0MEagRKBChkBodHRwOi8vd3d3LmQt +dHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xhc3NfM19jYV8yX2V2XzIwMDku +Y3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+PPoeUSbrh/Yp +3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05 +nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNF +CSuGdXzfX2lXANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7na +xpeG0ILD5EJt/rDiZE4OJudANCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqX +KVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVvw9y4AyHqnxbxLFS1 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/ +MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT +DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow +PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD +Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O +rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq +OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b +xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw +7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD +aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV +HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG +SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69 +ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr +AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz +R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5 +JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo +Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEc +MBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2Vj +IFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENB +IDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5MjM1OTAwWjBxMQswCQYDVQQGEwJE +RTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxl +U2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290 +IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEU +ha88EOQ5bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhC +QN/Po7qCWWqSG6wcmtoIKyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1Mjwr +rFDa1sPeg5TKqAyZMg4ISFZbavva4VhYAUlfckE8FQYBjl2tqriTtM2e66foai1S +NNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aKSe5TBY8ZTNXeWHmb0moc +QqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTVjlsB9WoH +txa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAP +BgNVHRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC +AQEAlGRZrTlk5ynrE/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756Abrsp +tJh6sTtU6zkXR34ajgv8HzFZMQSyzhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpa +IzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8rZ7/gFnkm0W09juwzTkZmDLl +6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4Gdyd1Lx+4ivn+ +xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU +Cm26OWMohpLzGITY+9HPBVZkVw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBl +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv +b3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzExMTEwMDAwMDAwWjBlMQswCQYDVQQG +EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl +cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7c +JpSIqvTO9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYP +mDI2dsze3Tyoou9q+yHyUmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+ +wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4 +VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpyoeb6pNnVFzF1roV9Iq4/ +AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whfGHdPAgMB +AAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW +BBRF66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYun +pyGd823IDzANBgkqhkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRC +dWKuh+vy1dneVrOfzM4UKLkNl2BcEkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTf +fwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38FnSbNd67IJKusm7Xi+fT8r87cm +NW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i8b5QZ7dsvfPx +H2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe ++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBl +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv +b3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBlMQswCQYDVQQG +EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl +cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSA +n61UQbVH35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4Htecc +biJVMWWXvdMX0h5i89vqbFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9Hp +EgjAALAcKxHad3A2m67OeYfcgnDmCXRwVWmvo2ifv922ebPynXApVfSr/5Vh88lA +bx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OPYLfykqGxvYmJHzDNw6Yu +YjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+RnlTGNAgMB +AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQW +BBTOw0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPI +QW5pJ6d1Ee88hjZv0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I +0jJmwYrA8y8678Dj1JGG0VDjA9tzd29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4Gni +lmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAWhsI6yLETcDbYz+70CjTVW0z9 +B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0MjomZmWzwPDCv +ON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo +IhNzbM8m9Yop5w== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQsw +CQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cu +ZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3Qg +RzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBlMQswCQYDVQQGEwJV +UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQu +Y29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQBgcq +hkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJf +Zn4f5dwbRXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17Q +RSAPWXYQ1qAk8C3eNvJsKTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/ +BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgFUaFNN6KDec6NHSrkhDAKBggqhkjOPQQD +AwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5FyYZ5eEJJZVrmDxxDnOOlY +JjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy1vUhZscv +6pZjamVFkpUBtA== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD +QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT +MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j +b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB +CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97 +nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt +43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P +T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4 +gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO +BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR +TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw +DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr +hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg +06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF +PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls +YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk +CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH +MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT +MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j +b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI +2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx +1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ +q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz +tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ +vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP +BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV +5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY +1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4 +NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG +Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91 +8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe +pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl +MrY= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQsw +CQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cu +ZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAe +Fw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVTMRUw +EwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20x +IDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0CAQYF +K4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FG +fp4tn+6OYwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPO +Z9wj/wMco+I+o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAd +BgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNpYim8S8YwCgYIKoZIzj0EAwMDaAAwZQIx +AK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y3maTD/HMsQmP3Wyr+mt/ +oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34VOKa5Vt8 +sycX +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j +ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL +MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3 +LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug +RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm ++9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW +PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM +xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB +Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3 +hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg +EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF +MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA +FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec +nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z +eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF +hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2 +Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe +vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep ++OkuE6N36B9K +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBi +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3Qg +RzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBiMQswCQYDVQQGEwJV +UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQu +Y29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0GCSqG +SIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3y +ithZwuEppz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1If +xp4VpX6+n6lXFllVcq9ok3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDV +ySAdYyktzuxeTsiT+CFhmzTrBcZe7FsavOvJz82sNEBfsXpm7nfISKhmV1efVFiO +DCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGYQJB5w3jHtrHEtWoYOAMQ +jdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6MUSaM0C/ +CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCi +EhtmmnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADM +fRyVw4/3IbKyEbe7f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QY +uKZ3AeEPlAwhHbJUKSWJbOUOUlFHdL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXK +chYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8oR7FwI+isX4KJpn15GkvmB0t +9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB +hjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD +ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2 +SV1EY+CtnJYYZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd ++SeuMIW59mdNOj6PWTkiU0TryF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWc +fFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy7zBZLq7gcfJW5GqXb5JQbZaNaHqa +sjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iahixTXTBmyUEFxPT9N +cCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN5r5N +0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie +4u1Ki7wb/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mI +r/OSmbaz5mEP0oUA51Aa5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1 +/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tKG48BtieVU+i2iW1bvGjUI+iLUaJW+fCm +gKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP82Z+ +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNV +BAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBC +aWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNV +BAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQDDB9FLVR1 +Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMwNTEyMDk0OFoXDTIz +MDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExQDA+ +BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhp +em1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN +ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5 +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4vU/kwVRHoViVF56C/UY +B4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vdhQd2h8y/L5VMzH2nPbxH +D5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5KCKpbknSF +Q9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEo +q1+gElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3D +k14opz8n8Y4e0ypQBaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcH +fC425lAcP9tDJMW/hkd5s3kc91r0E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsut +dEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gzrt48Ue7LE3wBf4QOXVGUnhMM +ti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAqjqFGOjGY5RH8 +zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn +rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUX +U8u3Zg5mTPj5dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6 +Jyr+zE7S6E5UMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5 +XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQAF +Nzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAKkEh47U6YA5n+KGCR +HTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jOXKqY +GwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c +77NCR807VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3 ++GbHeJAAFS6LrVE1Uweoa2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WK +vJUawSg5TB9D0pH0clmKuVb8P7Sd2nCcdlqMQ1DujjByTd//SffGqWfZbawCEeI6 +FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEVKV0jq9BgoRJP3vQXzTLl +yb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gTDx4JnW2P +AJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpD +y4Q08ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8d +NL/+I5c30jn6PQ0GC7TbO6Orb1wdtn7os4I07QZcJA== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB +8zELMAkGA1UEBhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2Vy +dGlmaWNhY2lvIChOSUYgUS0wODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1 +YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYDVQQLEyxWZWdldSBodHRwczovL3d3 +dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UECxMsSmVyYXJxdWlh +IEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMTBkVD +LUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQG +EwJFUzE7MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8g +KE5JRiBRLTA4MDExNzYtSSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBD +ZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZlZ2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQu +bmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJhcnF1aWEgRW50aXRhdHMg +ZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUNDMIIBIjAN +BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R +85iKw5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm +4CgPukLjbo73FCeTae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaV +HMf5NLWUhdWZXqBIoH7nF2W4onW4HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNd +QlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0aE9jD2z3Il3rucO2n5nzbcc8t +lGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw0JDnJwIDAQAB +o4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E +BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4 +opvpXY0wfwYDVR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBo +dHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidW +ZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAwDQYJKoZIhvcN +AQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJlF7W2u++AVtd0x7Y +/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNaAl6k +SBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhy +Rp/7SNVel+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOS +Agu+TGbrIP65y7WZf+a2E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xl +nJ2lYJU6Un/10asIbvPuW/mIPX64b24D5EI= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1 +MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1 +czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYG +CSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIwMTAxMDMwMTAxMDMwWhgPMjAzMDEy +MTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0aWZpdHNl +ZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRyZSBS +b290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUy +euuOF0+W2Ap7kaJjbMeMTC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvO +bntl8jixwKIy72KyaOBhU8E2lf/slLo2rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIw +WFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw93X2PaRka9ZP585ArQ/d +MtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtNP2MbRMNE +1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYD +VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/ +zQas8fElyalL1BSZMEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYB +BQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEF +BQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+RjxY6hUFaTlrg4wCQiZrxTFGGV +v9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqMlIpPnTX/dqQG +E5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u +uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIW +iAYLtqZLICjU3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/v +GVCJYMzpJJUPwssd8m92kMfMdcGWxZ0= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChML +RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBp +bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5 +IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENlcnRp +ZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQxNzUwNTFaFw0yOTA3 +MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3 +LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp +YWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG +A1UEAxMqRW50cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgp +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArU1LqRKGsuqjIAcVFmQq +K0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOLGp18EzoOH1u3Hs/lJBQe +sYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSrhRSGlVuX +MlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVT +XTzWnLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/ +HoZdenoVve8AjhUiVBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH +4QIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV +HQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJKoZIhvcNAQEFBQADggEBADub +j1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPyT/4xmf3IDExo +U8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf +zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5b +u/8j72gZyxKTJ1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+ +bYQLCIt+jerXmCHG8+c8eS9enNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/Er +fF6adulZkMV8gzURZVE= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC +VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0 +Lm5ldC9DUFMgaXMgaW5jb3Jwb3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMW +KGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsGA1UEAxMkRW50cnVzdCBSb290IENl +cnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0MloXDTI2MTEyNzIw +NTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMTkw +NwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSBy +ZWZlcmVuY2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNV +BAMTJEVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJ +KoZIhvcNAQEBBQADggEPADCCAQoCggEBALaVtkNC+sZtKm9I35RMOVcF7sN5EUFo +Nu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYszA9u3g3s+IIRe7bJWKKf4 +4LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOwwCj0Yzfv9 +KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGI +rb68j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi +94DkZfs0Nw4pgHBNrziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOB +sDCBrTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAi +gA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1MzQyWjAfBgNVHSMEGDAWgBRo +kORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DHhmak8fdLQ/uE +vW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA +A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9t +O1KzKtvn1ISMY/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6Zua +AGAT/3B+XxFNSRuzFVJ7yVTav52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP +9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTSW3iDVuycNsMm4hH2Z0kdkquM++v/ +eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0tHuu2guQOHXvgR1m +0vdXcDazv/wor3ElhVsT/h5/WrQ8 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkG +A1UEBhMCVVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3 +d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVu +dHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEzMDEGA1UEAxMq +RW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRUMxMB4XDTEy +MTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYwFAYD +VQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0 +L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0g +Zm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBD +ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEVDMTB2MBAGByqGSM49AgEGBSuBBAAi +A2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHyAsWfoPZb1YsGGYZPUxBt +ByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef9eNi1KlH +Bz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O +BBYEFLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVC +R98crlOZF7ZvHH3hvxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nX +hTcGtXsI/esni0qU+eH6p44mCOh8kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMC +VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50 +cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3Qs +IEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVz +dCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwHhcNMDkwNzA3MTcy +NTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUVu +dHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwt +dGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0 +aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP/vaCeb9zYQYKpSfYs1/T +RU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXzHHfV1IWN +cCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hW +wcKUs/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1 +U1+cPvQXLOZprE4yTGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0 +jaWvYkxN4FisZDQSA/i2jZRjJKRxAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAP +BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ60B7vfec7aVHUbI2fkBJmqzAN +BgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5ZiXMRrEPR9RP/ +jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ +Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v +1fN2D807iDginWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4R +nAuknZoh8/CbCzB428Hch0P+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmH +VHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xOe4pIb4tF9g== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFiDCCA3CgAwIBAgIIfQmX/vBH6nowDQYJKoZIhvcNAQELBQAwYjELMAkGA1UE +BhMCQ04xMjAwBgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZ +IENPLixMVEQuMR8wHQYDVQQDDBZHRENBIFRydXN0QVVUSCBSNSBST09UMB4XDTE0 +MTEyNjA1MTMxNVoXDTQwMTIzMTE1NTk1OVowYjELMAkGA1UEBhMCQ04xMjAwBgNV +BAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZIENPLixMVEQuMR8w +HQYDVQQDDBZHRENBIFRydXN0QVVUSCBSNSBST09UMIICIjANBgkqhkiG9w0BAQEF +AAOCAg8AMIICCgKCAgEA2aMW8Mh0dHeb7zMNOwZ+Vfy1YI92hhJCfVZmPoiC7XJj +Dp6L3TQsAlFRwxn9WVSEyfFrs0yw6ehGXTjGoqcuEVe6ghWinI9tsJlKCvLriXBj +TnnEt1u9ol2x8kECK62pOqPseQrsXzrj/e+APK00mxqriCZ7VqKChh/rNYmDf1+u +KU49tm7srsHwJ5uu4/Ts765/94Y9cnrrpftZTqfrlYwiOXnhLQiPzLyRuEH3FMEj +qcOtmkVEs7LXLM3GKeJQEK5cy4KOFxg2fZfmiJqwTTQJ9Cy5WmYqsBebnh52nUpm +MUHfP/vFBu8btn4aRjb3ZGM74zkYI+dndRTVdVeSN72+ahsmUPI2JgaQxXABZG12 +ZuGR224HwGGALrIuL4xwp9E7PLOR5G62xDtw8mySlwnNR30YwPO7ng/Wi64HtloP +zgsMR6flPri9fcebNaBhlzpBdRfMK5Z3KpIhHtmVdiBnaM8Nvd/WHwlqmuLMc3Gk +L30SgLdTMEZeS1SZD2fJpcjyIMGC7J0R38IC+xo70e0gmu9lZJIQDSri3nDxGGeC +jGHeuLzRL5z7D9Ar7Rt2ueQ5Vfj4oR24qoAATILnsn8JuLwwoC8N9VKejveSswoA +HQBUlwbgsQfZxw9cZX08bVlX5O2ljelAU58VS6Bx9hoh49pwBiFYFIeFd3mqgnkC +AwEAAaNCMEAwHQYDVR0OBBYEFOLJQJ9NzuiaoXzPDj9lxSmIahlRMA8GA1UdEwEB +/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQDRSVfg +p8xoWLoBDysZzY2wYUWsEe1jUGn4H3++Fo/9nesLqjJHdtJnJO29fDMylyrHBYZm +DRd9FBUb1Ov9H5r2XpdptxolpAqzkT9fNqyL7FeoPueBihhXOYV0GkLH6VsTX4/5 +COmSdI31R9KrO9b7eGZONn356ZLpBN79SWP8bfsUcZNnL0dKt7n/HipzcEYwv1ry +L3ml4Y0M2fmyYzeMN2WFcGpcWwlyua1jPLHd+PwyvzeG5LuOmCd+uh8W4XAR8gPf +JWIyJyYYMoSf/wA6E7qaTfRPuBRwIrHKK5DOKcFw9C+df/KQHtZa37dG/OaG+svg +IHZ6uqbL9XzeYqWxi+7egmaKTjowHz+Ay60nugxe19CxVsp3cbK1daFQqUBDF8Io +2c9Si1vIY9RCPqAzekYu9wogRlR+ak8x8YF+QnQ4ZXMn7sZ8uI7XpTrXmKGcjBBV +09tL7ECQ8s1uV9JiDnxXk7Gnbc2dg7sq5+W2O3FYrf3RRbxake5TFW/TRQl1brqQ +XR4EzzffHqhmsYzmIGrv/EhOdJhCrylvLmrH+33RZjEizIYAfmaDDEL0vTSSwxrq +T8p+ck0LcIymSLumoRT2+1hEmRSuqguTaaApJUqlyyvdimYHFngVV3Eb7PVHhPOe +MTd61X8kreS8/f3MboPoDKi3QWwH3b08hpcv0g== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT +MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i +YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG +EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg +R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9 +9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq +fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv +iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU +1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+ +bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW +MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA +ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l +uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn +Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS +tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF +PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un +hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV +5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBY +MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMo +R2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEx +MjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgxCzAJBgNVBAYTAlVTMRYwFAYDVQQK +Ew1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQcmltYXJ5IENlcnRp +ZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9 +AWbK7hWNb6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjA +ZIVcFU2Ix7e64HXprQU9nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE0 +7e9GceBrAqg1cmuXm2bgyxx5X9gaBGgeRwLmnWDiNpcB3841kt++Z8dtd1k7j53W +kBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGttm/81w7a4DSwDRp35+MI +mO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G +A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJ +KoZIhvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ1 +6CePbJC/kRYkRj5KTs4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl +4b7UVXGYNTq+k+qurUKykG/g/CFNNWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6K +oKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHaFloxt/m0cYASSJlyc1pZU8Fj +UjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG1riR/aYNKxoU +AT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDEL +MAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChj +KSAyMDA3IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2 +MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0 +eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1OVowgZgxCzAJBgNV +BAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykgMjAw +NyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNV +BAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH +MjB2MBAGByqGSM49AgEGBSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcL +So17VDs6bl8VAsBQps8lL33KSLjHUGMcKiEIfJo22Av+0SbFWDEwKCXzXV2juLal +tJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO +BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+EVXVMAoG +CCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGT +qQ7mndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBucz +rD6ogRLQy7rQkgu2npaqBA+K +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCB +mDELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsT +MChjKSAyMDA4IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s +eTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhv +cml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIzNTk1OVowgZgxCzAJ +BgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg +MjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0 +BgNVBAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg +LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz ++uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5jK/BGvESyiaHAKAxJcCGVn2TAppMSAmUm +hsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdEc5IiaacDiGydY8hS2pgn +5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3CIShwiP/W +JmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exAL +DmKudlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZC +huOl1UcCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw +HQYDVR0OBBYEFMR5yo6hTgMdHNxr2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IB +AQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9cr5HqQ6XErhK8WTTOd8lNNTB +zU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbEAp7aDHdlDkQN +kv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD +AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUH +SJsMC8tJP33st/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2G +spki4cErx5z481+oghLrGREt +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEW +MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVy +c2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UE +BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0 +IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYV +VaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8 +cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTT +QjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFh +F7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2v +c7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/w +mZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xd +VHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCX +teGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZ +f9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfRe +Bi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+ +nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB +/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQY +MBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG +9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc +aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fX +IwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzyn +ANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0z +uzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqN +Pnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKja +QI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKW +koRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9 +ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQt +DF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/Sfuvm +bJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEW +MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVy +c2FsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYD +VQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1 +c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC +AQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0DE81 +WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUG +FF+3Qs17j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdq +XbboW0W63MOhBW9Wjo8QJqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxL +se4YuU6W3Nx2/zu+z18DwPw76L5GG//aQMJS9/7jOvdqdzXQ2o3rXhhqMcceujwb +KNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2WP0+GfPtDCapkzj4T8Fd +IgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP20gaXT73 +y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRt +hAAnZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgoc +QIgfksILAAX/8sgCSqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4 +Lt1ZrtmhN79UNdxzMk+MBB4zsslG8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNV +HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAfBgNV +HSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8EBAMCAYYwDQYJ +KoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z +dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQ +L1EuxBRa3ugZ4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgr +Fg5fNuH8KrUwJM/gYwx7WBr+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSo +ag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpqA1Ihn0CoZ1Dy81of398j9tx4TuaY +T1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpgY+RdM4kX2TGq2tbz +GDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiPpm8m +1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJV +OCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH +6aLcr34YEoP9VhdBLtUpgn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwX +QMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEk +MCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpH +bG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoX +DTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBD +QSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu +MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprlOQcJ +FspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAw +DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61F +uOJAf/sKbvu+M8k8o4TVMAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGX +kPoUVy0D7O48027KqGx2vKLeuwIgJ6iFJzWbVsaj8kfSt24bAgAXqmemFZHe+pTs +ewv4n4Q= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICHjCCAaSgAwIBAgIRYFlJ4CYuu1X5CneKcflK2GwwCgYIKoZIzj0EAwMwUDEk +MCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpH +bG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoX +DTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBD +QSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu +MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAER0UOlvt9Xb/pOdEh+J8LttV7HpI6SFkc +8GIxLcB6KP4ap1yztsyX50XUWPrRd21DosCHZTQKH3rd6zwzocWdTaRvQZU4f8ke +hOvRnkmSh5SHDDqFSmafnVmTTZdhBoZKo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD +VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYI +KoZIzj0EAwMDaAAwZQIxAOVpEslu28YxuglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg +515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7yFz9SO8NdCKoCOJuxUnO +xwy8p2Fp8fc74SrL+SvzZpA3 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG +A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv +b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw +MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i +YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT +aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ +jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp +xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp +1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG +snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ +U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8 +9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E +BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B +AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz +yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE +38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP +AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad +DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME +HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4G +A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNp +Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1 +MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEG +A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6ErPL +v4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8 +eoLrvozps6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklq +tTleiDTsvHgMCJiEbKjNS7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzd +C9XZzPnqJworc5HGnRusyMvo4KD0L5CLTfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pa +zq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6CygPCm48CAwEAAaOBnDCB +mTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUm+IH +V2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5n +bG9iYWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG +3lm0mi3f3BmGLjANBgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4Gs +J0/WwbgcQ3izDJr86iw8bmEbTUsp9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO +291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu01yiPqFbQfXf5WRDLenVOavS +ot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG79G+dwfCMNYxd +AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7 +TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G +A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp +Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4 +MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEG +A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWtiHL8 +RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsT +gHeMCOFJ0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmm +KPZpO/bLyCiR5Z2KYVc3rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zd +QQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjlOCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZ +XriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2xmmFghcCAwEAAaNCMEAw +DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI/wS3+o +LkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZU +RUm7lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMp +jjM5RcOO5LlXbKr8EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK +6fBdRoyV3XpYKBovHd7NADdBj+1EbddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQX +mcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18YIvDQVETI53O9zJrlAGomecs +Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH +WD9f +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD +VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0 +IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3 +MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD +aGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMxNDBaFw0zODA3MzEx +MjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3Vy +cmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAG +A1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAl +BgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZI +hvcNAQEBBQADggIPADCCAgoCggIBAMDfVtPkOpt2RbQT2//BthmLN0EYlVJH6xed +KYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXfXjaOcNFccUMd2drvXNL7 +G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0ZJJ0YPP2 +zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4 +ddPB/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyG +HoiMvvKRhI9lNNgATH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2 +Id3UwD2ln58fQ1DJu7xsepeY7s2MH/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3V +yJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfeOx2YItaswTXbo6Al/3K1dh3e +beksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSFHTynyQbehP9r +6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh +wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsog +zCtLkykPAgMBAAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQW +BBS5CcqcHtvTbDprru1U8VuTBjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDpr +ru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UEBhMCRVUxQzBBBgNVBAcTOk1hZHJp +ZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJmaXJtYS5jb20vYWRk +cmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJmaXJt +YSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiC +CQDJzdPp1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCow +KAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZI +hvcNAQEFBQADggIBAICIf3DekijZBZRG/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZ +UohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6ReAJ3spED8IXDneRRXoz +X1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/sdZ7LoR/x +fxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVz +a2Mg9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yyd +Yhz2rXzdpjEetrHHfoUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMd +SqlapskD7+3056huirRXhOukP9DuqqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9O +AP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETrP3iZ8ntxPjzxmKfFGBI/5rso +M0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVqc5iJWzouE4ge +v8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z +09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh +MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE +YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3 +MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo +ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg +MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN +ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA +PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w +wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi +EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY +avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+ +YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE +sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h +/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5 +IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD +ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy +OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P +TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ +HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER +dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf +ReYNnyicsbkqWletNw+vHX/bvZ8= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMx +EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoT +EUdvRGFkZHkuY29tLCBJbmMuMTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRp +ZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIz +NTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQH +EwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8GA1UE +AxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIw +DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKD +E6bFIEMBO4Tx5oVJnyfq9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH +/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD+qK+ihVqf94Lw7YZFAXK6sOoBJQ7Rnwy +DfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutdfMh8+7ArU6SSYmlRJQVh +GkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMlNAJWJwGR +tDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEA +AaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE +FDqahQcQZyi27/a9BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmX +WWcDYfF+OwYxdS2hII5PZYe096acvNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu +9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r5N9ss4UXnT3ZJE95kTXWXwTr +gIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYVN8Gb5DKj7Tjo +2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO +LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI +4uJEvlz36hz1 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzAN +BgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl +c2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO0hl +bGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgRUNDIFJv +b3RDQSAyMDE1MB4XDTE1MDcwNzEwMzcxMloXDTQwMDYzMDEwMzcxMlowgaoxCzAJ +BgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmljIEFj +YWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5 +MUQwQgYDVQQDEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0 +dXRpb25zIEVDQyBSb290Q0EgMjAxNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJKg +QehLgoRc4vgxEZmGZE4JJS+dQS8KrjVPdJWyUWRrjWvmP3CV8AVER6ZyOFB2lQJa +jq4onvktTpnvLEhvTCUp6NFxW98dwXU3tNf6e3pCnGoKVlp8aQuqgAkkbH7BRqNC +MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFLQi +C4KZJAEOnLvkDv2/+5cgk5kqMAoGCCqGSM49BAMCA2cAMGQCMGfOFmI4oqxiRaep +lSTAGiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy/XZxMOIQIwBeF1Ad5o7Sof +TUwJCA3sS61kFyjndc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1Ix +RDBCBgNVBAoTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1 +dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1p +YyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIFJvb3RDQSAyMDExMB4XDTExMTIw +NjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYTAkdSMUQwQgYDVQQK +EztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENl +cnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl +c2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEB +BQADggEPADCCAQoCggEBAKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPz +dYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJ +fel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa71HFK9+WXesyHgLacEns +bgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u8yBRQlqD +75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSP +FEDH3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNV +HRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp +5dgTBCPuQSUwRwYDVR0eBEAwPqA8MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQu +b3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQub3JnMA0GCSqGSIb3DQEBBQUA +A4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVtXdMiKahsog2p +6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8 +TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7 +dIsXRSZMFpGD/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8Acys +Nnq/onN694/BtZqhFLKPM58N7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXI +l7WdmplNsDz4SgCbZN2fOUvRJ9e4 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIGCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1Ix +DzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5k +IFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMT +N0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgUm9v +dENBIDIwMTUwHhcNMTUwNzA3MTAxMTIxWhcNNDAwNjMwMTAxMTIxWjCBpjELMAkG +A1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNh +ZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkx +QDA+BgNVBAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1 +dGlvbnMgUm9vdENBIDIwMTUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC +AQDC+Kk/G4n8PDwEXT2QNrCROnk8ZlrvbTkBSRq0t89/TSNTt5AA4xMqKKYx8ZEA +4yjsriFBzh/a/X0SWwGDD7mwX5nh8hKDgE0GPt+sr+ehiGsxr/CL0BgzuNtFajT0 +AoAkKAoCFZVedioNmToUW/bLy1O8E00BiDeUJRtCvCLYjqOWXjrZMts+6PAQZe10 +4S+nfK8nNLspfZu2zwnI5dMK/IhlZXQK3HMcXM1AsRzUtoSMTFDPaI6oWa7CJ06C +ojXdFPQf/7J31Ycvqm59JCfnxssm5uX+Zwdj2EUN3TpZZTlYepKZcj2chF6IIbjV +9Cz82XBST3i4vTwri5WY9bPRaM8gFH5MXF/ni+X1NYEZN9cRCLdmvtNKzoNXADrD +gfgXy5I2XdGj2HUb4Ysn6npIQf1FGQatJ5lOwXBH3bWfgVMS5bGMSF0xQxfjjMZ6 +Y5ZLKTBOhE5iGV48zpeQpX8B653g+IuJ3SWYPZK2fu/Z8VFRfS0myGlZYeCsargq +NhEEelC9MoS+L9xy1dcdFkfkR2YgP/SWxa+OAXqlD3pk9Q0Yh9muiNX6hME6wGko +LfINaFGq46V3xqSQDqE3izEjR8EJCOtu93ib14L8hCCZSRm2Ekax+0VVFqmjZayc +Bw/qa9wfLgZy7IaIEuQt218FL+TwA9MmM+eAws1CoRc0CwIDAQABo0IwQDAPBgNV +HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcRVnyMjJvXVd +ctA4GGqd83EkVAswDQYJKoZIhvcNAQELBQADggIBAHW7bVRLqhBYRjTyYtcWNl0I +XtVsyIe9tC5G8jH4fOpCtZMWVdyhDBKg2mF+D1hYc2Ryx+hFjtyp8iY/xnmMsVMI +M4GwVhO+5lFc2JsKT0ucVlMC6U/2DWDqTUJV6HwbISHTGzrMd/K4kPFox/la/vot +9L/J9UUbzjgQKjeKeaO04wlshYaT/4mWJ3iBj2fjRnRUjtkNaeJK9E10A/+yd+2V +Z5fkscWrv2oj6NSU4kQoYsRL4vDY4ilrGnB+JGGTe08DMiUNRSQrlrRGar9KC/ea +j8GsGsVn82800vpzY4zvFrCopEYq+OsS7HK07/grfoxSwIuEVPkvPuNVqNxmsdnh +X9izjFk0WaSrT2y7HxjbdavYy5LNlDhhDgcGH0tGEPEVvo2FXDtKK4F5D7Rpn0lQ +l033DlZdwJVqwjbDG2jJ9SrcR5q+ss7FJej6A7na+RZukYT1HCjI/CbM1xyQVqdf +bzoEvM14iQuODy+jqk+iGxI9FghAD/FGTNeqewjBCvVtJ94Cj8rDtSvK6evIIVM4 +pcw72Hc3MKJP2W/R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGaJI7ZjnHK +e7iG2rKPmT4dEw0SEe7Uq/DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0 +vm9qp/UsQu0yrbYhnr68 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsx +FjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3Qg +Um9vdCBDQSAxMB4XDTAzMDUxNTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkG +A1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdr +b25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1ApzQ +jVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEn +PzlTCeqrauh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjh +ZY4bXSNmO7ilMlHIhqqhqZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9 +nnV0ttgCXjqQesBCNnLsak3c78QA3xMYV18meMjWCnl3v/evt3a5pQuEF10Q6m/h +q5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgED +MA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7ih9legYsC +mEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI3 +7piol7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clB +oiMBdDhViw+5LmeiIAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJs +EhTkYY2sEJCehFC78JZvRZ+K88psT/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpO +fMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilTc4afU9hDDl3WY4JxHYB0yvbi +AmvZWg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw +TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh +cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4 +WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu +ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY +MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc +h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+ +0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U +A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW +T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH +B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC +B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv +KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn +OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn +jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw +qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI +rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV +HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq +hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL +ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ +3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK +NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5 +ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur +TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC +jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc +oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq +4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA +mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d +emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBK +MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVu +VHJ1c3QgQ29tbWVyY2lhbCBSb290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQw +MTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0MScw +JQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENBIDEwggIiMA0GCSqG +SIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ldhNlT +3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU ++ehcCuz/mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gp +S0l4PJNgiCL8mdo2yMKi1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1 +bVoE/c40yiTcdCMbXTMTEl3EASX2MN0CXZ/g1Ue9tOsbobtJSdifWwLziuQkkORi +T0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl3ZBWzvurpWCdxJ35UrCL +vYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzyNeVJSQjK +Vsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZK +dHzVWYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHT +c+XvvqDtMwt0viAgxGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hv +l7yTmvmcEpB4eoCHFddydJxVdHixuuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5N +iGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB +/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZIhvcNAQELBQAD +ggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH +6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwt +LRvM7Kqas6pgghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93 +nAbowacYXVKV7cndJZ5t+qntozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3 ++wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmVYjzlVYA211QC//G5Xc7UI2/YRYRK +W2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUXfeu+h1sXIFRRk0pT +AwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/rokTLq +l1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG +4iZZRHUe2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZ +mUlO+KWA2yUPHGNiiskzZ2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A +7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7RcGzM7vRX+Bi6hG6H +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBN +MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVu +VHJ1c3QgUHVibGljIFNlY3RvciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcN +MzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0 +MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBSb290IENBIDEwggIi +MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTyP4o7 +ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGy +RBb06tD6Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlS +bdsHyo+1W/CD80/HLaXIrcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF +/YTLNiCBWS2ab21ISGHKTN9T0a9SvESfqy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R +3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoSmJxZZoY+rfGwyj4GD3vw +EUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFnol57plzy +9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9V +GxyhLrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ +2fjXctscvG29ZV/viDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsV +WaFHVCkugyhfHMKiq3IXAAaOReyL4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gD +W/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/ +BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMwDQYJKoZIhvcN +AQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj +t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHV +DRDtfULAj+7AmgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9 +TaDKQGXSc3z1i9kKlT/YPyNtGtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8G +lwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFtm6/n6J91eEyrRjuazr8FGF1NFTwW +mhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMxNRF4eKLg6TCMf4Df +WN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4Mhn5 ++bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJ +tshquDDIajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhA +GaQdp/lLQzfcaFpPz+vCZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv +8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ3Wl9af0AVqW3rLatt8o+Ae+c +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4 +MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6 +ZW5wZS5jb20wHhcNMDcxMjEzMTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYD +VQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5j +b20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ03rKDx6sp4boFmVq +scIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAKClaO +xdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6H +LmYRY2xU+zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFX +uaOKmMPsOzTFlUFpfnXCPCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQD +yCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxTOTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+ +JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbKF7jJeodWLBoBHmy+E60Q +rLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK0GqfvEyN +BjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8L +hij+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIB +QFqNeb+Lz0vPqhbBleStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+ +HMh3/1uaD7euBUbl8agW7EekFwIDAQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2lu +Zm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+SVpFTlBFIFMuQS4gLSBDSUYg +QTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBGNjIgUzgxQzBB +BgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx +MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC +AQYwHQYDVR0OBBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUA +A4ICAQB4pgwWSp9MiDrAyw6lFn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWb +laQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbgakEyrkgPH7UIBzg/YsfqikuFgba56 +awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8qhT/AQKM6WfxZSzwo +JNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Csg1lw +LDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCT +VyvehQP5aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGk +LhObNA5me0mrZJfQRsN5nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJb +UjWumDqtujWTI6cfSN01RpiyEGjkpTHCClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/ +QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZoQ0iy2+tzJOeRf1SktoA+ +naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1ZWrOZyGls +QyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFwzCCA6ugAwIBAgIUCn6m30tEntpqJIWe5rgV0xZ/u7EwDQYJKoZIhvcNAQEL +BQAwRjELMAkGA1UEBhMCTFUxFjAUBgNVBAoMDUx1eFRydXN0IFMuQS4xHzAdBgNV +BAMMFkx1eFRydXN0IEdsb2JhbCBSb290IDIwHhcNMTUwMzA1MTMyMTU3WhcNMzUw +MzA1MTMyMTU3WjBGMQswCQYDVQQGEwJMVTEWMBQGA1UECgwNTHV4VHJ1c3QgUy5B +LjEfMB0GA1UEAwwWTHV4VHJ1c3QgR2xvYmFsIFJvb3QgMjCCAiIwDQYJKoZIhvcN +AQEBBQADggIPADCCAgoCggIBANeFl78RmOnwYoNMPIf5U2o3C/IPPIfOb9wmKb3F +ibrJgz337spbxm1Jc7TJRqMbNBM/wYlFV/TZsfs2ZUv7COJIcRHIbjuend+JZTem +hfY7RBi2xjcwYkSSl2l9QjAk5A0MiWtj3sXh306pFGxT4GHO9hcvHTy95iJMHZP1 +EMShduxq3sVs35a0VkBCwGKSMKEtFZSg0iAGCW5qbeXrt77U8PEVfIvmTroTzEsn +Xpk8F12PgX8zPU/TPxvsXD/wPEx1bvKm1Z3aLQdjAsZy6ZS8TEmVT4hSyNvoaYL4 +zDRbIvCGp4m9SAptZoFtyMhk+wHh9OHe2Z7d21vUKpkmFRseTJIpgp7VkoGSQXAZ +96Tlk0u8d2cx3Rz9MXANF5kM+Qw5GSoXtTBxVdUPrljhPS80m8+f9niFwpN6cj5m +j5wWEWCPnolvZ77gR1o7DJpni89Gxq44o/KnvObWhWszJHAiS8sIm7vI+AIpHb4g +DEa/a4ebsypmQjVGbKq6rfmYe+lQVRQxv7HaLe2ArWgk+2mr2HETMOZns4dA/Yl+ +8kPREd8vZS9kzl8UubG/Mb2HeFpZZYiq/FkySIbWTLkpS5XTdvN3JW1CHDiDTf2j +X5t/Lax5Gw5CMZdjpPuKadUiDTSQMC6otOBttpSsvItO13D8xTiOZCXhTTmQzsmH +hFhxAgMBAAGjgagwgaUwDwYDVR0TAQH/BAUwAwEB/zBCBgNVHSAEOzA5MDcGByuB +KwEBAQowLDAqBggrBgEFBQcCARYeaHR0cHM6Ly9yZXBvc2l0b3J5Lmx1eHRydXN0 +Lmx1MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBT/GCh2+UgFLKGu8SsbK7JT ++Et8szAdBgNVHQ4EFgQU/xgodvlIBSyhrvErGyuyU/hLfLMwDQYJKoZIhvcNAQEL +BQADggIBAGoZFO1uecEsh9QNcH7X9njJCwROxLHOk3D+sFTAMs2ZMGQXvw/l4jP9 +BzZAcg4atmpZ1gDlaCDdLnINH2pkMSCEfUmmWjfrRcmF9dTHF5kH5ptV5AzoqbTO +jFu1EVzPig4N1qx3gf4ynCSecs5U89BvolbW7MM3LGVYvlcAGvI1+ut7MV3CwRI9 +loGIlonBWVx65n9wNOeD4rHh4bhY79SV5GCc8JaXcozrhAIuZY+kt9J/Z93I055c +qqmkoCUUBpvsT34tC38ddfEz2O3OuHVtPlu5mB0xDVbYQw8wkbIEa91WvpWAVWe+ +2M2D2RjuLg+GLZKecBPs3lHJQ3gCpU3I+V/EkVhGFndadKpAvAefMLmx9xIX3eP/ +JEAdemrRTxgKqpAd60Ae36EeRJIQmvKN4dFLRp7oRUKX6kWZ8+xm1QL68qZKJKre +zrnK+T+Tb/mjuuqlPpmt/f97mfVl7vBZKGfXkJWkE4SphMHozs51k2MavDzq1WQf +LSoSOcbDWjLtR5EWDrw4wVDej8oqkDQc7kGUnF4ZLvhFSZl0kbAEb+MEWrGrKqv+ +x9CWttrhSmQGbmBNvUJO/3jaJMobtNeWOWyu8Q6qp31IiyBMz2TWuJdGsE7RKlY6 +oJO9r4Ak4Ap+58rVyuiFVdw2KuGUaJPHZnJED4AhMmwlxyOAgwrr +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYD +VQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0 +ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0G +CSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTAeFw0wOTA2MTYxMTMwMThaFw0y +OTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3Qx +FjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3pp +Z25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o +dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvP +kd6mJviZpWNwrZuuyjNAfW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tc +cbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG0IMZfcChEhyVbUr02MelTTMuhTlAdX4U +fIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKApxn1ntxVUwOXewdI/5n7 +N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm1HxdrtbC +xkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1 ++rUCAwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G +A1UdDgQWBBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPM +Pcu1SCOhGnqmKrs0aDAbBgNVHREEFDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqG +SIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0olZMEyL/azXm4Q5DwpL7v8u8h +mLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfXI/OMn74dseGk +ddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775 +tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c +2Pm2G2JwCz02yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5t +HMN1Rq41Bab2XD0h7lbwyYIiLXpUq3DDfSJlgnCW +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQG +EwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3 +MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNl +cnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBBcmFueSAoQ2xhc3MgR29sZCkgRsWR +dGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgxMjA2MTUwODIxWjCB +pzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxOZXRM +b2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlm +aWNhdGlvbiBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNz +IEdvbGQpIEbFkXRhbsO6c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAxCRec75LbRTDofTjl5Bu0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrT +lF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw/HpYzY6b7cNGbIRwXdrz +AZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAkH3B5r9s5 +VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRG +ILdwfzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2 +BJtr+UBdADTHLpl1neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAG +AQH/AgEEMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2M +U9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwWqZw8UQCgwBEIBaeZ5m8BiFRh +bvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTtaYtOUZcTh5m2C ++C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC +bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2F +uLjbvrW5KfnaNwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2 +XjG4Kvte9nHfRCaexOYNkbQudZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBi +MQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu +MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3Jp +dHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMxMjM1OTU5WjBiMQswCQYDVQQGEwJV +UzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydO +ZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwz +c7MEL7xxjOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPP +OCwGJgl6cvf6UDL4wpPTaaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rl +mGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXTcrA/vGp97Eh/jcOrqnErU2lBUzS1sLnF +BgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc/Qzpf14Dl847ABSHJ3A4 +qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMBAAGjgZcw +gZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIB +BjAPBgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwu +bmV0c29sc3NsLmNvbS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3Jp +dHkuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc8 +6fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q4LqILPxFzBiwmZVRDuwduIj/ +h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/GGUsyfJj4akH +/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv +wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHN +pGxlaKFJdlxDydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCB +ijELMAkGA1UEBhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHly +aWdodCAoYykgMjAwNTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl +ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQSBDQTAeFw0w +NTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYDVQQGEwJDSDEQMA4G +A1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIwIAYD +VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBX +SVNlS2V5IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAy0+zAJs9Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxR +VVuuk+g3/ytr6dTqvirdqFEr12bDYVxgAsj1znJ7O7jyTmUIms2kahnBAbtzptf2 +w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbDd50kc3vkDIzh2TbhmYsF +mQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ/yxViJGg +4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t9 +4B3RLoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYw +DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQw +EAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOx +SPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vImMMkQyh2I+3QZH4VFvbBsUfk2 +ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4+vg1YFkCExh8 +vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa +hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZi +Fj4A4xylNoEYokxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ +/L7fCg0= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs/gjGvbCwDANBgkqhkiG9w0BAQsFADBt +MQswCQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUg +Rm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9i +YWwgUm9vdCBHQiBDQTAeFw0xNDEyMDExNTAwMzJaFw0zOTEyMDExNTEwMzFaMG0x +CzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYDVQQLExlPSVNURSBG +b3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEdsb2Jh +bCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Be3 +HEokKtaXscriHvt9OO+Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvYD06fWvGx +WuR51jIjK+FTzJlFXHtPrby/h0oLS5daqPZI7H17Dc0hBt+eFf1Biki3IPShehtX +1F1Q/7pn2COZH8g/497/b1t3sWtuuMlk9+HKQUYOKXHQuSP8yYFfTvdv37+ErXNk +u7dCjmn21HYdfp2nuFeKUWdy19SouJVUQHMD9ur06/4oQnc/nSMbsrY9gBQHTC5P +99UKFg29ZkM3fiNDecNAhvVMKdqOmq0NpQSHiB6F4+lT1ZvIiwNjeOvgGUpuuy9r +M2RYk61pv48b74JIxwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw +AwEB/zAdBgNVHQ4EFgQUNQ/INmNe4qPs+TtmFc5RUuORmj0wEAYJKwYBBAGCNxUB +BAMCAQAwDQYJKoZIhvcNAQELBQADggEBAEBM+4eymYGQfp3FsLAmzYh7KzKNbrgh +cViXfa43FK8+5/ea4n32cZiZBKpDdHij40lhPnOMTZTg+XHEthYOU3gf1qKHLwI5 +gSk8rxWYITD+KJAAjNHhy/peyP34EEY7onhCkRd0VQreUGdNZtGn//3ZwLWoo4rO +ZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEuiHZeeevJuQHHf +aPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic +Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFbzCCA1egAwIBAgISESCzkFU5fX82bWTCp59rY45nMA0GCSqGSIb3DQEBCwUA +MEAxCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9w +ZW5UcnVzdCBSb290IENBIEcxMB4XDTE0MDUyNjA4NDU1MFoXDTM4MDExNTAwMDAw +MFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCU9wZW5UcnVzdDEdMBsGA1UEAwwU +T3BlblRydXN0IFJvb3QgQ0EgRzEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK +AoICAQD4eUbalsUwXopxAy1wpLuwxQjczeY1wICkES3d5oeuXT2R0odsN7faYp6b +wiTXj/HbpqbfRm9RpnHLPhsxZ2L3EVs0J9V5ToybWL0iEA1cJwzdMOWo010hOHQX +/uMftk87ay3bfWAfjH1MBcLrARYVmBSO0ZB3Ij/swjm4eTrwSSTilZHcYTSSjFR0 +77F9jAHiOH3BX2pfJLKOYheteSCtqx234LSWSE9mQxAGFiQD4eCcjsZGT44ameGP +uY4zbGneWK2gDqdkVBFpRGZPTBKnjix9xNRbxQA0MMHZmf4yzgeEtE7NCv82TWLx +p2NX5Ntqp66/K7nJ5rInieV+mhxNaMbBGN4zK1FGSxyO9z0M+Yo0FMT7MzUj8czx +Kselu7Cizv5Ta01BG2Yospb6p64KTrk5M0ScdMGTHPjgniQlQ/GbI4Kq3ywgsNw2 +TgOzfALU5nsaqocTvz6hdLubDuHAk5/XpGbKuxs74zD0M1mKB3IDVedzagMxbm+W +G+Oin6+Sx+31QrclTDsTBM8clq8cIqPQqwWyTBIjUtz9GVsnnB47ev1CI9sjgBPw +vFEVVJSmdz7QdFG9URQIOTfLHzSpMJ1ShC5VkLG631UAC9hWLbFJSXKAqWLXwPYY +EQRVzXR7z2FwefR7LFxckvzluFqrTJOVoSfupb7PcSNCupt2LQIDAQABo2MwYTAO +BgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUl0YhVyE1 +2jZVx/PxN3DlCPaTKbYwHwYDVR0jBBgwFoAUl0YhVyE12jZVx/PxN3DlCPaTKbYw +DQYJKoZIhvcNAQELBQADggIBAB3dAmB84DWn5ph76kTOZ0BP8pNuZtQ5iSas000E +PLuHIT839HEl2ku6q5aCgZG27dmxpGWX4m9kWaSW7mDKHyP7Rbr/jyTwyqkxf3kf +gLMtMrpkZ2CvuVnN35pJ06iCsfmYlIrM4LvgBBuZYLFGZdwIorJGnkSI6pN+VxbS +FXJfLkur1J1juONI5f6ELlgKn0Md/rcYkoZDSw6cMoYsYPXpSOqV7XAp8dUv/TW0 +V8/bhUiZucJvbI/NeJWsZCj9VrDDb8O+WVLhX4SPgPL0DTatdrOjteFkdjpY3H1P +XlZs5VVZV6Xf8YpmMIzUUmI4d7S+KNfKNsSbBfD4Fdvb8e80nR14SohWZ25g/4/I +i+GOvUKpMwpZQhISKvqxnUOOBZuZ2mKtVzazHbYNeS2WuOvyDEsMpZTGMKcmGS3t +TAZQMPH9WD25SxdfGbRqhFS0OE85og2WaMMolP3tLR9Ka0OWLpABEPs4poEL0L91 +09S5zvE/bw4cHjdx5RiHdRk/ULlepEU0rbDK5uUTdg8xFKmOLZTW1YVNcxVPS/Ky +Pu1svf0OnWZzsD2097+o4BGkxK51CUpjAEggpsadCwmKtODmzj7HPiY46SvepghJ +AwSQiumPv+i2tCqjI40cHLI5kqiPAlxAOXXUc0ECd97N4EOH1uS6SsNsEn/+KuYj +1oxx +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFbzCCA1egAwIBAgISESChaRu/vbm9UpaPI+hIvyYRMA0GCSqGSIb3DQEBDQUA +MEAxCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9w +ZW5UcnVzdCBSb290IENBIEcyMB4XDTE0MDUyNjAwMDAwMFoXDTM4MDExNTAwMDAw +MFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCU9wZW5UcnVzdDEdMBsGA1UEAwwU +T3BlblRydXN0IFJvb3QgQ0EgRzIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK +AoICAQDMtlelM5QQgTJT32F+D3Y5z1zCU3UdSXqWON2ic2rxb95eolq5cSG+Ntmh +/LzubKh8NBpxGuga2F8ORAbtp+Dz0mEL4DKiltE48MLaARf85KxP6O6JHnSrT78e +CbY2albz4e6WiWYkBuTNQjpK3eCasMSCRbP+yatcfD7J6xcvDH1urqWPyKwlCm/6 +1UWY0jUJ9gNDlP7ZvyCVeYCYitmJNbtRG6Q3ffyZO6v/v6wNj0OxmXsWEH4db0fE +FY8ElggGQgT4hNYdvJGmQr5J1WqIP7wtUdGejeBSzFfdNTVY27SPJIjki9/ca1TS +gSuyzpJLHB9G+h3Ykst2Z7UJmQnlrBcUVXDGPKBWCgOz3GIZ38i1MH/1PCZ1Eb3X +G7OHngevZXHloM8apwkQHZOJZlvoPGIytbU6bumFAYueQ4xncyhZW+vj3CzMpSZy +YhK05pyDRPZRpOLAeiRXyg6lPzq1O4vldu5w5pLeFlwoW5cZJ5L+epJUzpM5ChaH +vGOz9bGTXOBut9Dq+WIyiET7vycotjCVXRIouZW+j1MY5aIYFuJWpLIsEPUdN6b4 +t/bQWVyJ98LVtZR00dX+G7bw5tYee9I8y6jj9RjzIR9u701oBnstXW5DiabA+aC/ +gh7PU3+06yzbXfZqfUAkBXKJOAGTy3HCOV0GEfZvePg3DTmEJwIDAQABo2MwYTAO +BgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUajn6QiL3 +5okATV59M4PLuG53hq8wHwYDVR0jBBgwFoAUajn6QiL35okATV59M4PLuG53hq8w +DQYJKoZIhvcNAQENBQADggIBAJjLq0A85TMCl38th6aP1F5Kr7ge57tx+4BkJamz +Gj5oXScmp7oq4fBXgwpkTx4idBvpkF/wrM//T2h6OKQQbA2xx6R3gBi2oihEdqc0 +nXGEL8pZ0keImUEiyTCYYW49qKgFbdEfwFFEVn8nNQLdXpgKQuswv42hm1GqO+qT +RmTFAHneIWv2V6CG1wZy7HBGS4tz3aAhdT7cHcCP009zHIXZ/n9iyJVvttN7jLpT +wm+bREx50B1ws9efAvSyB7DH5fitIw6mVskpEndI2S9G/Tvw/HRwkqWOOAgfZDC2 +t0v7NqwQjqBSM2OdAzVWxWm9xiNaJ5T2pBL4LTM8oValX9YZ6e18CL13zSdkzJTa +TkZQh+D5wVOAHrut+0dSixv9ovneDiK3PTNZbNTe9ZUGMg1RGUFcPk8G97krgCf2 +o6p6fAbhQ8MTOWIaNr3gKC6UAuQpLmBVrkA9sHSSXvAgZJY/X0VdiLWK2gKgW0VU +3jg9CcCoSmVGFvyqv1ROTVu+OEO3KMqLM6oaJbolXCkvW0pujOotnCr2BXbgd5eA +iN1nE28daCSLT7d0geX0YJ96Vdc+N9oWaz53rK4YcJUIeSkDiv7BO7M/Gg+kO14f +WKGVyasvc0rQLW6aWQ9VGHgtPFGml4vmu7JwqkwR3v98KzfUetF3NI/n+UL3PIEM +S1IK +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICITCCAaagAwIBAgISESDm+Ez8JLC+BUCs2oMbNGA/MAoGCCqGSM49BAMDMEAx +CzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5U +cnVzdCBSb290IENBIEczMB4XDTE0MDUyNjAwMDAwMFoXDTM4MDExNTAwMDAwMFow +QDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCU9wZW5UcnVzdDEdMBsGA1UEAwwUT3Bl +blRydXN0IFJvb3QgQ0EgRzMwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARK7liuTcpm +3gY6oxH84Bjwbhy6LTAMidnW7ptzg6kjFYwvWYpa3RTqnVkrQ7cG7DK2uu5Bta1d +oYXM6h0UZqNnfkbilPPntlahFVmhTzeXuSIevRHr9LIfXsMUmuXZl5mjYzBhMA4G +A1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRHd8MUi2I5 +DMlv4VBN0BBY3JWIbTAfBgNVHSMEGDAWgBRHd8MUi2I5DMlv4VBN0BBY3JWIbTAK +BggqhkjOPQQDAwNpADBmAjEAj6jcnboMBBf6Fek9LykBl7+BFjNAk2z8+e2AcG+q +j9uEwov1NcoG3GRvaBbhj5G5AjEA2Euly8LQCGzpGPta3U1fJAuwACEl74+nBCZx +4nxp5V2a+EEfOzmTk51V6s2N8fvB +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC +TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0 +aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0 +aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz +MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw +IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR +dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp +li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D +rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ +WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug +F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU +xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC +Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv +dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw +ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl +IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh +c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy +ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh +Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI +KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T +KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq +y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p +dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD +VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL +MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk +fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8 +7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R +cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y +mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW +xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK +SnQ2+Q== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQEL +BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc +BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00 +MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM +aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEgRzMwggIiMA0GCSqG +SIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakEPBtV +wedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWe +rNrwU8lmPNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF341 +68Xfuw6cwI2H44g4hWf6Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh +4Pw5qlPafX7PGglTvF0FBM+hSo+LdoINofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXp +UhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/lg6AnhF4EwfWQvTA9xO+o +abw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV7qJZjqlc +3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/G +KubX9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSt +hfbZxbGL0eUQMk1fiyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KO +Tk0k+17kBL5yG6YnLUlamXrXXAkgt3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOt +zCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB +BjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZIhvcNAQELBQAD +ggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC +MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2 +cDMT/uFPpiN3GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUN +qXsCHKnQO18LwIE6PWThv6ctTr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5 +YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP+V04ikkwj+3x6xn0dxoxGE1nVGwv +b2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh3jRJjehZrJ3ydlo2 +8hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fawx/k +NSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNj +ZgKAvQU6O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhp +q1467HxpvMc7hU6eFbm0FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFt +nh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOVhMJKzRwuJIczYOXD +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x +GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv +b3QgQ0EgMjAeFw0wNjExMjQxODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNV +BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W +YWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCa +GMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6XJxg +Fyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55J +WpzmM+Yklvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bB +rrcCaoF6qUWD4gXmuVbBlDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp ++ARz8un+XJiM9XOva7R+zdRcAitMOeGylZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1 +ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt66/3FsvbzSUr5R/7mp/i +Ucw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1JdxnwQ5hYIiz +PtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og +/zOhD7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UH +oycR7hYQe7xFSkyyBNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuI +yV77zGHcizN300QyNQliBJIWENieJ0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1Ud +EwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBQahGK8SEwzJQTU7tD2 +A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGUa6FJpEcwRTEL +MAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT +ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2f +BluornFdLwUvZ+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzn +g/iN/Ae42l9NLmeyhP3ZRPx3UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2Bl +fF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodmVjB3pjd4M1IQWK4/YY7yarHvGH5K +WWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK+JDSV6IZUaUtl0Ha +B0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrWIozc +hLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPR +TUIZ3Ph1WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWD +mbA4CD/pXvk1B+TJYm5Xf6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0Z +ohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y +4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8VCLAAVBpQ570su9t+Oza +8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQEL +BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc +BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00 +MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM +aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIgRzMwggIiMA0GCSqG +SIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFhZiFf +qq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMW +n4rjyduYNM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ym +c5GQYaYDFCDy54ejiK2toIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+ +O7q414AB+6XrW7PFXmAqMaCvN+ggOp+oMiwMzAkd056OXbxMmO7FGmh77FOm6RQ1 +o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+lV0POKa2Mq1W/xPtbAd0j +IaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZoL1NesNKq +IcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz +8eQQsSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43eh +vNURG3YBZwjgQQvD6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l +7ZizlWNof/k19N+IxWA1ksB8aRxhlRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALG +cC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB +BjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZIhvcNAQELBQAD +ggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66 +AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RC +roijQ1h5fq7KpVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0Ga +W/ZZGYjeVYg3UQt4XAoeo0L9x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4n +lv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgzdWqTHBLmYF5vHX/JHyPLhGGfHoJE ++V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6XU/IyAgkwo1jwDQHV +csaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+NwmNtd +dbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNg +KCLjsZWDzYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeM +HVOyToV7BjjHLPj4sHKNJeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4 +WSr2Rz0ZiC3oheGe7IUIarFsNMkd7EgrO3jtZsSOeWmD3n+M +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x +GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv +b3QgQ0EgMzAeFw0wNjExMjQxOTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNV +BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W +YWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDM +V0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNggDhoB +4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUr +H556VOijKTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd +8lyyBTNvijbO0BNO/79KDDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9Cabwv +vWhDFlaJKjdhkf2mrk7AyxRllDdLkgbvBNDInIjbC3uBr7E9KsRlOni27tyAsdLT +mZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwpp5ijJUMv7/FfJuGITfhe +btfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8nT8KKdjc +T5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDt +WAEXMJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZ +c6tsgLjoC2SToJyMGf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A +4iLItLRkT9a6fUg+qGkM17uGcclzuD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYD +VR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHTBgkrBgEEAb5YAAMwgcUwgZMG +CCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmljYXRlIGNvbnN0 +aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0 +aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVu +dC4wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2Nw +czALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4G +A1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4ywLQoUmkRzBFMQswCQYDVQQGEwJC +TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UEAxMSUXVvVmFkaXMg +Um9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZVqyM0 +7ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSem +d1o417+shvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd ++LJ2w/w4E6oM3kJpK27zPOuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B +4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadN +t54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp8kokUvd0/bpO5qgdAm6x +DYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBCbjPsMZ57 +k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6s +zHXug/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0j +Wy10QJLZYxkNc91pvGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeT +mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK +4SVhM7JZG+Ju1zdXtg2pEto= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQEL +BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc +BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00 +MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM +aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMgRzMwggIiMA0GCSqG +SIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286IxSR +/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNu +FoM7pmRLMon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXR +U7Ox7sWTaYI+FrUoRqHe6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+c +ra1AdHkrAj80//ogaX3T7mH1urPnMNA3I4ZyYUUpSFlob3emLoG+B01vr87ERROR +FHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3UVDmrJqMz6nWB2i3ND0/k +A9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f75li59wzw +eyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634Ryl +sSqiMd5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBp +VzgeAVuNVejH38DMdyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0Q +A4XN8f+MFrXBsj6IbGB/kE+V9/YtrQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+ +ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB +BjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZIhvcNAQELBQAD +ggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px +KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnI +FUBhynLWcKzSt/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5Wvv +oxXqA/4Ti2Tk08HS6IT7SdEQTXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFg +u/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9DuDcpmvJRPpq3t/O5jrFc/ZSXPsoaP +0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGibIh6BJpsQBJFxwAYf +3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmDhPbl +8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+ +DhcI00iX0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HN +PlopNLk9hM6xZdRZkZFWdSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/ +ywaZWWDYWGWVjUTR939+J399roD1B0y2PpxxVJkES/1Y+Zj0 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIID2DCCAsCgAwIBAgIQYFbFSyNAW2TU7SXa2dYeHjANBgkqhkiG9w0BAQsFADCB +hTELMAkGA1UEBhMCREUxKTAnBgNVBAoTIERldXRzY2hlciBTcGFya2Fzc2VuIFZl +cmxhZyBHbWJIMScwJQYDVQQLEx5TLVRSVVNUIENlcnRpZmljYXRpb24gU2Vydmlj +ZXMxIjAgBgNVBAMTGVMtVFJVU1QgVW5pdmVyc2FsIFJvb3QgQ0EwHhcNMTMxMDIy +MDAwMDAwWhcNMzgxMDIxMjM1OTU5WjCBhTELMAkGA1UEBhMCREUxKTAnBgNVBAoT +IERldXRzY2hlciBTcGFya2Fzc2VuIFZlcmxhZyBHbWJIMScwJQYDVQQLEx5TLVRS +VVNUIENlcnRpZmljYXRpb24gU2VydmljZXMxIjAgBgNVBAMTGVMtVFJVU1QgVW5p +dmVyc2FsIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCo +4wvfETeFgpq1bGZ8YT/ARxodRuOwVWTluII5KAd+F//0m4rwkYHqOD8heGxI7Gsv +otOKcrKn19nqf7TASWswJYmM67fVQGGY4tw8IJLNZUpynxqOjPolFb/zIYMoDYuv +WRGCQ1ybTSVRf1gYY2A7s7WKi1hjN0hIkETCQN1d90NpKZhcEmVeq5CSS2bf1XUS +U1QYpt6K1rtXAzlZmRgFDPn9FcaQZEYXgtfCSkE9/QC+V3IYlHcbU1qJAfYzcg6T +OtzoHv0FBda8c+CI3KtP7LUYhk95hA5IKmYq3TLIeGXIC51YAQVx7YH1aBduyw20 +S9ih7K446xxYL6FlAzQvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P +AQH/BAQDAgEGMB0GA1UdDgQWBBSafdfr639UmEUptCCrbQuWIxmkwjANBgkqhkiG +9w0BAQsFAAOCAQEATpYS2353XpInniEXGIJ22D+8pQkEZoiJrdtVszNqxmXEj03z +MjbceQSWqXcy0Zf1GGuMuu3OEdBEx5LxtESO7YhSSJ7V/Vn4ox5R+wFS5V/let2q +JE8ii912RvaloA812MoPmLkwXSBvwoEevb3A/hXTOCoJk5gnG5N70Cs0XmilFU/R +UsOgyqCDRR319bdZc11ZAY+qwkcvFHHVKeMQtUeTJcwjKdq3ctiR1OwbSIoi5MEq +9zpok59FGW5Dt8z+uJGaYRo2aWNkkijzb2GShROfyQcsi1fc65551cLeCNVUsldO +KjKNoeI60RAgIjl9NEVvcTvDHfz/sk+o4vYwHg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIClDCCAhqgAwIBAgIILCmcWxbtBZUwCgYIKoZIzj0EAwIwfzELMAkGA1UEBhMC +VVMxDjAMBgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9T +U0wgQ29ycG9yYXRpb24xNDAyBgNVBAMMK1NTTC5jb20gRVYgUm9vdCBDZXJ0aWZp +Y2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYwMjEyMTgxNTIzWhcNNDEwMjEyMTgx +NTIzWjB/MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hv +dXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjE0MDIGA1UEAwwrU1NMLmNv +bSBFViBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49 +AgEGBSuBBAAiA2IABKoSR5CYG/vvw0AHgyBO8TCCogbR8pKGYfL2IWjKAMTH6kMA +VIbc/R/fALhBYlzccBYy3h+Z1MzFB8gIH2EWB1E9fVwHU+M1OIzfzZ/ZLg1Kthku +WnBaBu2+8KGwytAJKaNjMGEwHQYDVR0OBBYEFFvKXuXe0oGqzagtZFG22XKbl+ZP +MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUW8pe5d7SgarNqC1kUbbZcpuX +5k8wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2gAMGUCMQCK5kCJN+vp1RPZ +ytRrJPOwPYdGWBrssd9v+1a6cGvHOMzosYxPD/fxZ3YOg9AeUY8CMD32IygmTMZg +h5Mmm7I1HrrW9zzRHM76JTymGoEVW/MSD2zuZYrJh6j5B+BimoxcSg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIF6zCCA9OgAwIBAgIIVrYpzTS8ePYwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNV +BAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UE +CgwPU1NMIENvcnBvcmF0aW9uMTcwNQYDVQQDDC5TU0wuY29tIEVWIFJvb3QgQ2Vy +dGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIyMB4XDTE3MDUzMTE4MTQzN1oXDTQy +MDUzMDE4MTQzN1owgYIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4G +A1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTcwNQYDVQQD +DC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIy +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjzZlQOHWTcDXtOlG2mvq +M0fNTPl9fb69LT3w23jhhqXZuglXaO1XPqDQCEGD5yhBJB/jchXQARr7XnAjssuf +OePPxU7Gkm0mxnu7s9onnQqG6YE3Bf7wcXHswxzpY6IXFJ3vG2fThVUCAtZJycxa +4bH3bzKfydQ7iEGonL3Lq9ttewkfokxykNorCPzPPFTOZw+oz12WGQvE43LrrdF9 +HSfvkusQv1vrO6/PgN3B0pYEW3p+pKk8OHakYo6gOV7qd89dAFmPZiw+B6KjBSYR +aZfqhbcPlgtLyEDhULouisv3D5oi53+aNxPN8k0TayHRwMwi8qFG9kRpnMphNQcA +b9ZhCBHqurj26bNg5U257J8UZslXWNvNh2n4ioYSA0e/ZhN2rHd9NCSFg83XqpyQ +Gp8hLH94t2S42Oim9HizVcuE0jLEeK6jj2HdzghTreyI/BXkmg3mnxp3zkyPuBQV +PWKchjgGAGYS5Fl2WlPAApiiECtoRHuOec4zSnaqW4EWG7WK2NAAe15itAnWhmMO +pgWVSbooi4iTsjQc2KRVbrcc0N6ZVTsj9CLg+SlmJuwgUHfbSguPvuUCYHBBXtSu +UDkiFCbLsjtzdFVHB3mBOagwE0TlBIqulhMlQg+5U8Sb/M3kHN48+qvWBkofZ6aY +MBzdLNvcGJVXZsb/XItW9XcCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNV +HSMEGDAWgBT5YLvU49U09rj1BoAlp3PbRmmonjAdBgNVHQ4EFgQU+WC71OPVNPa4 +9QaAJadz20ZpqJ4wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBW +s47LCp1Jjr+kxJG7ZhcFUZh1++VQLHqe8RT6q9OKPv+RKY9ji9i0qVQBDb6Thi/5 +Sm3HXvVX+cpVHBK+Rw82xd9qt9t1wkclf7nxY/hoLVUE0fKNsKTPvDxeH3jnpaAg +cLAExbf3cqfeIg29MyVGjGSSJuM+LmOW2puMPfgYCdcDzH2GguDKBAdRUNf/ktUM +79qGn5nX67evaOI5JpS6aLe/g9Pqemc9YmeuJeVy6OLk7K4S9ksrPJ/psEDzOFSz +/bdoyNrGj1E8svuR3Bznm53htw1yj+KkxKl4+esUrMZDBcJlOSgYAsOCsp0FvmXt +ll9ldDz7CTUue5wT/RsPXcdtgTpWD8w74a8CLyKsRspGPKAcTNZEtF4uXBVmCeEm +Kf7GUmG6sXP/wwyc5WxqlD8UykAWlYTzWamsX0xhk23RO8yilQwipmdnRC652dKK +QbNmC1r7fSOl8hqw/96bg5Qu0T/fkreRrwU7ZcegbLHNYhLDkBvjJc40vG93drEQ +w/cFGsDWr3RiSBd3kmmQYRzelYB0VI8YHMPzA9C/pEN1hlMYegouCRw2n5H9gooi +S9EOUCXdywMMF8mDAAhONU2Ki+3wApRmLER/y5UnlhetCTCstnEXbosX9hwJ1C07 +mKVx01QT2WDz9UtmT/rx7iASjbSsV7FFY6GsdqnC+w== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICjTCCAhSgAwIBAgIIdebfy8FoW6gwCgYIKoZIzj0EAwIwfDELMAkGA1UEBhMC +VVMxDjAMBgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9T +U0wgQ29ycG9yYXRpb24xMTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0 +aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYwMjEyMTgxNDAzWhcNNDEwMjEyMTgxNDAz +WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0 +b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNvbSBS +b290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuB +BAAiA2IABEVuqVDEpiM2nl8ojRfLliJkP9x6jh3MCLOicSS6jkm5BBtHllirLZXI +7Z4INcgn64mMU1jrYor+8FsPazFSY0E7ic3s7LaNGdM0B9y7xgZ/wkWV7Mt/qCPg +CemB+vNH06NjMGEwHQYDVR0OBBYEFILRhXMw5zUE044CkvvlpNHEIejNMA8GA1Ud +EwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUgtGFczDnNQTTjgKS++Wk0cQh6M0wDgYD +VR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2cAMGQCMG/n61kRpGDPYbCWe+0F+S8T +kdzt5fxQaxFGRrMcIQBiu77D5+jNB5n5DQtdcj7EqgIwH7y6C+IwJPt8bYBVCpk+ +gA0z5Wajs6O7pdWLjwkspl1+4vAHCGht0nxpbl/f5Wpl +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIF3TCCA8WgAwIBAgIIeyyb0xaAMpkwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UE +BhMCVVMxDjAMBgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQK +DA9TU0wgQ29ycG9yYXRpb24xMTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZp +Y2F0aW9uIEF1dGhvcml0eSBSU0EwHhcNMTYwMjEyMTczOTM5WhcNNDEwMjEyMTcz +OTM5WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hv +dXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNv +bSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQTCCAiIwDQYJKoZIhvcN +AQEBBQADggIPADCCAgoCggIBAPkP3aMrfcvQKv7sZ4Wm5y4bunfh4/WvpOz6Sl2R +xFdHaxh3a3by/ZPkPQ/CFp4LZsNWlJ4Xg4XOVu/yFv0AYvUiCVToZRdOQbngT0aX +qhvIuG5iXmmxX9sqAn78bMrzQdjt0Oj8P2FI7bADFB0QDksZ4LtO7IZl/zbzXmcC +C52GVWH9ejjt/uIZALdvoVBidXQ8oPrIJZK0bnoix/geoeOy3ZExqysdBP+lSgQ3 +6YWkMyv94tZVNHwZpEpox7Ko07fKoZOI68GXvIz5HdkihCR0xwQ9aqkpk8zruFvh +/l8lqjRYyMEjVJ0bmBHDOJx+PYZspQ9AhnwC9FwCTyjLrnGfDzrIM/4RJTXq/LrF +YD3ZfBjVsqnTdXgDciLKOsMf7yzlLqn6niy2UUb9rwPW6mBo6oUWNmuF6R7As93E +JNyAKoFBbZQ+yODJgUEAnl6/f8UImKIYLEJAs/lvOCdLToD0PYFH4Ih86hzOtXVc +US4cK38acijnALXRdMbX5J+tB5O2UzU1/Dfkw/ZdFr4hc96SCvigY2q8lpJqPvi8 +ZVWb3vUNiSYE/CUapiVpy8JtynziWV+XrOvvLsi81xtZPCvM8hnIk2snYxnP/Okm ++Mpxm3+T/jRnhE6Z6/yzeAkzcLpmpnbtG3PrGqUNxCITIJRWCk4sbE6x/c+cCbqi +M+2HAgMBAAGjYzBhMB0GA1UdDgQWBBTdBAkHovV6fVJTEpKV7jiAJQ2mWTAPBgNV +HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFN0ECQei9Xp9UlMSkpXuOIAlDaZZMA4G +A1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAIBgRlCn7Jp0cHh5wYfGV +cpNxJK1ok1iOMq8bs3AD/CUrdIWQPXhq9LmLpZc7tRiRux6n+UBbkflVma8eEdBc +Hadm47GUBwwyOabqG7B52B2ccETjit3E+ZUfijhDPwGFpUenPUayvOUiaPd7nNgs +PgohyC0zrL/FgZkxdMF1ccW+sfAjRfSda/wZY52jvATGGAslu1OJD7OAUN5F7kR/ +q5R4ZJjT9ijdh9hwZXT7DrkT66cPYakylszeu+1jTBi7qUD3oFRuIIhxdRjqerQ0 +cuAjJ3dctpDqhiVAq+8zD8ufgr6iIPv2tS0a5sKFsXQP+8hlAqRSAUfdSSLBv9jr +a6x+3uxjMxW3IwiPxg+NQVrdjsW5j+VFP3jbutIbQLH+cU0/4IGiul607BXgk90I +H37hVZkLId6Tngr75qNJvTYw/ud3sqB1l7UtgYgXZSD32pAAn8lSzDLKNXz1PQ/Y +K9f1JmzJBjSWFupwWRoyeXkLtoh/D1JIPb9s2KJELtFOt3JY04kTlf5Eq/jXixtu +nLwsoFvVagCvXzfh1foQC5ichucmj87w7G6KVwuA406ywKBjYZC6VWg3dGq2ktuf +oYYitmUnDuy2n0Jg5GfCtdpBC8TTi2EbvPofkSvXRAdeuims2cXp71NIWuuA8ShY +Ic2wBlX7Jz9TkHCpBB5XJ7k= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDcjCCAlqgAwIBAgIUPopdB+xV0jLVt+O2XwHrLdzk1uQwDQYJKoZIhvcNAQEL +BQAwUTELMAkGA1UEBhMCUEwxKDAmBgNVBAoMH0tyYWpvd2EgSXpiYSBSb3psaWN6 +ZW5pb3dhIFMuQS4xGDAWBgNVBAMMD1NaQUZJUiBST09UIENBMjAeFw0xNTEwMTkw +NzQzMzBaFw0zNTEwMTkwNzQzMzBaMFExCzAJBgNVBAYTAlBMMSgwJgYDVQQKDB9L +cmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRgwFgYDVQQDDA9TWkFGSVIg +Uk9PVCBDQTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3vD5QqEvN +QLXOYeeWyrSh2gwisPq1e3YAd4wLz32ohswmUeQgPYUM1ljj5/QqGJ3a0a4m7utT +3PSQ1hNKDJA8w/Ta0o4NkjrcsbH/ON7Dui1fgLkCvUqdGw+0w8LBZwPd3BucPbOw +3gAeqDRHu5rr/gsUvTaE2g0gv/pby6kWIK05YO4vdbbnl5z5Pv1+TW9NL++IDWr6 +3fE9biCloBK0TXC5ztdyO4mTp4CEHCdJckm1/zuVnsHMyAHs6A6KCpbns6aH5db5 +BSsNl0BwPLqsdVqc1U2dAgrSS5tmS0YHF2Wtn2yIANwiieDhZNRnvDF5YTy7ykHN +XGoAyDw4jlivAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD +AgEGMB0GA1UdDgQWBBQuFqlKGLXLzPVvUPMjX/hd56zwyDANBgkqhkiG9w0BAQsF +AAOCAQEAtXP4A9xZWx126aMqe5Aosk3AM0+qmrHUuOQn/6mWmc5G4G18TKI4pAZw +8PRBEew/R40/cof5O/2kbytTAOD/OblqBw7rHRz2onKQy4I9EYKL0rufKq8h5mOG +nXkZ7/e7DDWQw4rtTw/1zBLZpD67oPwglV9PJi8RI4NOdQcPv5vRtB3pEAT+ymCP +oky4rc/hkA/NrgrHXXu3UNLUYfrVFdvXn4dRVOul4+vJhaAlIDf7js4MNIThPIGy +d05DpYhfhmehPea0XGG2Ptv+tyjFogeutcrKjSoS75ftwjCkySp6+/NNIxuZMzSg +LvWpCz/UXeHPhJ/iGcJfitYgHuNztw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDEr +MCkGA1UEChMiSmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoG +A1UEAxMTU2VjdXJlU2lnbiBSb290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0 +MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSswKQYDVQQKEyJKYXBhbiBDZXJ0aWZp +Y2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1cmVTaWduIFJvb3RD +QTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvLTJsz +i1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8 +h9uuywGOwvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOV +MdrAG/LuYpmGYz+/3ZMqg6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9 +UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rPO7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni +8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitAbpSACW22s293bzUIUPsC +h8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZXt94wDgYD +VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB +AKChOBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xm +KbabfSVSSUOrTC4rbnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQ +X5Ucv+2rIrVls4W6ng+4reV6G4pQOh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWr +QbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01y8hSyn+B/tlr0/cR7SXf+Of5 +pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061lgeLKBObjBmN +QSdJQO7e5iNEOdyhIta6A/I= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBI +MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x +FzAVBgNVBAMTDlNlY3VyZVRydXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIz +MTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1NlY3VyZVRydXN0IENv +cnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQXOZEz +Zum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO +0gMdA+9tDWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIao +wW8xQmxSPmjL8xk037uHGFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj +7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b01k/unK8RCSc43Oz969XL0Imnal0ugBS +8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmHursCAwEAAaOBnTCBmjAT +BgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB +/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCeg +JYYjaHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGC +NxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt3 +6Z3q059c4EVlew3KW+JwULKUBRSuSceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/ +3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHfmbx8IVQr5Fiiu1cprp6poxkm +D5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZnMUFdAvnZyPS +CPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR +3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBK +MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x +GTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkx +MjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3Qg +Q29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jxYDiJ +iQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa +/FHtaMbQbqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJ +jnIFHovdRIWCQtBJwB1g8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnI +HmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYVHDGA76oYa8J719rO+TMg1fW9ajMtgQT7 +sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi0XPnj3pDAgMBAAGjgZ0w +gZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQF +MAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCsw +KaAnoCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsG +AQQBgjcVAQQDAgEAMA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0L +URYD7xh8yOOvaliTFGCRsoTciE6+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXO +H0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cnCDpOGR86p1hcF895P4vkp9Mm +I50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/53CYNv6ZHdAbY +iNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc +f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDEl +MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMe +U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoX +DTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRy +dXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3VyaXR5IENvbW11bmlj +YXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAV +OVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGr +zbl+dp+++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVM +VAX3NuRFg3sUZdbcDE3R3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQ +hNBqyjoGADdH5H5XTz+L62e4iKrFvlNVspHEfbmwhRkGeC7bYRr6hfVKkaHnFtWO +ojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1KEOtOghY6rCcMU/Gt1SSw +awNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8QIH4D5cs +OPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3 +DQEBCwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpF +coJxDjrSzG+ntKEju/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXc +okgfGT+Ok+vx+hfuzU7jBBJV1uXk3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8 +t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6qtnRGEmyR7jTV7JqR50S+kDFy +1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29mvVXIwAHIRc/ +SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEY +MBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21t +dW5pY2F0aW9uIFJvb3RDQTEwHhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5 +WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYD +VQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEwggEiMA0GCSqGSIb3 +DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw8yl8 +9f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJ +DKaVv0uMDPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9 +Ms+k2Y7CI9eNqPPYJayX5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/N +QV3Is00qVUarH9oe4kA92819uZKAnDfdDJZkndwi92SL32HeFZRSFaB9UslLqCHJ +xrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2JChzAgMBAAGjPzA9MB0G +A1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYwDwYDVR0T +AQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vG +kl3g0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfr +Uj94nK9NrvjVT8+amCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5 +Bw+SUEmK3TGXX8npN6o7WWWXlDLJs58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJU +JRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ6rBK+1YWc26sTfcioU+tHXot +RSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAiFL39vmwLAw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP +MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx +MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV +BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o +Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt +5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s +3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej +vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu +8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw +DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG +MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil +zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/ +3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD +FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6 +Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2 +ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJO +TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFh +dCBkZXIgTmVkZXJsYW5kZW4gRVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0y +MjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVTdGFhdCBkZXIg +TmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRlcmxhbmRlbiBFViBS +b290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkkSzrS +M4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nC +UiY4iKTWO0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3d +Z//BYY1jTw+bbRcwJu+r0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46p +rfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13l +pJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gVXJrm0w912fxBmJc+qiXb +j5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr08C+eKxC +KFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS +/ZbV0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0X +cgOPvZuM5l5Tnrmd74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH +1vI4gnPah1vlPNOePqc7nvQDs/nxfRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrP +px9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB +/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwaivsnuL8wbqg7 +MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI +eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u +2dfOWBfoqSmuc0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHS +v4ilf0X8rLiltTMMgsT7B/Zq5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTC +wPTxGfARKbalGAKb12NMcIxHowNDXLldRqANb/9Zjr7dn3LDWyvfjFvO5QxGbJKy +CqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tNf1zuacpzEPuKqf2e +vTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi5Dp6 +Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIa +Gl6I6lD4WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeL +eG9QgkRQP2YGiqtDhFZKDyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8 +FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGyeUN51q1veieQA6TqJIc/2b3Z6fJfUEkc +7uzXLg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO +TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh +dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oX +DTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl +ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv +b3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ5291 +qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8Sp +uOUfiUtnvWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPU +Z5uW6M7XxgpT0GtJlvOjCwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvE +pMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiile7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp +5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCROME4HYYEhLoaJXhena/M +UGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpICT0ugpTN +GmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy +5V6548r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv +6q012iDTiIJh8BIitrzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEK +eN5KzlW/HdXZt1bv8Hb/C3m1r737qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6 +B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMBAAGjgZcwgZQwDwYDVR0TAQH/ +BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcCARYxaHR0cDov +L3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV +HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqG +SIb3DQEBCwUAA4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLyS +CZa59sCrI2AGeYwRTlHSeYAz+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen +5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwjf/ST7ZwaUb7dRUG/kSS0H4zpX897 +IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaNkqbG9AclVMwWVxJK +gnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfkCpYL ++63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxL +vJxxcypFURmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkm +bEgeqmiSBeGCc1qb3AdbCG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvk +N1trSt8sV4pAWja63XVECDdCcAz+3F4hoKOKwJCcaNpQ5kUQR3i2TtJlycM33+FC +Y7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoVIPVVYpbtbZNQvOSqeK3Z +ywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm66+KAQ== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO +TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh +dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloX +DTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl +ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv +b3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4yolQP +cPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WW +IkYFsO2tx1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqX +xz8ecAgwoNzFs21v0IJyEavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFy +KJLZWyNtZrVtB0LrpjPOktvA9mxjeM3KTj215VKb8b475lRgsGYeCasH/lSJEULR +9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUurmkVLoR9BvUhTFXFkC4az +5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU51nus6+N8 +6U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7 +Ngzp07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHP +bMk7ccHViLVlvMDoFxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXt +BznaqB16nzaeErAMZRKQFWDZJkBE41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTt +XUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMBAAGjQjBAMA8GA1UdEwEB/wQF +MAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleuyjWcLhL75Lpd +INyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD +U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwp +LiniyMMB8jPqKqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8 +Ipf3YF3qKS9Ysr1YvY2WTxB1v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixp +gZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA8KCWAg8zxXHzniN9lLf9OtMJgwYh +/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b8KKaa8MFSu1BYBQw +0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0rmj1A +fsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq +4BZ+Extq1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR +1VmiiXTTn74eS9fGbbeIJG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/ +QFH1T/U67cjF68IeHRaVesd+QnGTbksVtzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM +94B7IWcnMFk= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzEl +MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMp +U3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQw +NjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UE +ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZp +ZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3 +DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf +8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN ++lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0 +X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aa +K4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA +1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0G +A1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fR +zt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0 +YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBD +bGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8w +DQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3 +L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56D +eruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl +xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynp +VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY +WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMx +EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT +HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVs +ZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAw +MFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6 +b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVj +aG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZp +Y2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBAL3twQP89o/8ArFvW59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMg +nLRJdzIpVv257IzdIvpy3Cdhl+72WoTsbhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1 +HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNkN3mSwOxGXn/hbVNMYq/N +Hwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7NfZTD4p7dN +dloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0 +HZbUJtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO +BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0G +CSqGSIb3DQEBCwUAA4IBAQARWfolTwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjU +sHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx4mcujJUDJi5DnUox9g61DLu3 +4jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUwF5okxBDgBPfg +8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K +pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1 +mMpYjn0q7pBZc2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMx +EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT +HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVs +ZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5 +MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNVBAYTAlVTMRAwDgYD +VQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFy +ZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2Vy +dmljZXMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20p +OsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm2 +8xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4PahHQUw2eeBGg6345AWh1K +Ts9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLPLJGmpufe +hRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk +6mFBrMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAw +DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+q +AdcwKziIorhtSpzyEZGDMA0GCSqGSIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMI +bw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPPE95Dz+I0swSdHynVv/heyNXB +ve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTyxQGjhdByPq1z +qwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd +iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn +0q23KXB56jzaYyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCN +sSi6 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV +BAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2ln +biBHb2xkIENBIC0gRzIwHhcNMDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBF +MQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMR8wHQYDVQQDExZT +d2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC +CgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUqt2/8 +76LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+ +bbqBHH5CjCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c +6bM8K8vzARO/Ws/BtQpgvd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqE +emA8atufK+ze3gE/bk3lUIbLtK/tREDFylqM2tIrfKjuvqblCqoOpd8FUrdVxyJd +MmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvRAiTysybUa9oEVeXBCsdt +MDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuendjIj3o02y +MszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69y +FGkOpeUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPi +aG59je883WX0XaxR7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxM +gI93e2CaHt+28kgeDrpOVG2Y4OGiGqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCB +qTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWyV7 +lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64OfPAeGZe6Drn +8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov +L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe6 +45R88a7A3hfm5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczO +UYrHUDFu4Up+GC9pWbY9ZIEr44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5 +O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCC +bwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yv +GPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a +77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCC +hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3 +92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp +Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w +ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt +Qc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFwTCCA6mgAwIBAgIITrIAZwwDXU8wDQYJKoZIhvcNAQEFBQAwSTELMAkGA1UE +BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEjMCEGA1UEAxMaU3dpc3NTaWdu +IFBsYXRpbnVtIENBIC0gRzIwHhcNMDYxMDI1MDgzNjAwWhcNMzYxMDI1MDgzNjAw +WjBJMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMSMwIQYDVQQD +ExpTd2lzc1NpZ24gUGxhdGludW0gQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQAD +ggIPADCCAgoCggIBAMrfogLi2vj8Bxax3mCq3pZcZB/HL37PZ/pEQtZ2Y5Wu669y +IIpFR4ZieIbWIDkm9K6j/SPnpZy1IiEZtzeTIsBQnIJ71NUERFzLtMKfkr4k2Htn +IuJpX+UFeNSH2XFwMyVTtIc7KZAoNppVRDBopIOXfw0enHb/FZ1glwCNioUD7IC+ +6ixuEFGSzH7VozPY1kneWCqv9hbrS3uQMpe5up1Y8fhXSQQeol0GcN1x2/ndi5ob +jM89o03Oy3z2u5yg+gnOI2Ky6Q0f4nIoj5+saCB9bzuohTEJfwvH6GXp43gOCWcw +izSC+13gzJ2BbWLuCB4ELE6b7P6pT1/9aXjvCR+htL/68++QHkwFix7qepF6w9fl ++zC8bBsQWJj3Gl/QKTIDE0ZNYWqFTFJ0LwYfexHihJfGmfNtf9dng34TaNhxKFrY +zt3oEBSa/m0jh26OWnA81Y0JAKeqvLAxN23IhBQeW71FYyBrS3SMvds6DsHPWhaP +pZjydomyExI7C3d3rLvlPClKknLKYRorXkzig3R3+jVIeoVNjZpTxN94ypeRSCtF +KwH3HBqi7Ri6Cr2D+m+8jVeTO9TUps4e8aCxzqv9KyiaTxvXw3LbpMS/XUz13XuW +ae5ogObnmLo2t/5u7Su9IPhlGdpVCX4l3P5hYnL5fhgC72O00Puv5TtjjGePAgMB +AAGjgawwgakwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O +BBYEFFCvzAeHFUdvOMW0ZdHelarp35zMMB8GA1UdIwQYMBaAFFCvzAeHFUdvOMW0 +ZdHelarp35zMMEYGA1UdIAQ/MD0wOwYJYIV0AVkBAQEBMC4wLAYIKwYBBQUHAgEW +IGh0dHA6Ly9yZXBvc2l0b3J5LnN3aXNzc2lnbi5jb20vMA0GCSqGSIb3DQEBBQUA +A4ICAQAIhab1Fgz8RBrBY+D5VUYI/HAcQiiWjrfFwUF1TglxeeVtlspLpYhg0DB0 +uMoI3LQwnkAHFmtllXcBrqS3NQuB2nEVqXQXOHtYyvkv+8Bldo1bAbl93oI9ZLi+ +FHSjClTTLJUYFzX1UWs/j6KWYTl4a0vlpqD4U99REJNi54Av4tHgvI42Rncz7Lj7 +jposiU0xEQ8mngS7twSNC/K5/FqdOxa3L8iYq/6KUFkuozv8KV2LwUvJ4ooTHbG/ +u0IdUt1O2BReEMYxB+9xJ/cbOQncguqLs5WGXv312l0xpuAxtpTmREl0xRbl9x8D +YSjFyMsSoEJL+WuICI20MhjzdZ/EfwBPBZWcoxcCw7NTm6ogOSkrZvqdr16zktK1 +puEa+S1BaYEUtLS17Yk9zvupnTVCRLEcFHOBzyoBNZox1S2PbYTfgE1X4z/FhHXa +icYwu+uPyyIIoK6q8QNsOktNCaUOcsZWayFCTiMlFGiudgp8DAdwZPmaL/YFOSbG +DI8Zf0NebvRbFS/bYV3mZy8/CJT5YLSYMdp08YSTcU1f+2BY0fvEwW2JorsgH51x +kcsymxM9Pn2SUjWskpSi0xjCfMfqr3YFFt1nJ8J+HAciIfNAChs0B0QTwoRqjt8Z +Wr9/6x3iGjjRXK9HkmuAtTClyY3YqzGBH9/CZjfTk6mFhnll0g== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UE +BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWdu +IFNpbHZlciBDQSAtIEcyMB4XDTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0Nlow +RzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMY +U3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A +MIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644N0Mv +Fz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7br +YT7QbNHm+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieF +nbAVlDLaYQ1HTWBCrpJH6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH +6ATK72oxh9TAtvmUcXtnZLi2kUpCe2UuMGoM9ZDulebyzYLs2aFK7PayS+VFheZt +eJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5hqAaEuSh6XzjZG6k4sIN/ +c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5FZGkECwJ +MoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRH +HTBsROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTf +jNFusB3hB48IHpmccelM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb6 +5i/4z3GcRm25xBWNOHkDRUjvxF3XCO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOB +rDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU +F6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRBtjpbO8tFnb0c +wpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0 +cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIB +AHPGgeAn0i0P4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShp +WJHckRE1qTodvBqlYJ7YH39FkWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9 +xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L3XWgwF15kIwb4FDm3jH+mHtwX6WQ +2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx/uNncqCxv1yL5PqZ +IseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFaDGi8 +aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2X +em1ZqSqPe97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQR +dAtq/gsD/KNVV4n+SsuuWxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/ +OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJDIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+ +hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ubDgEj8Z+7fNzcbBGXJbLy +tGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIF2TCCA8GgAwIBAgIQHp4o6Ejy5e/DfEoeWhhntjANBgkqhkiG9w0BAQsFADBk +MQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0 +YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3Qg +Q0EgMjAeFw0xMTA2MjQwODM4MTRaFw0zMTA2MjUwNzM4MTRaMGQxCzAJBgNVBAYT +AmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGlnaXRhbCBDZXJ0aWZp +Y2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAyMIICIjAN +BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlUJOhJ1R5tMJ6HJaI2nbeHCOFvEr +jw0DzpPMLgAIe6szjPTpQOYXTKueuEcUMncy3SgM3hhLX3af+Dk7/E6J2HzFZ++r +0rk0X2s682Q2zsKwzxNoysjL67XiPS4h3+os1OD5cJZM/2pYmLcX5BtS5X4HAB1f +2uY+lQS3aYg5oUFgJWFLlTloYhyxCwWJwDaCFCE/rtuh/bxvHGCGtlOUSbkrRsVP +ACu/obvLP+DHVxxX6NZp+MEkUp2IVd3Chy50I9AU/SpHWrumnf2U5NGKpV+GY3aF +y6//SSj8gO1MedK75MDvAe5QQQg1I3ArqRa0jG6F6bYRzzHdUyYb3y1aSgJA/MTA +tukxGggo5WDDH8SQjhBiYEQN7Aq+VRhxLKX0srwVYv8c474d2h5Xszx+zYIdkeNL +6yxSNLCK/RJOlrDrcH+eOfdmQrGrrFLadkBXeyq96G4DsguAhYidDMfCd7Camlf0 +uPoTXGiTOmekl9AbmbeGMktg2M7v0Ax/lZ9vh0+Hio5fCHyqW/xavqGRn1V9TrAL +acywlKinh/LTSlDcX3KwFnUey7QYYpqwpzmqm59m2I2mbJYV4+by+PGDYmy7Velh +k6M99bFXi08jsJvllGov34zflVEpYKELKeRcVVi3qPyZ7iVNTA6z00yPhOgpD/0Q +VAKFyPnlw4vP5w8CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0hBBYw +FDASBgdghXQBUwIBBgdghXQBUwIBMBIGA1UdEwEB/wQIMAYBAf8CAQcwHQYDVR0O +BBYEFE0mICKJS9PVpAqhb97iEoHF8TwuMB8GA1UdIwQYMBaAFE0mICKJS9PVpAqh +b97iEoHF8TwuMA0GCSqGSIb3DQEBCwUAA4ICAQAyCrKkG8t9voJXiblqf/P0wS4R +fbgZPnm3qKhyN2abGu2sEzsOv2LwnN+ee6FTSA5BesogpxcbtnjsQJHzQq0Qw1zv +/2BZf82Fo4s9SBwlAjxnffUy6S8w5X2lejjQ82YqZh6NM4OKb3xuqFp1mrjX2lhI +REeoTPpMSQpKwhI3qEAMw8jh0FcNlzKVxzqfl9NX+Ave5XLzo9v/tdhZsnPdTSpx +srpJ9csc1fV5yJmz/MFMdOO0vSk3FQQoHt5FRnDsr7p4DooqzgB53MBfGWcsa0vv +aGgLQ+OswWIJ76bdZWGgr4RVSJFSHMYlkSrQwSIjYVmvRRGFHQEkNI/Ps/8XciAT +woCqISxxOQ7Qj1zB09GOInJGTB2Wrk9xseEFKZZZ9LuedT3PDTcNYtsmjGOpI99n +Bjx8Oto0QuFmtEYE3saWmA9LSHokMnWRn6z3aOkquVVlzl1h0ydw2Df+n7mvoC5W +t6NlUe07qxS/TFED6F+KBZvuim6c779o+sjaC+NCydAXFJy3SuCvkychVSa1ZC+N +8f+mQAWFBVzKBxlcCxMoTFh/wqXvRdpg065lYZ1Tg3TCrvJcwhbtkj6EPnNgiLx2 +9CzP0H1907he0ZESEOnN3col49XtmS++dYFLJPlFRpTJKSFTnCZFqhMX5OfNeOI5 +wSsSnqaeG8XmDtkx2Q== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICqDCCAi2gAwIBAgIQIW4zpcvTiKRvKQe0JzzE2DAKBggqhkjOPQQDAzCBlDEL +MAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYD +VQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBD +bGFzcyAxIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0g +RzQwHhcNMTExMDA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBlDELMAkGA1UEBhMC +VVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1h +bnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAxIFB1 +YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcq +hkjOPQIBBgUrgQQAIgNiAATXZrUb266zYO5G6ohjdTsqlG3zXxL24w+etgoUU0hS +yNw6s8tIICYSTvqJhNTfkeQpfSgB2dsYQ2mhH7XThhbcx39nI9/fMTGDAzVwsUu3 +yBe7UcvclBfb6gk7dhLeqrWjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E +BTADAQH/MB0GA1UdDgQWBBRlwI0l9Qy6l3eQP54u4Fr1ztXh5DAKBggqhkjOPQQD +AwNpADBmAjEApa7jRlP4mDbjIvouKEkN7jB+M/PsP3FezFWJeJmssv3cHFwzjim5 +axfIEWi13IMHAjEAnMhE2mnCNsNUGRCFAtqdR+9B52wmnQk9922Q0QVEL7C8g5No +8gxFSTm/mQQc0xCg +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIID9jCCAt6gAwIBAgIQJDJ18h0v0gkz97RqytDzmDANBgkqhkiG9w0BAQsFADCB +lDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8w +HQYDVQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRl +YyBDbGFzcyAxIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5 +IC0gRzYwHhcNMTExMDE4MDAwMDAwWhcNMzcxMjAxMjM1OTU5WjCBlDELMAkGA1UE +BhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZT +eW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAx +IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzYwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHOddJZKmZgiJM6kXZBxbje/SD +6Jlz+muxNuCad6BAwoGNAcfMjL2Pffd543pMA03Z+/2HOCgs3ZqLVAjbZ/sbjP4o +ki++t7JIp4Gh2F6Iw8w5QEFa0dzl2hCfL9oBTf0uRnz5LicKaTfukaMbasxEvxvH +w9QRslBglwm9LiL1QYRmn81ApqkAgMEflZKf3vNI79sdd2H8f9/ulqRy0LY+/3gn +r8uSFWkI22MQ4uaXrG7crPaizh5HmbmJtxLmodTNWRFnw2+F2EJOKL5ZVVkElauP +N4C/DfD8HzpkMViBeNfiNfYgPym4jxZuPkjctUwH4fIa6n4KedaovetdhitNAgMB +AAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW +BBQzQejIORIVk0jyljIuWvXalF9TYDANBgkqhkiG9w0BAQsFAAOCAQEAFeNzV7EX +tl9JaUSm9l56Z6zS3nVJq/4lVcc6yUQVEG6/MWvL2QeTfxyFYwDjMhLgzMv7OWyP +4lPiPEAz2aSMR+atWPuJr+PehilWNCxFuBL6RIluLRQlKCQBZdbqUqwFblYSCT3Q +dPTXvQbKqDqNVkL6jXI+dPEDct+HG14OelWWLDi3mIXNTTNEyZSPWjEwN0ujOhKz +5zbRIWhLLTjmU64cJVYIVgNnhJ3Gw84kYsdMNs+wBkS39V8C3dlU6S+QTnrIToNA +DJqXPDe/v+z28LSFdyjBC8hnghAXOKK3Buqbvzr46SMHv3TgmDgVVXjucgBcGaP0 +0jPg/73RVDkpDw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICqDCCAi2gAwIBAgIQNBdlEkA7t1aALYDLeVWmHjAKBggqhkjOPQQDAzCBlDEL +MAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYD +VQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBD +bGFzcyAyIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0g +RzQwHhcNMTExMDA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBlDELMAkGA1UEBhMC +VVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1h +bnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAyIFB1 +YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcq +hkjOPQIBBgUrgQQAIgNiAATR2UqOTA2ESlG6fO/TzPo6mrWnYxM9AeBJPvrBR8mS +szrX/m+c95o6D/UOCgrDP8jnEhSO1dVtmCyzcTIK6yq99tdqIAtnRZzSsr9TImYJ +XdsR8/EFM1ij4rjPfM2Cm72jQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E +BTADAQH/MB0GA1UdDgQWBBQ9MvM6qQyQhPmijGkGYVQvh3L+BTAKBggqhkjOPQQD +AwNpADBmAjEAyKapr0F/tckRQhZoaUxcuCcYtpjxwH+QbYfTjEYX8D5P/OqwCMR6 +S7wIL8fip29lAjEA1lnehs5fDspU1cbQFQ78i5Ry1I4AWFPPfrFLDeVQhuuea9// +KabYR9mglhjb8kWz +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIID9jCCAt6gAwIBAgIQZIKe/DcedF38l/+XyLH/QTANBgkqhkiG9w0BAQsFADCB +lDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8w +HQYDVQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRl +YyBDbGFzcyAyIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5 +IC0gRzYwHhcNMTExMDE4MDAwMDAwWhcNMzcxMjAxMjM1OTU5WjCBlDELMAkGA1UE +BhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZT +eW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAy +IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzYwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNzOkFyGOFyz9AYxe9GPo15gRn +V2WYKaRPyVyPDzTS+NqoE2KquB5QZ3iwFkygOakVeq7t0qLA8JA3KRgmXOgNPLZs +ST/B4NzZS7YUGQum05bh1gnjGSYc+R9lS/kaQxwAg9bQqkmi1NvmYji6UBRDbfkx ++FYW2TgCkc/rbN27OU6Z4TBnRfHU8I3D3/7yOAchfQBeVkSz5GC9kSucq1sEcg+y +KNlyqwUgQiWpWwNqIBDMMfAr2jUs0Pual07wgksr2F82owstr2MNHSV/oW5cYqGN +KD6h/Bwg+AEvulWaEbAZ0shQeWsOagXXqgQ2sqPy4V93p3ec5R7c6d9qwWVdAgMB +AAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW +BBSHjCCVyJhK0daABkqQNETfHE2/sDANBgkqhkiG9w0BAQsFAAOCAQEAgY6ypWaW +tyGltu9vI1pf24HFQqV4wWn99DzX+VxrcHIa/FqXTQCAiIiCisNxDY7FiZss7Y0L +0nJU9X3UXENX6fOupQIR9nYrgVfdfdp0MP1UR/bgFm6mtApI5ud1Bw8pGTnOefS2 +bMVfmdUfS/rfbSw8DVSAcPCIC4DPxmiiuB1w2XaM/O6lyc+tHc+ZJVdaYkXLFmu9 +Sc2lo4xpeSWuuExsi0BmSxY/zwIa3eFsawdhanYVKZl/G92IgMG/tY9zxaaWI4Sm +KIYkM2oBLldzJbZev4/mHWGoQClnHYebHX+bn5nNMdZUvmK7OaxoEkiRIKXLsd3+ +b/xa5IJVWa8xqQ== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUx +KzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAd +BgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNl +YyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgxMDAxMTA0MDE0WhcNMzMxMDAxMjM1 +OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnBy +aXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50 +ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0G +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUd +AqSzm1nzHoqvNK38DcLZSBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiC +FoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/FvudocP05l03Sx5iRUKrERLMjfTlH6VJi +1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx9702cu+fjOlbpSD8DT6Iavq +jnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGVWOHAD3bZ +wI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGj +QjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/ +WSA2AHmgoCJrjNXyYdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhy +NsZt+U2e+iKo4YFWz827n+qrkRk4r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPAC +uvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNfvNoBYimipidx5joifsFvHZVw +IEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR3p1m0IvVVGb6 +g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN +9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlP +BSeOE6Fuwg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUx +KzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAd +BgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNl +YyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgxMDAxMTAyOTU2WhcNMzMxMDAxMjM1 +OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnBy +aXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50 +ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0G +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN +8ELg63iIVl6bmlQdTQyK9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/ +RLyTPWGrTs0NvvAgJ1gORH8EGoel15YUNpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4 +hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZFiP0Zf3WHHx+xGwpzJFu5 +ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W0eDrXltM +EnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGj +QjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1 +A/d2O2GCahKqGFPrAyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOy +WL6ukK2YJ5f+AbGwUgC4TeQbIXQbfsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ +1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzTucpH9sry9uetuUg/vBa3wW30 +6gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7hP0HHRwA11fXT +91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml +e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4p +TpPDpFQUWw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjEL +MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV +BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0 +Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYwMTEyMTQ0MTU3WhcNMjUxMjMxMjI1 +OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i +SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UEAxMc +VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD +ggEPADCCAQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJW +Ht4bNwcwIi9v8Qbxq63WyKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+Q +Vl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo6SI7dYnWRBpl8huXJh0obazovVkdKyT2 +1oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZuV3bOx4a+9P/FRQI2Alq +ukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk2ZyqBwi1 +Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1Ud +EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NX +XAek0CSnwPIA1DCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy +dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6 +Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz +JTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290 +Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u +TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlN +irTzwppVMXzEO2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8 +TtXqluJucsG7Kv5sbviRmEb8yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6 +g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9IJqDnxrcOfHFcqMRA/07QlIp2+gB +95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal092Y+tTmBvTwtiBj +S+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc5A== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEYzCCA0ugAwIBAgIBATANBgkqhkiG9w0BAQsFADCB0jELMAkGA1UEBhMCVFIx +GDAWBgNVBAcTD0dlYnplIC0gS29jYWVsaTFCMEAGA1UEChM5VHVya2l5ZSBCaWxp +bXNlbCB2ZSBUZWtub2xvamlrIEFyYXN0aXJtYSBLdXJ1bXUgLSBUVUJJVEFLMS0w +KwYDVQQLEyRLYW11IFNlcnRpZmlrYXN5b24gTWVya2V6aSAtIEthbXUgU00xNjA0 +BgNVBAMTLVRVQklUQUsgS2FtdSBTTSBTU0wgS29rIFNlcnRpZmlrYXNpIC0gU3Vy +dW0gMTAeFw0xMzExMjUwODI1NTVaFw00MzEwMjUwODI1NTVaMIHSMQswCQYDVQQG +EwJUUjEYMBYGA1UEBxMPR2ViemUgLSBLb2NhZWxpMUIwQAYDVQQKEzlUdXJraXll +IEJpbGltc2VsIHZlIFRla25vbG9qaWsgQXJhc3Rpcm1hIEt1cnVtdSAtIFRVQklU +QUsxLTArBgNVBAsTJEthbXUgU2VydGlmaWthc3lvbiBNZXJrZXppIC0gS2FtdSBT +TTE2MDQGA1UEAxMtVFVCSVRBSyBLYW11IFNNIFNTTCBLb2sgU2VydGlmaWthc2kg +LSBTdXJ1bSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3UwM6q7 +a9OZLBI3hNmNe5eA027n/5tQlT6QlVZC1xl8JoSNkvoBHToP4mQ4t4y86Ij5iySr +LqP1N+RAjhgleYN1Hzv/bKjFxlb4tO2KRKOrbEz8HdDc72i9z+SqzvBV96I01INr +N3wcwv61A+xXzry0tcXtAA9TNypN9E8Mg/uGz8v+jE69h/mniyFXnHrfA2eJLJ2X +YacQuFWQfw4tJzh03+f92k4S400VIgLI4OD8D62K18lUUMw7D8oWgITQUVbDjlZ/ +iSIzL+aFCr2lqBs23tPcLG07xxO9WSMs5uWk99gL7eqQQESolbuT1dCANLZGeA4f +AJNG4e7p+exPFwIDAQABo0IwQDAdBgNVHQ4EFgQUZT/HiobGPN08VFw1+DrtUgxH +V8gwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL +BQADggEBACo/4fEyjq7hmFxLXs9rHmoJ0iKpEsdeV31zVmSAhHqT5Am5EM2fKifh +AHe+SMg1qIGf5LgsyX8OsNJLN13qudULXjS99HMpw+0mFZx+CFOKWI3QSyjfwbPf +IPP54+M638yclNhOT8NrF7f3cuitZjO1JVOr4PhMqZ398g26rrnZqsZr+ZO7rqu4 +lzwDGrpDxpa5RXI4s6ehlj2Re37AIVNMh+3yC1SVUZPVIqUNivGTDj5UDrDYyU7c +8jEyVupk+eq1nRZmQnLzf9OxMUP8pI4X8W0jq5Rm+K37DwhuJi1/FwcJsoz7UMCf +lo3Ptv0AnVoUmr8CRPXBwp8iXqIPoeM= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcx +EjAQBgNVBAoTCVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMT +VFdDQSBHbG9iYWwgUm9vdCBDQTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5 +NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQKEwlUQUlXQU4tQ0ExEDAOBgNVBAsT +B1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3QgQ0EwggIiMA0GCSqG +SIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2CnJfF +10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz +0ALfUPZVr2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfCh +MBwqoJimFb3u/Rk28OKRQ4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbH +zIh1HrtsBv+baz4X7GGqcXzGHaL3SekVtTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc +46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1WKKD+u4ZqyPpcC1jcxkt2 +yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99sy2sbZCi +laLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYP +oA/pyJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQA +BDzfuBSO6N+pjWxnkjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcE +qYSjMq+u7msXi7Kx/mzhkIyIqJdIzshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm +4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB +/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6gcFGn90xHNcgL +1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn +LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WF +H6vPNOw/KP4M8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNo +RI2T9GRwoD2dKAXDOXC4Ynsg/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+ +nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlglPx4mI88k1HtQJAH32RjJMtOcQWh +15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryPA9gK8kxkRr05YuWW +6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3mi4TW +nsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5j +wa19hAM8EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWz +aGHQRiapIVJpLesux+t3zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmy +KwbQBM0= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzES +MBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFU +V0NBIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMz +WhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJVEFJV0FO +LUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlm +aWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFE +AcK0HMMxQhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HH +K3XLfJ+utdGdIzdjp9xCoi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeX +RfwZVzsrb+RH9JlF/h3x+JejiB03HFyP4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/z +rX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1ry+UPizgN7gr8/g+YnzAx +3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV +HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkq +hkiG9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeC +MErJk/9q56YAf4lCmtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdls +XebQ79NqZp4VKIV66IIArB6nCWlWQtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62D +lhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVYT0bf+215WfKEIlKuD8z7fDvn +aspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocnyYh0igzyXxfkZ +YiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/ +MQswCQYDVQQGEwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5MB4XDTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1ow +PzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dvdmVybm1lbnQgUm9vdCBDZXJ0aWZp +Y2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB +AJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qNw8XR +IePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1q +gQdW8or5BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKy +yhwOeYHWtXBiCAEuTk8O1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAts +F/tnyMKtsc2AtJfcdgEWFelq16TheEfOhtX7MfP6Mb40qij7cEwdScevLJ1tZqa2 +jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wovJ5pGfaENda1UhhXcSTvx +ls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7Q3hub/FC +VGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHK +YS1tB6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoH +EgKXTiCQ8P8NHuJBO9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThN +Xo+EHWbNxWCWtFJaBYmOlXqYwZE8lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1Ud +DgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNVHRMEBTADAQH/MDkGBGcqBwAE +MTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg209yewDL7MTqK +UWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ +TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyf +qzvS/3WXy6TjZwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaK +ZEk9GhiHkASfQlK3T8v+R0F2Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFE +JPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlUD7gsL0u8qV1bYH+Mh6XgUmMqvtg7 +hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6QzDxARvBMB1uUO07+1 +EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+HbkZ6Mm +nD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WX +udpVBrkk7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44Vbnz +ssQwmSNOXfJIoRIM3BKQCZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDe +LMDDav7v3Aun+kbfYNucpllQdSNpc5Oy+fwC00fmcc4QAu4njIT/rEUNE1yDMuAl +pYYsfPQS +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAw +NzEUMBIGA1UECgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJv +b3QgQ0EgdjEwHhcNMDcxMDE4MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYD +VQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwWVGVsaWFTb25lcmEgUm9vdCBDQSB2 +MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+6yfwIaPzaSZVfp3F +VRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA3GV1 +7CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+X +Z75Ljo1kB1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+ +/jXh7VB7qTCNGdMJjmhnXb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs +81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxHoLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkm +dtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3F0fUTPHSiXk+TT2YqGHe +Oh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJoWjiUIMu +sDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4 +pgd7gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fs +slESl1MpWtTwEhDcTwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQ +arMCpgKIv7NHfirZ1fpoeDVNAgMBAAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYD +VR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qWDNXr+nuqF+gTEjANBgkqhkiG +9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNmzqjMDfz1mgbl +dxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx +0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1Tj +TQpgcmLNkQfWpb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBed +Y2gea+zDTYa4EzAvXUYNR0PVG6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7 +Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpcc41teyWRyu5FrgZLAMzTsVlQ2jqI +OylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOTJsjrDNYmiLbAJM+7 +vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2qReW +t88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcn +HL/EVlP6Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVx +SK236thZiNSQvxaz2emsWWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEIDCCAwigAwIBAgIJAISCLF8cYtBAMA0GCSqGSIb3DQEBCwUAMIGcMQswCQYD +VQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEk +MCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5U +cnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDlRydXN0Q29y +IEVDQS0xMB4XDTE2MDIwNDEyMzIzM1oXDTI5MTIzMTE3MjgwN1owgZwxCzAJBgNV +BAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5MSQw +IgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRy +dXN0Q29yIENlcnRpZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOVHJ1c3RDb3Ig +RUNBLTEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPj+ARtZ+odnbb +3w9U73NjKYKtR8aja+3+XzP4Q1HpGjORMRegdMTUpwHmspI+ap3tDvl0mEDTPwOA +BoJA6LHip1GnHYMma6ve+heRK9jGrB6xnhkB1Zem6g23xFUfJ3zSCNV2HykVh0A5 +3ThFEXXQmqc04L/NyFIduUd+Dbi7xgz2c1cWWn5DkR9VOsZtRASqnKmcp0yJF4Ou +owReUoCLHhIlERnXDH19MURB6tuvsBzvgdAsxZohmz3tQjtQJvLsznFhBmIhVE5/ +wZ0+fyCMgMsq2JdiyIMzkX2woloPV+g7zPIlstR8L+xNxqE6FXrntl019fZISjZF +ZtS6mFjBAgMBAAGjYzBhMB0GA1UdDgQWBBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAf +BgNVHSMEGDAWgBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAPBgNVHRMBAf8EBTADAQH/ +MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEABT41XBVwm8nHc2Fv +civUwo/yQ10CzsSUuZQRg2dd4mdsdXa/uwyqNsatR5Nj3B5+1t4u/ukZMjgDfxT2 +AHMsWbEhBuH7rBiVDKP/mZb3Kyeb1STMHd3BOuCYRLDE5D53sXOpZCz2HAF8P11F +hcCF5yWPldwX8zyfGm6wyuMdKulMY/okYWLW2n62HGz1Ah3UKt1VkOsqEUc8Ll50 +soIipX1TH0XsJ5F95yIW6MBoNtjG8U+ARDL54dHRHareqKucBK+tIA5kmE2la8BI +WJZpTdwHjFGTot+fDz2LYLSCjaoITmJF4PkL0uDgPFveXHEnJcLmA4GLEFPjx1Wi +tJ/X5g== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEMDCCAxigAwIBAgIJANqb7HHzA7AZMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYD +VQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEk +MCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5U +cnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgNVBAMMFlRydXN0Q29y +IFJvb3RDZXJ0IENBLTEwHhcNMTYwMjA0MTIzMjE2WhcNMjkxMjMxMTcyMzE2WjCB +pDELMAkGA1UEBhMCUEExDzANBgNVBAgMBlBhbmFtYTEUMBIGA1UEBwwLUGFuYW1h +IENpdHkxJDAiBgNVBAoMG1RydXN0Q29yIFN5c3RlbXMgUy4gZGUgUi5MLjEnMCUG +A1UECwweVHJ1c3RDb3IgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR8wHQYDVQQDDBZU +cnVzdENvciBSb290Q2VydCBDQS0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB +CgKCAQEAv463leLCJhJrMxnHQFgKq1mqjQCj/IDHUHuO1CAmujIS2CNUSSUQIpid +RtLByZ5OGy4sDjjzGiVoHKZaBeYei0i/mJZ0PmnK6bV4pQa81QBeCQryJ3pS/C3V +seq0iWEk8xoT26nPUu0MJLq5nux+AHT6k61sKZKuUbS701e/s/OojZz0JEsq1pme +9J7+wH5COucLlVPat2gOkEz7cD+PSiyU8ybdY2mplNgQTsVHCJCZGxdNuWxu72CV +EY4hgLW9oHPY0LJ3xEXqWib7ZnZ2+AYfYW0PVcWDtxBWcgYHpfOxGgMFZA6dWorW +hnAbJN7+KIor0Gqw/Hqi3LJ5DotlDwIDAQABo2MwYTAdBgNVHQ4EFgQU7mtJPHo/ +DeOxCbeKyKsZn3MzUOcwHwYDVR0jBBgwFoAU7mtJPHo/DeOxCbeKyKsZn3MzUOcw +DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQAD +ggEBACUY1JGPE+6PHh0RU9otRCkZoB5rMZ5NDp6tPVxBb5UrJKF5mDo4Nvu7Zp5I +/5CQ7z3UuJu0h3U/IJvOcs+hVcFNZKIZBqEHMwwLKeXx6quj7LUKdJDHfXLy11yf +ke+Ri7fc7Waiz45mO7yfOgLgJ90WmMCV1Aqk5IGadZQ1nJBfiDcGrVmVCrDRZ9MZ +yonnMlo2HD6CqFqTvsbQZJG2z9m2GM/bftJlo6bEjhcxwft+dtvTheNYsnd6djts +L1Ac59v2Z3kf9YKVmgenFK+P3CghZwnS1k1aHBkcjndcw5QkPTJrS37UeJSDvjdN +zl/HHk484IkzlQsPpTLWPFp5LBk= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIGLzCCBBegAwIBAgIIJaHfyjPLWQIwDQYJKoZIhvcNAQELBQAwgaQxCzAJBgNV +BAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5MSQw +IgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRy +dXN0Q29yIENlcnRpZmljYXRlIEF1dGhvcml0eTEfMB0GA1UEAwwWVHJ1c3RDb3Ig +Um9vdENlcnQgQ0EtMjAeFw0xNjAyMDQxMjMyMjNaFw0zNDEyMzExNzI2MzlaMIGk +MQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEg +Q2l0eTEkMCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYD +VQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgNVBAMMFlRy +dXN0Q29yIFJvb3RDZXJ0IENBLTIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK +AoICAQCnIG7CKqJiJJWQdsg4foDSq8GbZQWU9MEKENUCrO2fk8eHyLAnK0IMPQo+ +QVqedd2NyuCb7GgypGmSaIwLgQ5WoD4a3SwlFIIvl9NkRvRUqdw6VC0xK5mC8tkq +1+9xALgxpL56JAfDQiDyitSSBBtlVkxs1Pu2YVpHI7TYabS3OtB0PAx1oYxOdqHp +2yqlO/rOsP9+aij9JxzIsekp8VduZLTQwRVtDr4uDkbIXvRR/u8OYzo7cbrPb1nK +DOObXUm4TOJXsZiKQlecdu/vvdFoqNL0Cbt3Nb4lggjEFixEIFapRBF37120Hape +az6LMvYHL1cEksr1/p3C6eizjkxLAjHZ5DxIgif3GIJ2SDpxsROhOdUuxTTCHWKF +3wP+TfSvPd9cW436cOGlfifHhi5qjxLGhF5DUVCcGZt45vz27Ud+ez1m7xMTiF88 +oWP7+ayHNZ/zgp6kPwqcMWmLmaSISo5uZk3vFsQPeSghYA2FFn3XVDjxklb9tTNM +g9zXEJ9L/cb4Qr26fHMC4P99zVvh1Kxhe1fVSntb1IVYJ12/+CtgrKAmrhQhJ8Z3 +mjOAPF5GP/fDsaOGM8boXg25NSyqRsGFAnWAoOsk+xWq5Gd/bnc/9ASKL3x74xdh +8N0JqSDIvgmk0H5Ew7IwSjiqqewYmgeCK9u4nBit2uBGF6zPXQIDAQABo2MwYTAd +BgNVHQ4EFgQU2f4hQG6UnrybPZx9mCAZ5YwwYrIwHwYDVR0jBBgwFoAU2f4hQG6U +nrybPZx9mCAZ5YwwYrIwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYw +DQYJKoZIhvcNAQELBQADggIBAJ5Fngw7tu/hOsh80QA9z+LqBrWyOrsGS2h60COX +dKcs8AjYeVrXWoSK2BKaG9l9XE1wxaX5q+WjiYndAfrs3fnpkpfbsEZC89NiqpX+ +MWcUaViQCqoL7jcjx1BRtPV+nuN79+TMQjItSQzL/0kMmx40/W5ulop5A7Zv2wnL +/V9lFDfhOPXzYRZY5LVtDQsEGz9QLX+zx3oaFoBg+Iof6Rsqxvm6ARppv9JYx1RX +CI/hOWB3S6xZhBqI8d3LT3jX5+EzLfzuQfogsL7L9ziUwOHQhQ+77Sxzq+3+knYa +ZH9bDTMJBzN7Bj8RpFxwPIXAz+OQqIN3+tvmxYxoZxBnpVIt8MSZj3+/0WvitUfW +2dCFmU2Umw9Lje4AWkcdEQOsQRivh7dvDDqPys/cA8GiCcjl/YBeyGBCARsaU1q7 +N6a3vLqE6R5sGtRk2tRD/pOLS/IseRYQ1JMLiI+h2IYURpFHmygk71dSTlxCnKr3 +Sewn6EAes6aJInKc9Q0ztFijMDvd1GpUk74aTfOTlPf8hAs/hCBcNANExdqtvArB +As8e5ZTZ845b2EzwnexhF7sUMlQMAimTHpKG9n/v55IFDlndmQguLvqcAFLTxWYp +5KeXRKQOKIETNcX2b2TmQcTVL8w0RSXPQQCWPUouwpaYT05KnJe32x+SMsj/D1Fu +1uwJ +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBF +MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQL +ExNUcnVzdGlzIEZQUyBSb290IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTEx +MzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNVBAoTD1RydXN0aXMgTGltaXRlZDEc +MBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQAD +ggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQRUN+ +AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihH +iTHcDnlkH5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjj +vSkCqPoc4Vu5g6hBSLwacY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA +0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zto3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlB +OrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEAAaNTMFEwDwYDVR0TAQH/ +BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAdBgNVHQ4E +FgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01 +GX2cGE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmW +zaD+vkAMXBJV+JOCyinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP4 +1BIy+Q7DsdwyhEQsb8tGD+pmQQ9P8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZE +f1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHVl/9D7S3B2l0pKoU/rGXuhg8F +jZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYliB6XzCGcKQEN +ZetX2fNXlrtIzYE= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEJzCCAw+gAwIBAgIHAI4X/iQggTANBgkqhkiG9w0BAQsFADCBsTELMAkGA1UE +BhMCVFIxDzANBgNVBAcMBkFua2FyYTFNMEsGA1UECgxEVMOcUktUUlVTVCBCaWxn +aSDEsGxldGnFn2ltIHZlIEJpbGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkg +QS7Fni4xQjBABgNVBAMMOVTDnFJLVFJVU1QgRWxla3Ryb25payBTZXJ0aWZpa2Eg +SGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSBINTAeFw0xMzA0MzAwODA3MDFaFw0yMzA0 +MjgwODA3MDFaMIGxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMU0wSwYD +VQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8 +dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBF +bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg1MIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApCUZ4WWe60ghUEoI5RHwWrom +/4NZzkQqL/7hzmAD/I0Dpe3/a6i6zDQGn1k19uwsu537jVJp45wnEFPzpALFp/kR +Gml1bsMdi9GYjZOHp3GXDSHHmflS0yxjXVW86B8BSLlg/kJK9siArs1mep5Fimh3 +4khon6La8eHBEJ/rPCmBp+EyCNSgBbGM+42WAA4+Jd9ThiI7/PS98wl+d+yG6w8z +5UNP9FR1bSmZLmZaQ9/LXMrI5Tjxfjs1nQ/0xVqhzPMggCTTV+wVunUlm+hkS7M0 +hO8EuPbJbKoCPrZV4jI3X/xml1/N1p7HIL9Nxqw/dV8c7TKcfGkAaZHjIxhT6QID +AQABo0IwQDAdBgNVHQ4EFgQUVpkHHtOsDGlktAxQR95DLL4gwPswDgYDVR0PAQH/ +BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJ5FdnsX +SDLyOIspve6WSk6BGLFRRyDN0GSxDsnZAdkJzsiZ3GglE9Rc8qPoBP5yCccLqh0l +VX6Wmle3usURehnmp349hQ71+S4pL+f5bFgWV1Al9j4uPqrtd3GqqpmWRgqujuwq +URawXs3qZwQcWDD1YIq9pr1N5Za0/EKJAWv2cMhQOQwt1WbZyNKzMrcbGW3LM/nf +peYVhDfwwvJllpKQd/Ct9JDpEXjXk4nAPQu6KfTomZ1yju2dL+6SfaHx/126M2CF +Yv4HAqGEVka+lgqaE9chTLd8B59OTj+RdPsnnRHM3eaxynFNExc5JsUpISuTKWqW ++qtB4Uu2NQvAmxU= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNl +eSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMT +JVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAwMjAx +MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgT +Ck5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVUaGUg +VVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlm +aWNhdGlvbiBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqflo +I+d61SRvU8Za2EurxtW20eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinng +o4N+LZfQYcTxmdwlkWOrfzCjtHDix6EznPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0G +A1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNVHQ8BAf8EBAMCAQYwDwYD +VR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBBHU6+4WMB +zzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbW +RNZu9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCB +iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl +cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV +BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAw +MjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMCVVMxEzARBgNV +BAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU +aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2Vy +dGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK +AoICAQCAEmUXNg7D2wiz0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B +3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2jY0K2dvKpOyuR+OJv0OwWIJAJPuLodMkY +tJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFnRghRy4YUVD+8M/5+bJz/ +Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O+T23LLb2 +VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT +79uq/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6 +c0Plfg6lZrEpfDKEY1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmT +Yo61Zs8liM2EuLE/pDkP2QKe6xJMlXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97l +c6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8yexDJtC/QV9AqURE9JnnV4ee +UB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+eLf8ZxXhyVeE +Hg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd +BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8G +A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPF +Up/L+M+ZBn8b2kMVn54CVVeWFPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KO +VWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ7l8wXEskEVX/JJpuXior7gtNn3/3 +ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQEg9zKC7F4iRO/Fjs +8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM8WcR +iQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYze +Sf7dNXGiFSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZ +XHlKYC6SQK5MNyosycdiyA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/ +qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9cJ2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRB +VXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGwsAvgnEzDHNb842m1R0aB +L6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gxQ+6IHdfG +jjxDah2nGN59PRbxYvnKkKj9 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEojCCA4qgAwIBAgIQRL4Mi1AAJLQR0zYlJWfJiTANBgkqhkiG9w0BAQUFADCB +rjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug +Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho +dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xNjA0BgNVBAMTLVVUTi1VU0VSRmlyc3Qt +Q2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBFbWFpbDAeFw05OTA3MDkxNzI4NTBa +Fw0xOTA3MDkxNzM2NThaMIGuMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAV +BgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5l +dHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTE2MDQGA1UE +AxMtVVROLVVTRVJGaXJzdC1DbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWls +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsjmFpPJ9q0E7YkY3rs3B +YHW8OWX5ShpHornMSMxqmNVNNRm5pELlzkniii8efNIxB8dOtINknS4p1aJkxIW9 +hVE1eaROaJB7HHqkkqgX8pgV8pPMyaQylbsMTzC9mKALi+VuG6JG+ni8om+rWV6l +L8/K2m2qL+usobNqqrcuZzWLeeEeaYji5kbNoKXqvgvOdjp6Dpvq/NonWz1zHyLm +SGHGTPNpsaguG7bUMSAsvIKKjqQOpdeJQ/wWWq8dcdcRWdq6hw2v+vPhwvCkxWeM +1tZUOt4KpLoDd7NlyP0e03RiqhjKaJMeoYV+9Udly/hNVyh00jT/MLbu9mIwFIws +6wIDAQABo4G5MIG2MAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud +DgQWBBSJgmd9xJ0mcABLtFBIfN49rgRufTBYBgNVHR8EUTBPME2gS6BJhkdodHRw +Oi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLVVTRVJGaXJzdC1DbGllbnRBdXRoZW50 +aWNhdGlvbmFuZEVtYWlsLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH +AwQwDQYJKoZIhvcNAQEFBQADggEBALFtYV2mGn98q0rkMPxTbyUkxsrt4jFcKw7u +7mFVbwQ+zznexRtJlOTrIEy05p5QLnLZjfWqo7NK2lYcYJeA3IKirUq9iiv/Cwm0 +xtcgBEXkzYABurorbs6q15L+5K/r9CYdFip/bDCVNy8zEqx/3cfREYxRmLLQo5HQ +rfafnoOTHh1CuEava2bwm3/q4wMC5QJRwarVNZ1yQAOJujEdxRBoUp7fooXFXAim +eOZTT7Hot9MUnpOmw2TjrH5xzbyf6QMbzPvprDHBr3wVdAKZw7JHpsIyYdfHb0gk +USeh1YdV8nuPmD0Wnu51tvjQjvLzxq4oW6fw8zYX/MMF08oDSlQ= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjEL +MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW +ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2ln +biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp +U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y +aXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjELMAkG +A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJp +U2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwg +SW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2ln +biBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5 +IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8Utpkmw4tXNherJI9/gHm +GUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGzrl0Bp3ve +fLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUw +AwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJ +aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYj +aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMW +kf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMDA2gAMGUCMGYhDBgmYFo4e1ZC +4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIxAJw9SDkjOVga +FRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB +yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL +ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp +U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW +ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0 +aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL +MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW +ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln +biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp +U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y +aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1 +nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex +t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz +SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG +BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+ +rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/ +NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E +BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH +BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy +aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv +MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE +p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y +5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK +WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ +4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N +hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCB +vTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL +ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJp +U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MTgwNgYDVQQDEy9W +ZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe +Fw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJVUzEX +MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0 +IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9y +IGF1dGhvcml6ZWQgdXNlIG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNh +bCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj1mCOkdeQmIN65lgZOIzF +9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGPMiJhgsWH +H26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+H +LL729fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN +/BMReYTtXlT2NJ8IAfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPT +rJ9VAMf2CGqUuV/c4DPxhGD5WycRtPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1Ud +EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0GCCsGAQUFBwEMBGEwX6FdoFsw +WTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2Oa8PPgGrUSBgs +exkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud +DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4 +sAPmLGd75JR3Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+ +seQxIcaBlVZaDrHC1LGmWazxY8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz +4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTxP/jgdFcrGJ2BtMQo2pSXpXDrrB2+ +BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+PwGZsY6rp2aQW9IHR +lRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4mJO3 +7M2CYfE45k+XmCpajQ== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEGjCCAwICEQCLW3VWhFSFCwDPrzhIzrGkMA0GCSqGSIb3DQEBBQUAMIHKMQsw +CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl +cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu +LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT +aWduIENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp +dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD +VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT +aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ +bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu +IENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg +LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN2E1Lm0+afY8wR4 +nN493GwTFtl63SRRZsDHJlkNrAYIwpTRMx/wgzUfbhvI3qpuFU5UJ+/EbRrsC+MO +8ESlV8dAWB6jRx9x7GD2bZTIGDnt/kIYVt/kTEkQeE4BdjVjEjbdZrwBBDajVWjV +ojYJrKshJlQGrT/KFOCsyq0GHZXi+J3x4GD/wn91K0zM2v6HmSHquv4+VNfSWXjb +PG7PoBMAGrgnoeS+Z5bKoMWznN3JdZ7rMJpfo83ZrngZPyPpXNspva1VyBtUjGP2 +6KbqxzcSXKMpHgLZ2x87tNcPVkeBFQRKr4Mn0cVYiMHd9qqnoxjaaKptEVHhv2Vr +n5Z20T0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAq2aN17O6x5q25lXQBfGfMY1a +qtmqRiYPce2lrVNWYgFHKkTp/j90CxObufRNG7LRX7K20ohcs5/Ny9Sn2WCVhDr4 +wTcdYcrnsMXlkdpUpqwxga6X3s0IrLjAl4B/bnKk52kTlWUfxJM8/XmPBNQ+T+r3 +ns7NZ3xPZQL/kYVUc8f/NveGLezQXk//EZ9yBta4GvFMDSZl4kSAHsef493oCtrs +pSCAaWihT37ha88HQfqDjrw43bAuEbFrskLMmrz5SCJ5ShkPshw+IHTZasO+8ih4 +E1Z5T21Q6huwtVexN2ZYI/PcD98Kh8TvhgXVOBRgmaNL3gaWcSzy27YfpO8/7g== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEGTCCAwECEGFwy0mMX5hFKeewptlQW3owDQYJKoZIhvcNAQEFBQAwgcoxCzAJ +BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVy +aVNpZ24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24s +IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNp +Z24gQ2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0 +eSAtIEczMB4XDTk5MTAwMTAwMDAwMFoXDTM2MDcxNjIzNTk1OVowgcoxCzAJBgNV +BAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNp +Z24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24sIElu +Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNpZ24g +Q2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt +IEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArwoNwtUs22e5LeWU +J92lvuCwTY+zYVY81nzD9M0+hsuiiOLh2KRpxbXiv8GmR1BeRjmL1Za6tW8UvxDO +JxOeBUebMXoT2B/Z0wI3i60sR/COgQanDTAM6/c8DyAd3HJG7qUCyFvDyVZpTMUY +wZF7C9UTAJu878NIPkZgIIUq1ZC2zYugzDLdt/1AVbJQHFauzI13TccgTacxdu9o +koqQHgiBVrKtaaNS0MscxCM9H5n+TOgWY47GCI72MfbS+uV23bUckqNJzc0BzWjN +qWm6o+sdDZykIKbBoMXRRkwXbdKsZj+WjOCE1Db/IlnF+RFgqF8EffIa9iVCYQ/E +Srg+iQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA0JhU8wI1NQ0kdvekhktdmnLfe +xbjQ5F1fdiLAJvmEOjr5jLX77GDx6M4EsMjdpwOPMPOY36TmpDHf0xwLRtxyID+u +7gU8pDM/CzmscHhzS5kr3zDCVLCoO1Wh/hYozUK9dG6A2ydEp85EXdQbkJgNHkKU +sQAsBNB0owIFImNjzYO1+8FtYmtpdf1dcEG59b98377BMnMiIYtYgXsVkXq642RI +sH/7NiXaldDxJBQX3RiAa0YjOVT1jmIJBB2UkKab5iXiQkWquJCtvgiPqQtCGJTP +cjnhsUPgKM+351psE2tJs//jGHyJizNdrDPXp/naOlXJWBD5qu9ats9LS98q +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw +CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl +cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu +LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT +aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp +dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD +VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT +aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ +bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu +IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg +LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b +N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t +KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu +kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm +CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ +Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu +imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te +2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe +DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC +/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p +F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt +TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBr +MQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRl +cm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv +bW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2WhcNMjIwNjI0MDAxNjEyWjBrMQsw +CQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5h +dGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1l +cmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h +2mCxlCfLF9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4E +lpF7sDPwsRROEW+1QK8bRaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdV +ZqW1LS7YgFmypw23RuwhY/81q6UCzyr0TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq +299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI/k4+oKsGGelT84ATB+0t +vz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzsGHxBvfaL +dXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD +AgEGMB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUF +AAOCAQEAX/FBfXxcCLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcR +zCSs00Rsca4BIGsDoo8Ytyk6feUWYFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3 +LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pzzkWKsKZJ/0x9nXGIxHYdkFsd +7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBuYQa7FkKMcPcw +++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt +398znM/jra6O1I7mT1GvFpLgXPYHDw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB +gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk +MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY +UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx +NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3 +dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy +dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB +dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6 +38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP +KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q +DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4 +qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa +JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi +PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P +BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs +jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0 +eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD +ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR +vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt +qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa +IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy +i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ +O+7ETPTsJ3xCwnR8gooJybQDJbw= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYT +AlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBD +QTAeFw0wNjA3MDQxNzIwMDRaFw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJP +MREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTCC +ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7IJUqOtdu0KBuqV5Do +0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHHrfAQ +UySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5d +RdY4zTW2ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQ +OA7+j0xbm0bqQfWwCHTD0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwv +JoIQ4uNllAoEwF73XVv4EOLQunpL+943AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08C +AwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAcYwHQYDVR0O +BBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IBAQA+0hyJ +LjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecY +MnQ8SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ +44gx+FkagQnIl6Z0x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6I +Jd1hJyMctTEHBDa0GpC9oHRxUIltvBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNw +i/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7NzTogVZ96edhBiIL5VaZVDADlN +9u6wWk5JRFRYX0KD +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBe +MQswCQYDVQQGEwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0 +ZC4xKjAoBgNVBAsMIWVQS0kgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe +Fw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMxMjdaMF4xCzAJBgNVBAYTAlRXMSMw +IQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBL +SSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEF +AAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAH +SyZbCUNsIZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAh +ijHyl3SJCRImHJ7K2RKilTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3X +DZoTM1PRYfl61dd4s5oz9wCGzh1NlDivqOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1 +TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX12ruOzjjK9SXDrkb5wdJ +fzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0OWQqraffA +sgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uU +WH1+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLS +nT0IFaUQAS2zMnaolQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pH +dmX2Os+PYhcZewoozRrSgx4hxyy/vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJip +NiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXiZo1jDiVN1Rmy5nk3pyKdVDEC +AwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/QkqiMAwGA1UdEwQF +MAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH +ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGB +uvl2ICO1J2B01GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6Yl +PwZpVnPDimZI+ymBV3QGypzqKOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkP +JXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdVxrsStZf0X4OFunHB2WyBEXYKCrC/ +gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEPNXubrjlpC2JgQCA2 +j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+rGNm6 +5ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUB +o2M3IUxExJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS +/jQ6fbjpKdx2qcgw+BRxgMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2z +Gp1iro2C6pSe3VkQw63d4k3jMdXH7OjysP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTE +W9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmODBCEIZ43ygknQW/2xzQ+D +hNQ+IIX3Sj0rnP0qCglN6oH4EZw= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB +qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf +Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw +MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV +BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw +NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j +LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG +A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl +IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs +W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta +3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk +6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6 +Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J +NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA +MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP +r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU +DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz +YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX +xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2 +/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/ +LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7 +jVaMaA== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDEL +MAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMp +IDIwMDcgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAi +BgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMjAeFw0wNzExMDUwMDAw +MDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh +d3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBGb3Ig +YXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9v +dCBDQSAtIEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/ +BebfowJPDQfGAFG6DAJSLSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6 +papu+7qzcMBniKI11KOasf2twu8x+qi58/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8E +BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmtgAMADna3+FGO6Lts6K +DPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUNG4k8VIZ3 +KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41ox +XZ3Krr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCB +rjELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf +Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw +MDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNV +BAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0wODA0MDIwMDAwMDBa +Fw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3Rl +LCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9u +MTgwNgYDVQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXpl +ZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEcz +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsr8nLPvb2FvdeHsbnndm +gcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2AtP0LMqmsywCPLLEHd5N/8 +YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC+BsUa0Lf +b1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS9 +9irY7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2S +zhkGcuYMXDhpxwTWvGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUk +OQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV +HQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJKoZIhvcNAQELBQADggEBABpA +2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweKA3rD6z8KLFIW +oCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu +t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7c +KUGRIjxpp7sC8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fM +m7v/OeZWYdMKp8RcTGB7BXcmer/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZu +MdRAGmI0Nj81Aa6sY6A= +-----END CERTIFICATE----- diff --git a/bitnami/sealed-secrets-kubeseal/0/debian-11/tags-info.yaml b/bitnami/sealed-secrets-kubeseal/0/debian-11/tags-info.yaml new file mode 100644 index 0000000000000..636b69777786b --- /dev/null +++ b/bitnami/sealed-secrets-kubeseal/0/debian-11/tags-info.yaml @@ -0,0 +1,5 @@ +rolling-tags: +- "0" +- 0-debian-11 +- 0.24.5 +- latest diff --git a/bitnami/sealed-secrets-kubeseal/README.md b/bitnami/sealed-secrets-kubeseal/README.md new file mode 100644 index 0000000000000..de4dfd81d318d --- /dev/null +++ b/bitnami/sealed-secrets-kubeseal/README.md @@ -0,0 +1,88 @@ +# Bitnami package for Kubeseal (Sealed Secrets) + +## What is Kubeseal (Sealed Secrets)? + +> Kubeseal is a CLI utility that uses asymmetric cryptography to encrypt secrets that only the Sealed Secrets controller can decrypt. + +[Overview of Kubeseal (Sealed Secrets)](https://github.com/bitnami-labs/sealed-secrets) + +## TL;DR + +```console +docker run --name sealed-secrets-kubeseal bitnami/sealed-secrets-kubeseal:latest +``` + +## Why use Bitnami Images? + +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. + +Looking to use Kubeseal (Sealed Secrets) in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. + +## Supported tags and respective `Dockerfile` links + +Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). + +You can see the equivalence between the different tags by taking a look at the `tags-info.yaml` file present in the branch folder, i.e `bitnami/ASSET/BRANCH/DISTRO/tags-info.yaml`. + +Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers). + +## Get this image + +The recommended way to get the Bitnami Kubeseal (Sealed Secrets) Docker Image is to pull the prebuilt image from the [Docker Hub Registry](https://hub.docker.com/r/bitnami/sealed-secrets-kubeseal). + +```console +docker pull bitnami/sealed-secrets-kubeseal:latest +``` + +To use a specific version, you can pull a versioned tag. You can view the [list of available versions](https://hub.docker.com/r/bitnami/sealed-secrets-kubeseal/tags/) in the Docker Hub Registry. + +```console +docker pull bitnami/sealed-secrets-kubeseal:[TAG] +``` + +If you wish, you can also build the image yourself by cloning the repository, changing to the directory containing the Dockerfile and executing the `docker build` command. Remember to replace the `APP`, `VERSION` and `OPERATING-SYSTEM` path placeholders in the example command below with the correct values. + +```console +git clone https://github.com/bitnami/containers.git +cd bitnami/APP/VERSION/OPERATING-SYSTEM +docker build -t bitnami/APP:latest . +``` + +## Configuration + +### Running commands + +To run commands inside this container you can use `docker run`, for example to execute `kubeseal --version` you can follow the example below: + +```console +docker run --rm --name sealed-secrets-kubeseal bitnami/sealed-secrets-kubeseal:latest -- kubeseal --version +``` + +## Contributing + +We'd love for you to contribute to this container. You can request new features by creating an [issue](https://github.com/bitnami/containers/issues) or submitting a [pull request](https://github.com/bitnami/containers/pulls) with your contribution. + +## Issues + +If you encountered a problem running this container, you can file an [issue](https://github.com/bitnami/containers/issues/new/choose). For us to provide better support, be sure to fill the issue template. + +## License + +Copyright © 2023 VMware, Inc. + +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 + + + +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. diff --git a/bitnami/sealed-secrets-kubeseal/docker-compose.yml b/bitnami/sealed-secrets-kubeseal/docker-compose.yml new file mode 100644 index 0000000000000..56ccca10ccd6c --- /dev/null +++ b/bitnami/sealed-secrets-kubeseal/docker-compose.yml @@ -0,0 +1,7 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +version: '2' +services: + kubeseal: + image: docker.io/bitnami/sealed-secrets-kubeseal:0 diff --git a/bitnami/sealed-secrets/0/debian-11/Dockerfile b/bitnami/sealed-secrets/0/debian-11/Dockerfile index 43ede35a333f0..4c5c783466598 100644 --- a/bitnami/sealed-secrets/0/debian-11/Dockerfile +++ b/bitnami/sealed-secrets/0/debian-11/Dockerfile @@ -8,21 +8,21 @@ ARG TARGETARCH ENV OS_ARCH="${TARGETARCH:-amd64}" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "sealed-secrets-0.24.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "sealed-secrets-0.24.5-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done @@ -36,20 +36,20 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="scratch" \ - org.opencontainers.image.created="2023-10-16T11:19:11Z" \ + org.opencontainers.image.created="2023-12-15T13:40:08Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.24.2-debian-11-r0" \ + org.opencontainers.image.ref.name="0.24.5-debian-11-r0" \ org.opencontainers.image.title="sealed-secrets" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.24.2" + org.opencontainers.image.version="0.24.5" COPY prebuildfs / COPY rootfs / COPY --from=builder /opt/bitnami/sealed-secrets/bin/controller /controller COPY --from=builder /opt/bitnami/sealed-secrets/bin/kubeseal /kubeseal -ENV APP_VERSION="0.24.2" \ +ENV APP_VERSION="0.24.5" \ BITNAMI_APP_NAME="sealed-secrets" USER 1001 diff --git a/bitnami/sealed-secrets/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/sealed-secrets/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 1aa79d404e710..e9358ed18f7d4 100644 --- a/bitnami/sealed-secrets/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/sealed-secrets/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.24.2-0" + "version": "0.24.5-0" } } \ No newline at end of file diff --git a/bitnami/sealed-secrets/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/sealed-secrets/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/sealed-secrets/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/sealed-secrets/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/sealed-secrets/0/debian-11/tags-info.yaml b/bitnami/sealed-secrets/0/debian-11/tags-info.yaml index 1eb3cbf431e00..636b69777786b 100644 --- a/bitnami/sealed-secrets/0/debian-11/tags-info.yaml +++ b/bitnami/sealed-secrets/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.24.2 +- 0.24.5 - latest diff --git a/bitnami/sealed-secrets/README.md b/bitnami/sealed-secrets/README.md index afeadbed607a2..fe7e4067a5465 100644 --- a/bitnami/sealed-secrets/README.md +++ b/bitnami/sealed-secrets/README.md @@ -1,4 +1,4 @@ -# Sealed Secrets packaged by Bitnami +# Bitnami package for Sealed Secrets ## What is Sealed Secrets? @@ -17,7 +17,7 @@ docker run --name sealed-secrets bitnami/sealed-secrets:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/solr/8/debian-11/Dockerfile b/bitnami/solr/8/debian-11/Dockerfile index d0ee2f0d380cb..77c016072e616 100644 --- a/bitnami/solr/8/debian-11/Dockerfile +++ b/bitnami/solr/8/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:15:00Z" \ + org.opencontainers.image.created="2023-12-02T07:56:09Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.11.2-debian-11-r211" \ + org.opencontainers.image.ref.name="8.11.2-debian-11-r213" \ org.opencontainers.image.title="solr" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="8.11.2" @@ -22,21 +22,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl lsof netcat-openbsd procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ "solr-8.11.2-16-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/solr/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/solr/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 095765f003ac0..8615b94156004 100644 --- a/bitnami/solr/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/solr/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "solr": { "arch": "amd64", diff --git a/bitnami/solr/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/solr/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/solr/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/solr/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/solr/8/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/solr/8/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/solr/8/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/solr/8/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/solr/9/debian-11/Dockerfile b/bitnami/solr/9/debian-11/Dockerfile index bb34c4130ff12..ae0541ee61b7f 100644 --- a/bitnami/solr/9/debian-11/Dockerfile +++ b/bitnami/solr/9/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-17T09:01:49Z" \ + org.opencontainers.image.created="2023-12-02T08:21:00Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="9.4.0-debian-11-r0" \ + org.opencontainers.image.ref.name="9.4.0-debian-11-r2" \ org.opencontainers.image.title="solr" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="9.4.0" @@ -22,21 +22,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl lsof netcat-openbsd procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ "solr-9.4.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/solr/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/solr/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 0515844625b76..d7031b46dc0e9 100644 --- a/bitnami/solr/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/solr/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "solr": { "arch": "amd64", diff --git a/bitnami/solr/9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/solr/9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/solr/9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/solr/9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/solr/9/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/solr/9/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/solr/9/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/solr/9/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/solr/README.md b/bitnami/solr/README.md index 2ee8134327657..d84fbba251409 100644 --- a/bitnami/solr/README.md +++ b/bitnami/solr/README.md @@ -1,4 +1,4 @@ -# Apache Solr packaged by Bitnami +# Bitnami package for Apache Solr ## What is Apache Solr? @@ -27,7 +27,7 @@ You can find the available configuration options in the [Environment Variables]( * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/sonarqube/10/debian-11/Dockerfile b/bitnami/sonarqube/10/debian-11/Dockerfile index f437d5ce51e0a..4de2fb6816a5d 100644 --- a/bitnami/sonarqube/10/debian-11/Dockerfile +++ b/bitnami/sonarqube/10/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T20:03:44Z" \ + org.opencontainers.image.created="2023-12-12T13:20:57Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.2.1-debian-11-r10" \ + org.opencontainers.image.ref.name="10.3.0-debian-11-r4" \ org.opencontainers.image.title="sonarqube" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="10.2.1" + org.opencontainers.image.version="10.3.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,22 +22,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl libbsd0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libnettle8 libp11-kit0 libsasl2-2 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "postgresql-client-16.0.0-0-linux-${OS_ARCH}-debian-11" \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "sonarqube-10.2.1-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "postgresql-client-16.1.0-0-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "sonarqube-10.3.0-3-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -47,7 +47,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/sonarqube/postunpack.sh -ENV APP_VERSION="10.2.1" \ +ENV APP_VERSION="10.3.0" \ BITNAMI_APP_NAME="sonarqube" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/postgresql/bin:/opt/bitnami/java/bin:$PATH" diff --git a/bitnami/sonarqube/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/sonarqube/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index f9185cd1de0a0..2b2c247548cbb 100644 --- a/bitnami/sonarqube/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/sonarqube/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "postgresql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.0.0-0" + "version": "16.1.0-0" }, "sonarqube": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.2.1-0" + "version": "10.3.0-3" } } \ No newline at end of file diff --git a/bitnami/sonarqube/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/sonarqube/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/sonarqube/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/sonarqube/10/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/sonarqube/10/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/sonarqube/10/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/sonarqube/10/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/sonarqube/10/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/sonarqube/10/debian-11/tags-info.yaml b/bitnami/sonarqube/10/debian-11/tags-info.yaml index c725bdb9a9dde..2c8468c40c197 100644 --- a/bitnami/sonarqube/10/debian-11/tags-info.yaml +++ b/bitnami/sonarqube/10/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "10" - 10-debian-11 -- 10.2.1 +- 10.3.0 - latest diff --git a/bitnami/sonarqube/9/debian-11/Dockerfile b/bitnami/sonarqube/9/debian-11/Dockerfile index 2050f38bb3152..82df0674b9ef4 100644 --- a/bitnami/sonarqube/9/debian-11/Dockerfile +++ b/bitnami/sonarqube/9/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T20:00:04Z" \ + org.opencontainers.image.created="2023-12-12T13:47:03Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="9.9.2-debian-11-r24" \ + org.opencontainers.image.ref.name="9.9.3-debian-11-r4" \ org.opencontainers.image.title="sonarqube" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="9.9.2" + org.opencontainers.image.version="9.9.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,22 +22,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl libbsd0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libnettle8 libp11-kit0 libsasl2-2 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "postgresql-client-16.0.0-0-linux-${OS_ARCH}-debian-11" \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "sonarqube-9.9.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "postgresql-client-16.1.0-0-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "sonarqube-9.9.3-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -47,7 +47,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/sonarqube/postunpack.sh -ENV APP_VERSION="9.9.2" \ +ENV APP_VERSION="9.9.3" \ BITNAMI_APP_NAME="sonarqube" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/postgresql/bin:/opt/bitnami/java/bin:$PATH" diff --git a/bitnami/sonarqube/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/sonarqube/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index a83fa249e8edd..e40ab95ce5068 100644 --- a/bitnami/sonarqube/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/sonarqube/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "postgresql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.0.0-0" + "version": "16.1.0-0" }, "sonarqube": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "9.9.2-0" + "version": "9.9.3-2" } } \ No newline at end of file diff --git a/bitnami/sonarqube/9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/sonarqube/9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/sonarqube/9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/sonarqube/9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/sonarqube/9/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/sonarqube/9/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/sonarqube/9/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/sonarqube/9/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/sonarqube/9/debian-11/tags-info.yaml b/bitnami/sonarqube/9/debian-11/tags-info.yaml index c13e8a163083b..2fd5d51ed7640 100644 --- a/bitnami/sonarqube/9/debian-11/tags-info.yaml +++ b/bitnami/sonarqube/9/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "9" - 9-debian-11 -- 9.9.2 +- 9.9.3 diff --git a/bitnami/sonarqube/README.md b/bitnami/sonarqube/README.md index 048f53523d4c5..4fe6e402c85de 100644 --- a/bitnami/sonarqube/README.md +++ b/bitnami/sonarqube/README.md @@ -1,4 +1,4 @@ -# SonarQube™ packaged by Bitnami +# Bitnami package for SonarQube™ ## What is SonarQube™? @@ -18,12 +18,12 @@ docker-compose up -d ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use SonarQube™ in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/spark/3.2/debian-11/Dockerfile b/bitnami/spark/3.2/debian-11/Dockerfile index 4505db1b6f9d9..5a9d0e8863f9c 100644 --- a/bitnami/spark/3.2/debian-11/Dockerfile +++ b/bitnami/spark/3.2/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T16:28:49Z" \ + org.opencontainers.image.created="2023-12-16T10:52:53Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.2.4-debian-11-r147" \ + org.opencontainers.image.ref.name="3.2.4-debian-11-r153" \ org.opencontainers.image.title="spark" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.2.4" @@ -23,22 +23,22 @@ ENV HOME="/" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/java/bin:/opt/bitnami/spark/bin:/opt/bitnami/spark/sbin:$PATH" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "java-11.0.21-10-1-linux-${OS_ARCH}-debian-11" \ - "spark-3.2.4-9-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.10.13-13-linux-${OS_ARCH}-debian-11" \ + "java-11.0.21-10-6-linux-${OS_ARCH}-debian-11" \ + "spark-3.2.4-13-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/spark/3.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/spark/3.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 4227cd299f1dd..5c1e5f127d5bd 100644 --- a/bitnami/spark/3.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/spark/3.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.0.21-10-1" + "version": "11.0.21-10-6" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.10.13-13" }, "spark": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.2.4-9" + "version": "3.2.4-13" } } \ No newline at end of file diff --git a/bitnami/spark/3.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/spark/3.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/spark/3.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/spark/3.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/spark/3.2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/spark/3.2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/spark/3.2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/spark/3.2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/spark/3.3/debian-11/Dockerfile b/bitnami/spark/3.3/debian-11/Dockerfile index 07250175d2965..18397aafac4d6 100644 --- a/bitnami/spark/3.3/debian-11/Dockerfile +++ b/bitnami/spark/3.3/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T16:11:46Z" \ + org.opencontainers.image.created="2023-12-18T10:37:18Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.3.3-debian-11-r36" \ + org.opencontainers.image.ref.name="3.3.4-debian-11-r0" \ org.opencontainers.image.title="spark" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="3.3.3" + org.opencontainers.image.version="3.3.4" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -23,22 +23,22 @@ ENV HOME="/" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/java/bin:/opt/bitnami/spark/bin:/opt/bitnami/spark/sbin:$PATH" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "java-17.0.9-11-1-linux-${OS_ARCH}-debian-11" \ - "spark-3.3.3-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.10.13-14-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "spark-3.3.4-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -50,7 +50,7 @@ RUN mkdir /.local && chmod g+rwX /.local COPY rootfs / RUN /opt/bitnami/scripts/spark/postunpack.sh RUN /opt/bitnami/scripts/java/postunpack.sh -ENV APP_VERSION="3.3.3" \ +ENV APP_VERSION="3.3.4" \ BITNAMI_APP_NAME="spark" \ JAVA_HOME="/opt/bitnami/java" \ LD_LIBRARY_PATH="/opt/bitnami/python/lib:/opt/bitnami/spark/venv/lib/python3.8/site-packages/numpy.libs:$LD_LIBRARY_PATH" \ diff --git a/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8d0ff631cadd5..0c9c666aa4bf6 100644 --- a/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.9-11-1" + "version": "17.0.9-11-6" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.10.13-14" }, "spark": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.3.3-2" + "version": "3.3.4-0" } } \ No newline at end of file diff --git a/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/spark/3.3/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/spark/3.3/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/spark/3.3/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/spark/3.3/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/spark/3.3/debian-11/tags-info.yaml b/bitnami/spark/3.3/debian-11/tags-info.yaml index b8cb826300fde..90b22e7eea5ad 100644 --- a/bitnami/spark/3.3/debian-11/tags-info.yaml +++ b/bitnami/spark/3.3/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "3.3" - 3.3-debian-11 -- 3.3.3 +- 3.3.4 diff --git a/bitnami/spark/3.4/debian-11/Dockerfile b/bitnami/spark/3.4/debian-11/Dockerfile index c81b3a309e160..0e296ea93b7a1 100644 --- a/bitnami/spark/3.4/debian-11/Dockerfile +++ b/bitnami/spark/3.4/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T17:33:26Z" \ + org.opencontainers.image.created="2023-11-30T20:50:21Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.4.1-debian-11-r83" \ + org.opencontainers.image.ref.name="3.4.2-debian-11-r0" \ org.opencontainers.image.title="spark" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="3.4.1" + org.opencontainers.image.version="3.4.2" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -23,22 +23,22 @@ ENV HOME="/" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/java/bin:/opt/bitnami/spark/bin:/opt/bitnami/spark/sbin:$PATH" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "java-17.0.9-11-1-linux-${OS_ARCH}-debian-11" \ - "spark-3.4.1-5-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.6-11-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "spark-3.4.2-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -50,7 +50,7 @@ RUN mkdir /.local && chmod g+rwX /.local COPY rootfs / RUN /opt/bitnami/scripts/spark/postunpack.sh RUN /opt/bitnami/scripts/java/postunpack.sh -ENV APP_VERSION="3.4.1" \ +ENV APP_VERSION="3.4.2" \ BITNAMI_APP_NAME="spark" \ JAVA_HOME="/opt/bitnami/java" \ LD_LIBRARY_PATH="/opt/bitnami/python/lib:/opt/bitnami/spark/venv/lib/python3.8/site-packages/numpy.libs:$LD_LIBRARY_PATH" \ diff --git a/bitnami/spark/3.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/spark/3.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 18e257442e231..e63064213d903 100644 --- a/bitnami/spark/3.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/spark/3.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.9-11-1" + "version": "17.0.9-11-6" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.6-11" }, "spark": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.4.1-5" + "version": "3.4.2-0" } } \ No newline at end of file diff --git a/bitnami/spark/3.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/spark/3.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/spark/3.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/spark/3.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/spark/3.4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/spark/3.4/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/spark/3.4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/spark/3.4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/spark/3.4/debian-11/tags-info.yaml b/bitnami/spark/3.4/debian-11/tags-info.yaml index f8a24c2d89e5e..e7876fcdbf414 100644 --- a/bitnami/spark/3.4/debian-11/tags-info.yaml +++ b/bitnami/spark/3.4/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "3.4" - 3.4-debian-11 -- 3.4.1 +- 3.4.2 diff --git a/bitnami/spark/3.5/debian-11/Dockerfile b/bitnami/spark/3.5/debian-11/Dockerfile index 94c4cc7135953..d2602a56529cc 100644 --- a/bitnami/spark/3.5/debian-11/Dockerfile +++ b/bitnami/spark/3.5/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-26T01:07:07Z" \ + org.opencontainers.image.created="2023-12-16T16:24:11Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.5.0-debian-11-r11" \ + org.opencontainers.image.ref.name="3.5.0-debian-11-r17" \ org.opencontainers.image.title="spark" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.5.0" @@ -23,22 +23,22 @@ ENV HOME="/" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/java/bin:/opt/bitnami/spark/bin:/opt/bitnami/spark/sbin:$PATH" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "java-17.0.9-11-1-linux-${OS_ARCH}-debian-11" \ - "spark-3.5.0-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.7-0-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "spark-3.5.0-6-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/spark/3.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/spark/3.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 3b816b719e23d..4b3dc3fc241d4 100644 --- a/bitnami/spark/3.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/spark/3.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.9-11-1" + "version": "17.0.9-11-6" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.7-0" }, "spark": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.5.0-1" + "version": "3.5.0-6" } } \ No newline at end of file diff --git a/bitnami/spark/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/spark/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/spark/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/spark/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/spark/3.5/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/spark/3.5/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/spark/3.5/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/spark/3.5/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/spark/README.md b/bitnami/spark/README.md index 86626b67c9e8c..d67bfb41606ca 100644 --- a/bitnami/spark/README.md +++ b/bitnami/spark/README.md @@ -1,4 +1,4 @@ -# Apache Spark packaged by Bitnami +# Bitnami package for Apache Spark ## What is Apache Spark? @@ -23,7 +23,7 @@ You can find the available configuration options in the [Environment Variables]( * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-11/Dockerfile b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-11/Dockerfile index 0eaf6e6e1b047..a216ddbfe707b 100644 --- a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-11/Dockerfile +++ b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-13T04:55:24Z" \ + org.opencontainers.image.created="2023-12-15T19:07:27Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.11.1-debian-11-r0" \ + org.opencontainers.image.ref.name="2.11.1-debian-11-r2" \ org.opencontainers.image.title="spring-cloud-dataflow-composed-task-runner" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.11.1" @@ -22,21 +22,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ "spring-cloud-dataflow-composed-task-runner-2.11.1-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index b3861a9d1a992..0f09e4ba5b459 100644 --- a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "spring-cloud-dataflow-composed-task-runner": { "arch": "amd64", diff --git a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/spring-cloud-dataflow-composed-task-runner/README.md b/bitnami/spring-cloud-dataflow-composed-task-runner/README.md index c19b3c1b6d54b..6f28b49cb91a9 100644 --- a/bitnami/spring-cloud-dataflow-composed-task-runner/README.md +++ b/bitnami/spring-cloud-dataflow-composed-task-runner/README.md @@ -1,4 +1,4 @@ -# SCDF Composed Task Runner packaged by Bitnami +# Bitnami package for SCDF Composed Task Runner ## What is SCDF Composed Task Runner? @@ -17,7 +17,7 @@ docker run --name spring-cloud-dataflow-composed-task-runner bitnami/spring-clou * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/spring-cloud-dataflow-shell/2/debian-11/Dockerfile b/bitnami/spring-cloud-dataflow-shell/2/debian-11/Dockerfile index c58ef3f7927fa..2b95816be8a70 100644 --- a/bitnami/spring-cloud-dataflow-shell/2/debian-11/Dockerfile +++ b/bitnami/spring-cloud-dataflow-shell/2/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-13T04:55:26Z" \ + org.opencontainers.image.created="2023-12-15T16:17:16Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.11.1-debian-11-r0" \ + org.opencontainers.image.ref.name="2.11.1-debian-11-r2" \ org.opencontainers.image.title="spring-cloud-dataflow-shell" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.11.1" @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl locales procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ "spring-cloud-dataflow-shell-2.11.1-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/spring-cloud-dataflow-shell/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/spring-cloud-dataflow-shell/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c5a47abcb2e15..32b2ac0271e4e 100644 --- a/bitnami/spring-cloud-dataflow-shell/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/spring-cloud-dataflow-shell/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "spring-cloud-dataflow-shell": { "arch": "amd64", diff --git a/bitnami/spring-cloud-dataflow-shell/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/spring-cloud-dataflow-shell/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/spring-cloud-dataflow-shell/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/spring-cloud-dataflow-shell/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/spring-cloud-dataflow-shell/README.md b/bitnami/spring-cloud-dataflow-shell/README.md index aff4a6dbc909a..1ae040244f015 100644 --- a/bitnami/spring-cloud-dataflow-shell/README.md +++ b/bitnami/spring-cloud-dataflow-shell/README.md @@ -1,4 +1,4 @@ -# Spring Cloud Data Flow Shell packaged by Bitnami +# Bitnami package for Spring Cloud Data Flow Shell ## What is Spring Cloud Data Flow Shell? @@ -17,7 +17,7 @@ docker run --name spring-cloud-dataflow-shell bitnami/spring-cloud-dataflow-shel * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile b/bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile index 21502fbc0a235..1c60fd8404144 100644 --- a/bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile +++ b/bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-13T05:04:02Z" \ + org.opencontainers.image.created="2023-12-07T09:57:51Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.11.1-debian-11-r0" \ + org.opencontainers.image.ref.name="2.11.1-debian-11-r2" \ org.opencontainers.image.title="spring-cloud-dataflow" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.11.1" @@ -22,22 +22,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "yq-4.40.4-1-linux-${OS_ARCH}-debian-11" \ "spring-cloud-dataflow-2.11.1-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index f6bcc7a3fbe85..bb4b737a2d5e1 100644 --- a/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "spring-cloud-dataflow": { "arch": "amd64", @@ -15,6 +15,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.4-1" } } \ No newline at end of file diff --git a/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/spring-cloud-dataflow/README.md b/bitnami/spring-cloud-dataflow/README.md index 773055965d1eb..0b237ae56f336 100644 --- a/bitnami/spring-cloud-dataflow/README.md +++ b/bitnami/spring-cloud-dataflow/README.md @@ -1,4 +1,4 @@ -# Spring Cloud Data Flow packaged by Bitnami +# Bitnami package for Spring Cloud Data Flow ## What is Spring Cloud Data Flow? @@ -20,7 +20,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/spring-cloud-skipper-shell/2/debian-11/Dockerfile b/bitnami/spring-cloud-skipper-shell/2/debian-11/Dockerfile index bcc85adf5eeb0..a29dc0d7c2247 100644 --- a/bitnami/spring-cloud-skipper-shell/2/debian-11/Dockerfile +++ b/bitnami/spring-cloud-skipper-shell/2/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-13T04:54:37Z" \ + org.opencontainers.image.created="2023-12-15T16:20:50Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.11.1-debian-11-r0" \ + org.opencontainers.image.ref.name="2.11.1-debian-11-r2" \ org.opencontainers.image.title="spring-cloud-skipper-shell" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.11.1" @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ "spring-cloud-skipper-shell-2.11.1-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/spring-cloud-skipper-shell/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/spring-cloud-skipper-shell/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 771496cd1ea66..1db7ae367f124 100644 --- a/bitnami/spring-cloud-skipper-shell/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/spring-cloud-skipper-shell/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "spring-cloud-skipper-shell": { "arch": "amd64", diff --git a/bitnami/spring-cloud-skipper-shell/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/spring-cloud-skipper-shell/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/spring-cloud-skipper-shell/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/spring-cloud-skipper-shell/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/spring-cloud-skipper-shell/README.md b/bitnami/spring-cloud-skipper-shell/README.md index ea8193fb50542..3acd241a96351 100644 --- a/bitnami/spring-cloud-skipper-shell/README.md +++ b/bitnami/spring-cloud-skipper-shell/README.md @@ -1,4 +1,4 @@ -# Spring Cloud Skipper Shell packaged by Bitnami +# Bitnami package for Spring Cloud Skipper Shell ## What is Spring Cloud Skipper Shell? @@ -17,7 +17,7 @@ docker run --name spring-cloud-skipper-shell bitnami/spring-cloud-skipper-shell: * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/spring-cloud-skipper/2/debian-11/Dockerfile b/bitnami/spring-cloud-skipper/2/debian-11/Dockerfile index 8921f0bccd1e1..33d8a6327dd9c 100644 --- a/bitnami/spring-cloud-skipper/2/debian-11/Dockerfile +++ b/bitnami/spring-cloud-skipper/2/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-13T05:04:27Z" \ + org.opencontainers.image.created="2023-12-15T16:26:13Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.11.1-debian-11-r0" \ + org.opencontainers.image.ref.name="2.11.1-debian-11-r2" \ org.opencontainers.image.title="spring-cloud-skipper" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.11.1" @@ -22,22 +22,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "yq-4.35.2-3-linux-${OS_ARCH}-debian-11" \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "yq-4.40.5-0-linux-${OS_ARCH}-debian-11" \ "spring-cloud-skipper-2.11.1-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/spring-cloud-skipper/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/spring-cloud-skipper/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 948f87061ce37..792be38f4ada5 100644 --- a/bitnami/spring-cloud-skipper/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/spring-cloud-skipper/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "spring-cloud-skipper": { "arch": "amd64", @@ -15,6 +15,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.35.2-3" + "version": "4.40.5-0" } } \ No newline at end of file diff --git a/bitnami/spring-cloud-skipper/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/spring-cloud-skipper/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/spring-cloud-skipper/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/spring-cloud-skipper/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/spring-cloud-skipper/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/spring-cloud-skipper/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/spring-cloud-skipper/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/spring-cloud-skipper/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/spring-cloud-skipper/README.md b/bitnami/spring-cloud-skipper/README.md index 5fdb83108220d..144fd01669c13 100644 --- a/bitnami/spring-cloud-skipper/README.md +++ b/bitnami/spring-cloud-skipper/README.md @@ -1,4 +1,4 @@ -# Spring Cloud Skipper packaged by Bitnami +# Bitnami package for Spring Cloud Skipper ## What is Spring Cloud Skipper? @@ -20,7 +20,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/suitecrm/7/debian-11/Dockerfile b/bitnami/suitecrm/7/debian-11/Dockerfile index ea72932cc6f19..4fa5f5b56cb70 100644 --- a/bitnami/suitecrm/7/debian-11/Dockerfile +++ b/bitnami/suitecrm/7/debian-11/Dockerfile @@ -7,38 +7,38 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T20:36:01Z" \ + org.opencontainers.image.created="2023-12-17T11:01:54Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.14.1-debian-11-r3" \ + org.opencontainers.image.ref.name="7.14.2-debian-11-r4" \ org.opencontainers.image.title="suitecrm" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.14.1" + org.opencontainers.image.version="7.14.2" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates cron curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.1.24-3-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.57-12-linux-${OS_ARCH}-debian-11" \ - "mysql-client-11.1.2-0-linux-${OS_ARCH}-debian-11" \ - "libphp-8.1.24-0-linux-${OS_ARCH}-debian-11" \ - "suitecrm-7.14.1-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "php-8.1.26-11-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.58-2-linux-${OS_ARCH}-debian-11" \ + "mysql-client-11.1.3-0-linux-${OS_ARCH}-debian-11" \ + "libphp-8.1.26-0-linux-${OS_ARCH}-debian-11" \ + "suitecrm-7.14.2-2-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -53,7 +53,7 @@ RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh RUN /opt/bitnami/scripts/suitecrm/postunpack.sh ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ - APP_VERSION="7.14.1" \ + APP_VERSION="7.14.2" \ BITNAMI_APP_NAME="suitecrm" \ PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index f8cca56339159..60fbfb5346b5b 100644 --- a/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,36 +3,36 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.57-12" + "version": "2.4.58-2" }, "libphp": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.24-0" + "version": "8.1.26-0" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.1.2-0" + "version": "11.1.3-0" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.24-3" + "version": "8.1.26-11" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" }, "suitecrm": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.14.1-0" + "version": "7.14.2-2" } } \ No newline at end of file diff --git a/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/suitecrm/7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/suitecrm/7/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/suitecrm/7/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/suitecrm/7/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/suitecrm/7/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh index 765d1d8ce1ed5..6a480ad4ddde9 100755 --- a/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh +++ b/bitnami/suitecrm/7/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh @@ -46,6 +46,7 @@ apache_setup_bitnami_config() { local -a modules_to_disable=( "http2_module" "proxy_hcheck_module" + "proxy_html_module" "proxy_http2_module" ) for module in "${modules_to_disable[@]}"; do diff --git a/bitnami/suitecrm/7/debian-11/tags-info.yaml b/bitnami/suitecrm/7/debian-11/tags-info.yaml index a958fc8ecfe28..323cf27c77bb8 100644 --- a/bitnami/suitecrm/7/debian-11/tags-info.yaml +++ b/bitnami/suitecrm/7/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "7" - 7-debian-11 -- 7.14.1 +- 7.14.2 diff --git a/bitnami/suitecrm/8/debian-11/Dockerfile b/bitnami/suitecrm/8/debian-11/Dockerfile index 2faef92c74a92..233492d095494 100644 --- a/bitnami/suitecrm/8/debian-11/Dockerfile +++ b/bitnami/suitecrm/8/debian-11/Dockerfile @@ -7,38 +7,38 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T20:52:09Z" \ + org.opencontainers.image.created="2023-12-17T11:11:12Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.4.1-debian-11-r3" \ + org.opencontainers.image.ref.name="8.4.2-debian-11-r4" \ org.opencontainers.image.title="suitecrm" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="8.4.1" + org.opencontainers.image.version="8.4.2" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates cron curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.1.24-3-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.57-12-linux-${OS_ARCH}-debian-11" \ - "mysql-client-11.1.2-0-linux-${OS_ARCH}-debian-11" \ - "libphp-8.1.24-0-linux-${OS_ARCH}-debian-11" \ - "suitecrm-8.4.1-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "php-8.1.26-11-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.58-2-linux-${OS_ARCH}-debian-11" \ + "mysql-client-11.1.3-0-linux-${OS_ARCH}-debian-11" \ + "libphp-8.1.26-0-linux-${OS_ARCH}-debian-11" \ + "suitecrm-8.4.2-2-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -53,7 +53,7 @@ RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh RUN /opt/bitnami/scripts/suitecrm/postunpack.sh ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ - APP_VERSION="8.4.1" \ + APP_VERSION="8.4.2" \ BITNAMI_APP_NAME="suitecrm" \ PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 7b6f894c977d8..49bbfc9bfa747 100644 --- a/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,36 +3,36 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.57-12" + "version": "2.4.58-2" }, "libphp": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.24-0" + "version": "8.1.26-0" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.1.2-0" + "version": "11.1.3-0" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.24-3" + "version": "8.1.26-11" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" }, "suitecrm": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.4.1-0" + "version": "8.4.2-2" } } \ No newline at end of file diff --git a/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/suitecrm/8/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/suitecrm/8/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/suitecrm/8/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/suitecrm/8/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/suitecrm/8/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/suitecrm/8/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh index 765d1d8ce1ed5..6a480ad4ddde9 100755 --- a/bitnami/suitecrm/8/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh +++ b/bitnami/suitecrm/8/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh @@ -46,6 +46,7 @@ apache_setup_bitnami_config() { local -a modules_to_disable=( "http2_module" "proxy_hcheck_module" + "proxy_html_module" "proxy_http2_module" ) for module in "${modules_to_disable[@]}"; do diff --git a/bitnami/suitecrm/8/debian-11/tags-info.yaml b/bitnami/suitecrm/8/debian-11/tags-info.yaml index 7d65c66b7ff70..64f055063c013 100644 --- a/bitnami/suitecrm/8/debian-11/tags-info.yaml +++ b/bitnami/suitecrm/8/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "8" - 8-debian-11 -- 8.4.1 +- 8.4.2 - latest diff --git a/bitnami/suitecrm/README.md b/bitnami/suitecrm/README.md index 3fe1e170f222f..5f6581ae38f02 100644 --- a/bitnami/suitecrm/README.md +++ b/bitnami/suitecrm/README.md @@ -1,4 +1,4 @@ -# SuiteCRM packaged by Bitnami +# Bitnami package for SuiteCRM ## What is SuiteCRM? @@ -21,18 +21,12 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use SuiteCRM in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. -## How to deploy SuiteCRM in Kubernetes? - -Deploying Bitnami applications as Helm Charts is the easiest way to get started with our applications on Kubernetes. Read more about the installation in the [Bitnami SuiteCRM Chart GitHub repository](https://github.com/bitnami/charts/tree/master/bitnami/suitecrm). - -Bitnami containers can be used with [Kubeapps](https://kubeapps.dev/) for deployment and management of Helm Charts in clusters. - ## Supported tags and respective `Dockerfile` links Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). diff --git a/bitnami/supabase-postgres-meta/0/debian-11/Dockerfile b/bitnami/supabase-postgres-meta/0/debian-11/Dockerfile index 78f9dbb29ff54..873d3f69c6b0a 100644 --- a/bitnami/supabase-postgres-meta/0/debian-11/Dockerfile +++ b/bitnami/supabase-postgres-meta/0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T08:01:09Z" \ + org.opencontainers.image.created="2023-11-28T04:00:33Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.72.1-debian-11-r1" \ + org.opencontainers.image.ref.name="0.75.0-debian-11-r0" \ org.opencontainers.image.title="supabase-postgres-meta" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.72.1" + org.opencontainers.image.version="0.75.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,22 +21,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "node-16.20.2-1-linux-${OS_ARCH}-debian-11" \ - "supabase-postgres-meta-0.72.1-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.6-11-linux-${OS_ARCH}-debian-11" \ + "node-18.18.2-0-linux-${OS_ARCH}-debian-11" \ + "supabase-postgres-meta-0.75.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -45,7 +45,7 @@ RUN apt-get autoremove --purge -y curl && \ RUN useradd -r -u 1001 -g root supabase-postgres-meta RUN mkdir /.npm && chmod g+rwX /.npm -ENV APP_VERSION="0.72.1" \ +ENV APP_VERSION="0.75.0" \ BITNAMI_APP_NAME="supabase-postgres-meta" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/node/bin:/opt/bitnami/supabase-postgres-meta/node_modules/.bin/:$PATH" diff --git a/bitnami/supabase-postgres-meta/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/supabase-postgres-meta/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c816386021501..875364f1f4e66 100644 --- a/bitnami/supabase-postgres-meta/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/supabase-postgres-meta/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.20.2-1" + "version": "18.18.2-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.6-11" }, "supabase-postgres-meta": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.72.1-0" + "version": "0.75.0-0" } } \ No newline at end of file diff --git a/bitnami/supabase-postgres-meta/0/debian-11/tags-info.yaml b/bitnami/supabase-postgres-meta/0/debian-11/tags-info.yaml index 8667b5200ad37..70e3549eada3e 100644 --- a/bitnami/supabase-postgres-meta/0/debian-11/tags-info.yaml +++ b/bitnami/supabase-postgres-meta/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.72.1 +- 0.75.0 - latest diff --git a/bitnami/supabase-postgres-meta/README.md b/bitnami/supabase-postgres-meta/README.md index c6f388d3230f4..9cf5f959eb5e9 100644 --- a/bitnami/supabase-postgres-meta/README.md +++ b/bitnami/supabase-postgres-meta/README.md @@ -1,4 +1,4 @@ -# Supabase postgres-meta packaged by Bitnami +# Bitnami package for Supabase postgres-meta ## What is Supabase postgres-meta? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/supabase-postgres/15/debian-11/Dockerfile b/bitnami/supabase-postgres/15/debian-11/Dockerfile index 4885cdb85ebac..ef76cdcb73093 100644 --- a/bitnami/supabase-postgres/15/debian-11/Dockerfile +++ b/bitnami/supabase-postgres/15/debian-11/Dockerfile @@ -9,10 +9,10 @@ ARG WITH_ALL_LOCALES="no" LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-21T02:45:02Z" \ + org.opencontainers.image.created="2023-12-18T11:48:23Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="15.1.0-debian-11-r177" \ + org.opencontainers.image.ref.name="15.1.0-debian-11-r192" \ org.opencontainers.image.title="supabase-postgres" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="15.1.0" @@ -23,21 +23,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbrotli1 libbsd0 libbz2-1.0 libcom-err2 libcrypt1 libcurl4 libedit2 libevent-2.1-7 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libmecab2 libmsgpackc2 libncurses6 libnettle8 libnghttp2-14 libnorm1 libp11-kit0 libpcre3 libpgm-5.3-0 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 libzmq5 libzstd1 locales procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.9-11-0-linux-${OS_ARCH}-debian-11" \ - "supabase-postgres-15.1.0-55-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "supabase-postgres-15.1.0-69-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/supabase-postgres/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/supabase-postgres/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index e8c6430546713..57d4f470a29d3 100644 --- a/bitnami/supabase-postgres/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/supabase-postgres/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.9-11-0" + "version": "17.0.9-11-6" }, "supabase-postgres": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "15.1.0-55" + "version": "15.1.0-69" } } \ No newline at end of file diff --git a/bitnami/supabase-postgres/15/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/supabase-postgres/15/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/supabase-postgres/15/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/supabase-postgres/15/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/supabase-postgres/15/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/supabase-postgres/15/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/supabase-postgres/15/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/supabase-postgres/15/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/supabase-postgres/README.md b/bitnami/supabase-postgres/README.md index 240bb082aac3d..e4847fb0a66a4 100644 --- a/bitnami/supabase-postgres/README.md +++ b/bitnami/supabase-postgres/README.md @@ -1,4 +1,4 @@ -# Supabase Postgres packaged by Bitnami +# Bitnami package for Supabase Postgres ## What is Supabase Postgres? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/supabase-realtime/2/debian-11/Dockerfile b/bitnami/supabase-realtime/2/debian-11/Dockerfile index 2407713a488a0..9c42db5b03187 100644 --- a/bitnami/supabase-realtime/2/debian-11/Dockerfile +++ b/bitnami/supabase-realtime/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-30T21:48:59Z" \ + org.opencontainers.image.created="2023-12-12T13:01:55Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.25.20-debian-11-r0" \ + org.opencontainers.image.ref.name="2.25.44-debian-11-r0" \ org.opencontainers.image.title="supabase-realtime" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.25.20" + org.opencontainers.image.version="2.25.44" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libgcc-s1 libssl1.1 libstdc++6 libtinfo6 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "supabase-realtime-2.25.20-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "supabase-realtime-2.25.44-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -43,7 +43,7 @@ RUN apt-get autoremove --purge -y curl && \ RUN useradd -r -u 1001 -g root supabase-realtime RUN chmod g+rwX -R /opt/bitnami/supabase-realtime/lib/tzdata-*/priv -ENV APP_VERSION="2.25.20" \ +ENV APP_VERSION="2.25.44" \ BITNAMI_APP_NAME="supabase-realtime" \ PATH="/opt/bitnami/supabase-realtime/bin:$PATH" diff --git a/bitnami/supabase-realtime/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/supabase-realtime/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 24f12145a6582..32580920a4e52 100644 --- a/bitnami/supabase-realtime/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/supabase-realtime/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.25.20-0" + "version": "2.25.44-0" } } \ No newline at end of file diff --git a/bitnami/supabase-realtime/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/supabase-realtime/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/supabase-realtime/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/supabase-realtime/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/supabase-realtime/2/debian-11/tags-info.yaml b/bitnami/supabase-realtime/2/debian-11/tags-info.yaml index 494ac1c4f7c6f..eff5dc2483cc1 100644 --- a/bitnami/supabase-realtime/2/debian-11/tags-info.yaml +++ b/bitnami/supabase-realtime/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.25.20 +- 2.25.44 - latest diff --git a/bitnami/supabase-realtime/README.md b/bitnami/supabase-realtime/README.md index 5168cf6f20ea6..93b6390236787 100644 --- a/bitnami/supabase-realtime/README.md +++ b/bitnami/supabase-realtime/README.md @@ -1,4 +1,4 @@ -# Supabase Realtime packaged by Bitnami +# Bitnami package for Supabase Realtime ## What is Supabase Realtime? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/supabase-storage/0/debian-11/Dockerfile b/bitnami/supabase-storage/0/debian-11/Dockerfile index ffff844794183..e4bfc12163b14 100644 --- a/bitnami/supabase-storage/0/debian-11/Dockerfile +++ b/bitnami/supabase-storage/0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-26T13:27:18Z" \ + org.opencontainers.image.created="2023-11-29T13:12:24Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.43.8-debian-11-r0" \ + org.opencontainers.image.ref.name="0.43.12-debian-11-r0" \ org.opencontainers.image.title="supabase-storage" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.43.8" + org.opencontainers.image.version="0.43.12" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,22 +21,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-7-linux-${OS_ARCH}-debian-11" \ + "python-3.11.6-11-linux-${OS_ARCH}-debian-11" \ "node-18.18.2-0-linux-${OS_ARCH}-debian-11" \ - "supabase-storage-0.43.8-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "supabase-storage-0.43.12-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN mkdir -p /.pm2 && chmod g+rwX /.pm2 @@ -45,7 +45,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN useradd -r -u 1001 -g root supabase-storage -ENV APP_VERSION="0.43.8" \ +ENV APP_VERSION="0.43.12" \ BITNAMI_APP_NAME="supabase-storage" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/node/bin:/opt/bitnami/supabase-storage/node_modules/.bin:$PATH" diff --git a/bitnami/supabase-storage/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/supabase-storage/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index ead46929d17d5..00a1216d6a56d 100644 --- a/bitnami/supabase-storage/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/supabase-storage/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,12 +9,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-7" + "version": "3.11.6-11" }, "supabase-storage": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.43.8-0" + "version": "0.43.12-0" } } \ No newline at end of file diff --git a/bitnami/supabase-storage/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/supabase-storage/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/supabase-storage/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/supabase-storage/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/supabase-storage/0/debian-11/tags-info.yaml b/bitnami/supabase-storage/0/debian-11/tags-info.yaml index 499a3970d159d..28929d6befa84 100644 --- a/bitnami/supabase-storage/0/debian-11/tags-info.yaml +++ b/bitnami/supabase-storage/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.43.8 +- 0.43.12 - latest diff --git a/bitnami/supabase-storage/README.md b/bitnami/supabase-storage/README.md index 8ea56f9e6a654..acfa837f08182 100644 --- a/bitnami/supabase-storage/README.md +++ b/bitnami/supabase-storage/README.md @@ -1,4 +1,4 @@ -# Supabase Storage packaged by Bitnami +# Bitnami package for Supabase Storage ## What is Supabase Storage? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/supabase-studio/0/debian-11/Dockerfile b/bitnami/supabase-studio/0/debian-11/Dockerfile index 8a37fb503904c..a45b3fdb96429 100644 --- a/bitnami/supabase-studio/0/debian-11/Dockerfile +++ b/bitnami/supabase-studio/0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T08:00:20Z" \ + org.opencontainers.image.created="2023-12-09T17:10:59Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.23.9-debian-11-r1" \ + org.opencontainers.image.ref.name="0.23.10-debian-11-r1" \ org.opencontainers.image.title="supabase-studio" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.23.9" + org.opencontainers.image.version="0.23.10" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,22 +21,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-6-linux-${OS_ARCH}-debian-11" \ - "node-16.20.2-1-linux-${OS_ARCH}-debian-11" \ - "supabase-0.23.9-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.7-0-linux-${OS_ARCH}-debian-11" \ + "node-18.19.0-0-linux-${OS_ARCH}-debian-11" \ + "supabase-0.23.10-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -46,7 +46,7 @@ RUN useradd -r -u 1001 -g root supabase RUN mkdir -p /opt/bitnami/supabase/studio/.next/cache && chmod g+rwX /opt/bitnami/supabase/studio/.next/cache RUN mkdir /.npm && chmod g+rwX /.npm -ENV APP_VERSION="0.23.9" \ +ENV APP_VERSION="0.23.10" \ BITNAMI_APP_NAME="supabase-studio" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/node/bin:/opt/bitnami/supabase/studio/node_modules/next/dist/bin:$PATH" diff --git a/bitnami/supabase-studio/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/supabase-studio/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 08a08778e9baf..ebc1dfe3d4af8 100644 --- a/bitnami/supabase-studio/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/supabase-studio/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.20.2-1" + "version": "18.19.0-0" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-6" + "version": "3.11.7-0" }, "supabase": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.23.9-0" + "version": "0.23.10-0" } } \ No newline at end of file diff --git a/bitnami/supabase-studio/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/supabase-studio/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/supabase-studio/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/supabase-studio/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/supabase-studio/0/debian-11/tags-info.yaml b/bitnami/supabase-studio/0/debian-11/tags-info.yaml index 098496574b6bc..9481ae3dd6b31 100644 --- a/bitnami/supabase-studio/0/debian-11/tags-info.yaml +++ b/bitnami/supabase-studio/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.23.9 +- 0.23.10 - latest diff --git a/bitnami/supabase-studio/README.md b/bitnami/supabase-studio/README.md index 9d5001e117f6d..e834e5dd64142 100644 --- a/bitnami/supabase-studio/README.md +++ b/bitnami/supabase-studio/README.md @@ -1,4 +1,4 @@ -# Supabase packaged by Bitnami +# Bitnami package for Supabase ## What is Supabase? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/symfony/5.4/debian-11/Dockerfile b/bitnami/symfony/5.4/debian-11/Dockerfile index 8c7cf366e0593..548008dd0cf95 100644 --- a/bitnami/symfony/5.4/debian-11/Dockerfile +++ b/bitnami/symfony/5.4/debian-11/Dockerfile @@ -7,35 +7,35 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-29T04:41:35Z" \ + org.opencontainers.image.created="2023-12-12T17:08:09Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.4.30-debian-11-r0" \ + org.opencontainers.image.ref.name="5.4.33-debian-11-r2" \ org.opencontainers.image.title="symfony" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="5.4.30" + org.opencontainers.image.version="5.4.33" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps sudo zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.2.12-0-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.11.5-1-linux-${OS_ARCH}-debian-11" \ - "symfony-5.4.30-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "php-8.2.13-10-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.11.6-0-linux-${OS_ARCH}-debian-11" \ + "symfony-5.4.33-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -47,7 +47,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/mysql-client/postunpack.sh RUN /opt/bitnami/scripts/php/postunpack.sh RUN /opt/bitnami/scripts/symfony/postunpack.sh -ENV APP_VERSION="5.4.30" \ +ENV APP_VERSION="5.4.33" \ BITNAMI_APP_NAME="symfony" \ PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/mysql/bin:/opt/bitnami/symfony/bin:$PATH" \ PHP_ENABLE_OPCACHE="0" diff --git a/bitnami/symfony/5.4/debian-11/docker-compose.yml b/bitnami/symfony/5.4/debian-11/docker-compose.yml index 6a7065926f0e9..85804475b82e7 100644 --- a/bitnami/symfony/5.4/debian-11/docker-compose.yml +++ b/bitnami/symfony/5.4/debian-11/docker-compose.yml @@ -22,6 +22,7 @@ services: - SYMFONY_DATABASE_PORT_NUMBER=3306 - SYMFONY_DATABASE_USER=bn_myapp - SYMFONY_DATABASE_NAME=bitnami_myapp + - SYMFONY_PROJECT_SKELETON=symfony/skeleton volumes: - './my-project:/app' depends_on: diff --git a/bitnami/symfony/5.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/symfony/5.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index fb687badf291f..e617f72fa74c7 100644 --- a/bitnami/symfony/5.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/symfony/5.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.11.5-1" + "version": "10.11.6-0" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.12-0" + "version": "8.2.13-10" }, "symfony": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "5.4.30-0" + "version": "5.4.33-2" } } \ No newline at end of file diff --git a/bitnami/symfony/5.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/symfony/5.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/symfony/5.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/symfony/5.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/symfony/5.4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/symfony/5.4/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/symfony/5.4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/symfony/5.4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/symfony/5.4/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh b/bitnami/symfony/5.4/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh index 680f6f9aaec9c..b55f27fc4ea80 100644 --- a/bitnami/symfony/5.4/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh +++ b/bitnami/symfony/5.4/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh @@ -26,6 +26,7 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}" symfony_env_vars=( SYMFONY_PORT_NUMBER SYMFONY_SKIP_DATABASE + SYMFONY_PROJECT_SKELETON SYMFONY_DATABASE_HOST SYMFONY_DATABASE_PORT_NUMBER SYMFONY_DATABASE_NAME @@ -57,6 +58,7 @@ export SYMFONY_SKELETON_DIR="${SYMFONY_BASE_DIR}/skeleton" # Symfony configuration export SYMFONY_PORT_NUMBER="${SYMFONY_PORT_NUMBER:-8000}" export SYMFONY_SKIP_DATABASE="${SYMFONY_SKIP_DATABASE:-no}" # only used during the first initialization +export SYMFONY_PROJECT_SKELETON="${SYMFONY_PROJECT_SKELETON:-}" # Database configuration SYMFONY_DATABASE_HOST="${SYMFONY_DATABASE_HOST:-"${MARIADB_HOST:-}"}" diff --git a/bitnami/symfony/5.4/debian-11/tags-info.yaml b/bitnami/symfony/5.4/debian-11/tags-info.yaml index 0cd08f3bfb163..81bdb6c455a15 100644 --- a/bitnami/symfony/5.4/debian-11/tags-info.yaml +++ b/bitnami/symfony/5.4/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "5.4" - 5.4-debian-11 -- 5.4.30 +- 5.4.33 diff --git a/bitnami/symfony/6.3/debian-11/Dockerfile b/bitnami/symfony/6.3/debian-11/Dockerfile index 5fbf7c3b959f8..3ec6912165126 100644 --- a/bitnami/symfony/6.3/debian-11/Dockerfile +++ b/bitnami/symfony/6.3/debian-11/Dockerfile @@ -7,35 +7,35 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-29T16:08:05Z" \ + org.opencontainers.image.created="2023-12-12T16:50:48Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.3.7-debian-11-r0" \ + org.opencontainers.image.ref.name="6.3.10-debian-11-r2" \ org.opencontainers.image.title="symfony" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="6.3.7" + org.opencontainers.image.version="6.3.10" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps sudo zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.2.12-0-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.11.5-1-linux-${OS_ARCH}-debian-11" \ - "symfony-6.3.7-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "php-8.2.13-10-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.11.6-0-linux-${OS_ARCH}-debian-11" \ + "symfony-6.3.10-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -47,7 +47,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/mysql-client/postunpack.sh RUN /opt/bitnami/scripts/php/postunpack.sh RUN /opt/bitnami/scripts/symfony/postunpack.sh -ENV APP_VERSION="6.3.7" \ +ENV APP_VERSION="6.3.10" \ BITNAMI_APP_NAME="symfony" \ PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/mysql/bin:/opt/bitnami/symfony/bin:$PATH" \ PHP_ENABLE_OPCACHE="0" diff --git a/bitnami/symfony/6.3/debian-11/docker-compose.yml b/bitnami/symfony/6.3/debian-11/docker-compose.yml index bd1214307d82c..bf23dfa79bd99 100644 --- a/bitnami/symfony/6.3/debian-11/docker-compose.yml +++ b/bitnami/symfony/6.3/debian-11/docker-compose.yml @@ -22,6 +22,7 @@ services: - SYMFONY_DATABASE_PORT_NUMBER=3306 - SYMFONY_DATABASE_USER=bn_myapp - SYMFONY_DATABASE_NAME=bitnami_myapp + - SYMFONY_PROJECT_SKELETON=symfony/skeleton volumes: - './my-project:/app' depends_on: diff --git a/bitnami/symfony/6.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/symfony/6.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 0e23f1cd1cfdd..528402d0637ea 100644 --- a/bitnami/symfony/6.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/symfony/6.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.11.5-1" + "version": "10.11.6-0" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.12-0" + "version": "8.2.13-10" }, "symfony": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "6.3.7-0" + "version": "6.3.10-2" } } \ No newline at end of file diff --git a/bitnami/symfony/6.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/symfony/6.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/symfony/6.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/symfony/6.3/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/symfony/6.3/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/symfony/6.3/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/symfony/6.3/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/symfony/6.3/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/symfony/6.3/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh b/bitnami/symfony/6.3/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh index 680f6f9aaec9c..b55f27fc4ea80 100644 --- a/bitnami/symfony/6.3/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh +++ b/bitnami/symfony/6.3/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh @@ -26,6 +26,7 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}" symfony_env_vars=( SYMFONY_PORT_NUMBER SYMFONY_SKIP_DATABASE + SYMFONY_PROJECT_SKELETON SYMFONY_DATABASE_HOST SYMFONY_DATABASE_PORT_NUMBER SYMFONY_DATABASE_NAME @@ -57,6 +58,7 @@ export SYMFONY_SKELETON_DIR="${SYMFONY_BASE_DIR}/skeleton" # Symfony configuration export SYMFONY_PORT_NUMBER="${SYMFONY_PORT_NUMBER:-8000}" export SYMFONY_SKIP_DATABASE="${SYMFONY_SKIP_DATABASE:-no}" # only used during the first initialization +export SYMFONY_PROJECT_SKELETON="${SYMFONY_PROJECT_SKELETON:-}" # Database configuration SYMFONY_DATABASE_HOST="${SYMFONY_DATABASE_HOST:-"${MARIADB_HOST:-}"}" diff --git a/bitnami/symfony/6.3/debian-11/tags-info.yaml b/bitnami/symfony/6.3/debian-11/tags-info.yaml index 03cd614cd3efc..30c6065e843d5 100644 --- a/bitnami/symfony/6.3/debian-11/tags-info.yaml +++ b/bitnami/symfony/6.3/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "6.3" - 6.3-debian-11 -- 6.3.7 +- 6.3.10 - latest diff --git a/bitnami/symfony/6.4/debian-11/Dockerfile b/bitnami/symfony/6.4/debian-11/Dockerfile new file mode 100644 index 0000000000000..1189627623862 --- /dev/null +++ b/bitnami/symfony/6.4/debian-11/Dockerfile @@ -0,0 +1,59 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +FROM docker.io/bitnami/minideb:bullseye + +ARG TARGETARCH + +LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-12-12T18:27:50Z" \ + org.opencontainers.image.description="Application packaged by VMware, Inc" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.ref.name="6.4.1-debian-11-r0" \ + org.opencontainers.image.title="symfony" \ + org.opencontainers.image.vendor="VMware, Inc." \ + org.opencontainers.image.version="6.4.1" + +ENV OS_ARCH="${TARGETARCH:-amd64}" \ + OS_FLAVOUR="debian-11" \ + OS_NAME="linux" + +COPY prebuildfs / +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] +# Install required system packages and dependencies +RUN install_packages ca-certificates curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps sudo zlib1g +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ + COMPONENTS=( \ + "php-8.2.13-10-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.11.6-0-linux-${OS_ARCH}-debian-11" \ + "symfony-6.4.1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ + for COMPONENT in "${COMPONENTS[@]}"; do \ + if [ ! -f "${COMPONENT}.tar.gz" ]; then \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ + rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ + done +RUN apt-get autoremove --purge -y curl && \ + apt-get update && apt-get upgrade -y && \ + apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives +RUN /build/bitnami-user.sh + +COPY rootfs / +RUN /opt/bitnami/scripts/mysql-client/postunpack.sh +RUN /opt/bitnami/scripts/php/postunpack.sh +RUN /opt/bitnami/scripts/symfony/postunpack.sh +ENV APP_VERSION="6.4.1" \ + BITNAMI_APP_NAME="symfony" \ + PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/mysql/bin:/opt/bitnami/symfony/bin:$PATH" \ + PHP_ENABLE_OPCACHE="0" + +EXPOSE 8000 + +WORKDIR /app +ENTRYPOINT [ "/opt/bitnami/scripts/symfony/entrypoint.sh" ] +CMD [ "/opt/bitnami/scripts/symfony/run.sh" ] diff --git a/bitnami/symfony/6.4/debian-11/docker-compose.yml b/bitnami/symfony/6.4/debian-11/docker-compose.yml new file mode 100644 index 0000000000000..942f3e475ca66 --- /dev/null +++ b/bitnami/symfony/6.4/debian-11/docker-compose.yml @@ -0,0 +1,30 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +version: '2' + +services: + mariadb: + image: docker.io/bitnami/mariadb:11.1 + environment: + # ALLOW_EMPTY_PASSWORD is recommended only for development. + - ALLOW_EMPTY_PASSWORD=yes + - MARIADB_USER=bn_myapp + - MARIADB_DATABASE=bitnami_myapp + myapp: + image: docker.io/bitnami/symfony:6.4 + ports: + - '8000:8000' + environment: + # ALLOW_EMPTY_PASSWORD is recommended only for development. + - ALLOW_EMPTY_PASSWORD=yes + - SYMFONY_DATABASE_HOST=mariadb + - SYMFONY_DATABASE_PORT_NUMBER=3306 + - SYMFONY_DATABASE_USER=bn_myapp + - SYMFONY_DATABASE_NAME=bitnami_myapp + - SYMFONY_PROJECT_SKELETON=symfony/skeleton + volumes: + - './my-project:/app' + depends_on: + - mariadb + diff --git a/bitnami/symfony/6.4/debian-11/prebuildfs/build/bitnami-user.sh b/bitnami/symfony/6.4/debian-11/prebuildfs/build/bitnami-user.sh new file mode 100755 index 0000000000000..45dcdc0bab290 --- /dev/null +++ b/bitnami/symfony/6.4/debian-11/prebuildfs/build/bitnami-user.sh @@ -0,0 +1,8 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +useradd -ms /bin/bash bitnami +mkdir -p /opt/bitnami +sed -i -e 's/\s*Defaults\s*secure_path\s*=/# Defaults secure_path=/' /etc/sudoers +echo 'bitnami ALL=NOPASSWD: ALL' >> /etc/sudoers diff --git a/bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json new file mode 100644 index 0000000000000..f180e6ac10bd7 --- /dev/null +++ b/bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -0,0 +1,20 @@ +{ + "mysql-client": { + "arch": "amd64", + "distro": "debian-11", + "type": "NAMI", + "version": "10.11.6-0" + }, + "php": { + "arch": "amd64", + "distro": "debian-11", + "type": "NAMI", + "version": "8.2.13-10" + }, + "symfony": { + "arch": "amd64", + "distro": "debian-11", + "type": "NAMI", + "version": "6.4.1-0" + } +} \ No newline at end of file diff --git a/bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt new file mode 100644 index 0000000000000..76956b38e82c6 --- /dev/null +++ b/bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt @@ -0,0 +1,2 @@ +Bitnami containers ship with software bundles. You can find the licenses under: +/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh new file mode 100644 index 0000000000000..3853c789b2ea1 --- /dev/null +++ b/bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -0,0 +1,53 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +# +# Bitnami custom library + +# shellcheck disable=SC1091 + +# Load Generic Libraries +. /opt/bitnami/scripts/liblog.sh + +# Constants +BOLD='\033[1m' + +# Functions + +######################## +# Print the welcome page +# Globals: +# DISABLE_WELCOME_MESSAGE +# BITNAMI_APP_NAME +# Arguments: +# None +# Returns: +# None +######################### +print_welcome_page() { + if [[ -z "${DISABLE_WELCOME_MESSAGE:-}" ]]; then + if [[ -n "$BITNAMI_APP_NAME" ]]; then + print_image_welcome_page + fi + fi +} + +######################## +# Print the welcome page for a Bitnami Docker image +# Globals: +# BITNAMI_APP_NAME +# Arguments: +# None +# Returns: +# None +######################### +print_image_welcome_page() { + local github_url="https://github.com/bitnami/containers" + + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" +} + diff --git a/bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh similarity index 100% rename from bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh rename to bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh diff --git a/bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh similarity index 100% rename from bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh rename to bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh diff --git a/bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh b/bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh similarity index 100% rename from bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh rename to bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh diff --git a/bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh similarity index 100% rename from bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh rename to bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh diff --git a/bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh similarity index 100% rename from bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh rename to bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh diff --git a/bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh similarity index 100% rename from bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh rename to bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh diff --git a/bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh similarity index 100% rename from bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh rename to bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh diff --git a/bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh similarity index 100% rename from bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh rename to bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh diff --git a/bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh similarity index 100% rename from bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh rename to bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh diff --git a/bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh similarity index 100% rename from bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh rename to bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh diff --git a/bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh similarity index 100% rename from bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh rename to bitnami/symfony/6.4/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh diff --git a/bitnami/symfony/6.4/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/symfony/6.4/debian-11/prebuildfs/usr/sbin/install_packages new file mode 100755 index 0000000000000..acbc3173208c0 --- /dev/null +++ b/bitnami/symfony/6.4/debian-11/prebuildfs/usr/sbin/install_packages @@ -0,0 +1,27 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -eu + +n=0 +max=2 +export DEBIAN_FRONTEND=noninteractive + +until [ $n -gt $max ]; do + set +e + ( + apt-get update -qq && + apt-get install -y --no-install-recommends "$@" + ) + CODE=$? + set -e + if [ $CODE -eq 0 ]; then + break + fi + if [ $n -eq $max ]; then + exit $CODE + fi + echo "apt failed, retrying" + n=$(($n + 1)) +done +apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/symfony/6.4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/symfony/6.4/debian-11/prebuildfs/usr/sbin/run-script new file mode 100755 index 0000000000000..b7a5bf1e50bff --- /dev/null +++ b/bitnami/symfony/6.4/debian-11/prebuildfs/usr/sbin/run-script @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -u + +if [ $# -eq 0 ]; then + >&2 echo "No arguments provided" + exit 1 +fi + +script=$1 +exit_code="${2:-96}" +fail_if_not_present="${3:-y}" + +if test -f "$script"; then + sh $script + + if [ $? -ne 0 ]; then + exit $((exit_code)) + fi +elif [ "$fail_if_not_present" = "y" ]; then + >&2 echo "script not found: $script" + exit 127 +fi diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh rename to bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/libphp.sh b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/libphp.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/libphp.sh rename to bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/libphp.sh diff --git a/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/libsymfony.sh b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/libsymfony.sh new file mode 100644 index 0000000000000..13e4cd4f9d517 --- /dev/null +++ b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/libsymfony.sh @@ -0,0 +1,151 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +# +# Bitnami Symfony library + +# shellcheck disable=SC1091 + +# Load Generic Libraries +. /opt/bitnami/scripts/libfs.sh +. /opt/bitnami/scripts/liblog.sh +. /opt/bitnami/scripts/libnet.sh +. /opt/bitnami/scripts/libos.sh +. /opt/bitnami/scripts/libservice.sh +. /opt/bitnami/scripts/libvalidations.sh + +# Load database library +. /opt/bitnami/scripts/libmysqlclient.sh + +######################## +# Validate settings in SYMFONY_* env vars +# Globals: +# SYMFONY_* +# Arguments: +# None +# Returns: +# None +######################### +symfony_validate() { + info "Validating settings in SYMFONY_* environment variables..." + local error_code=0 + + # Auxiliary functions + print_validation_error() { + error "$1" + error_code=1 + } + check_empty_value() { + if is_empty_value "${!1}"; then + print_validation_error "${1} must be set" + fi + } + check_yes_no_value() { + if ! is_yes_no_value "${!1}" && ! is_true_false_value "${!1}"; then + print_validation_error "The allowed values for ${1} are: yes no" + fi + } + check_resolved_hostname() { + if ! is_hostname_resolved "$1"; then + warn "Hostname ${1} could not be resolved, this could lead to connection issues" + fi + } + check_valid_port() { + local port_var="${1:?missing port variable}" + local err + if ! err="$(validate_port "${!port_var}")"; then + print_validation_error "An invalid port was specified in the environment variable ${port_var}: ${err}." + fi + } + + # Validate user inputs + check_yes_no_value "SYMFONY_SKIP_DATABASE" + check_empty_value "SYMFONY_PROJECT_SKELETON" + + # Database configuration validations + check_resolved_hostname "$SYMFONY_DATABASE_HOST" + check_valid_port "SYMFONY_DATABASE_PORT_NUMBER" + # Validate credentials + if is_boolean_yes "${ALLOW_EMPTY_PASSWORD:-}"; then + warn "You set the environment variable ALLOW_EMPTY_PASSWORD=${ALLOW_EMPTY_PASSWORD:-}. For safety reasons, do not use this flag in a production environment." + else + is_empty_value "$SYMFONY_DATABASE_PASSWORD" && print_validation_error "The SYMFONY_DATABASE_PASSWORD environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow a blank password. This is only recommended for development environments." + fi + + return "$error_code" +} + +######################## +# Ensure the Symfony app is initialized +# Globals: +# None +# Arguments: +# None +# Returns: +# None +######################### +symfony_initialize() { + # Devlopers use the /app mountpoint + if is_dir_empty "/app"; then + if [[ -d "${SYMFONY_BASE_DIR}/$(basename "$SYMFONY_PROJECT_SKELETON")" ]]; then + info "Copying ${SYMFONY_PROJECT_SKELETON} project files to /app" + cp -Lr --preserve=links "${SYMFONY_BASE_DIR}/$(basename "$SYMFONY_PROJECT_SKELETON")"/. /app + else + info "Creating $SYMFONY_PROJECT_SKELETON project at /app" + debug_execute composer create-project "$SYMFONY_PROJECT_SKELETON" /app + fi + # We skip the database configuration if it's explicitly mentioned or + # the skeleton for microservices/API(s) was chosen + if is_boolean_yes "$SYMFONY_SKIP_DATABASE"; then + info "Skipping database configuration" + else + info "Trying to connect to the database server" + symfony_wait_for_mysql_connection "$SYMFONY_DATABASE_HOST" "$SYMFONY_DATABASE_PORT_NUMBER" "$SYMFONY_DATABASE_NAME" "$SYMFONY_DATABASE_USER" "$SYMFONY_DATABASE_PASSWORD" + # The 'symfony/website-skeleton' already includes the Doctrine libraries + if [[ "$SYMFONY_PROJECT_SKELETON" != "symfony/website-skeleton" ]]; then + info "Trying to install required Symfony packs" + # Install Doctrine libraries, see https://symfony.com/doc/current/doctrine.html + # The command below could fail if there are incompatibilities between the + # symfony project and orm-pack, let's allow it to fail + debug_execute composer require symfony/orm-pack -d /app || true + fi + local credentials="$SYMFONY_DATABASE_USER" + [[ -n "$SYMFONY_DATABASE_PASSWORD" ]] && credentials+=":$SYMFONY_DATABASE_PASSWORD" + echo "DATABASE_URL=mysql://${credentials}@${SYMFONY_DATABASE_HOST}:${SYMFONY_DATABASE_PORT_NUMBER}/${SYMFONY_DATABASE_NAME}" >> "/app/.env" + fi + else + info "An existing project was detected, skipping project creation" + fi + + # Avoid exit code of previous commands to affect the result of this function + true +} + +######################## +# Wait until the database is accessible with the currently-known credentials +# Globals: +# * +# Arguments: +# $1 - database host +# $2 - database port +# $3 - database name +# $4 - database username +# $5 - database user password (optional) +# Returns: +# true if the database connection succeeded, false otherwise +######################### +symfony_wait_for_mysql_connection() { + local -r db_host="${1:?missing database host}" + local -r db_port="${2:?missing database port}" + local -r db_name="${3:?missing database name}" + local -r db_user="${4:?missing database user}" + local -r db_pass="${5:-}" + debug "Tring to access MariaDB with this info: $db_host $db_port $db_name $db_user $db_pass" + check_mysql_connection() { + echo "SELECT 1" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" + } + if ! retry_while "check_mysql_connection"; then + error "Could not connect to the database" + return 1 + fi +} diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/mysql-client-env.sh b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/mysql-client-env.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/mysql-client-env.sh rename to bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/mysql-client-env.sh diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/mysql-client/postunpack.sh b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/mysql-client/postunpack.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/mysql-client/postunpack.sh rename to bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/mysql-client/postunpack.sh diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/mysql-client/setup.sh b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/mysql-client/setup.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/mysql-client/setup.sh rename to bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/mysql-client/setup.sh diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/php-env.sh b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/php-env.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/php-env.sh rename to bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/php-env.sh diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/php/postunpack.sh b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/php/postunpack.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/php/postunpack.sh rename to bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/php/postunpack.sh diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/php/reload.sh b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/php/reload.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/php/reload.sh rename to bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/php/reload.sh diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/php/restart.sh b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/php/restart.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/php/restart.sh rename to bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/php/restart.sh diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/php/run.sh b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/php/run.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/php/run.sh rename to bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/php/run.sh diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/php/setup.sh b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/php/setup.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/php/setup.sh rename to bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/php/setup.sh diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/php/start.sh b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/php/start.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/php/start.sh rename to bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/php/start.sh diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/php/status.sh b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/php/status.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/php/status.sh rename to bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/php/status.sh diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/php/stop.sh b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/php/stop.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/php/stop.sh rename to bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/php/stop.sh diff --git a/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh new file mode 100644 index 0000000000000..b55f27fc4ea80 --- /dev/null +++ b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh @@ -0,0 +1,75 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +# +# Environment configuration for symfony + +# The values for all environment variables will be set in the below order of precedence +# 1. Custom environment variables defined below after Bitnami defaults +# 2. Constants defined in this file (environment variables with no default), i.e. BITNAMI_ROOT_DIR +# 3. Environment variables overridden via external files using *_FILE variables (see below) +# 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata) + +# Load logging library +# shellcheck disable=SC1090,SC1091 +. /opt/bitnami/scripts/liblog.sh + +export BITNAMI_ROOT_DIR="/opt/bitnami" +export BITNAMI_VOLUME_DIR="/bitnami" + +# Logging configuration +export MODULE="${MODULE:-symfony}" +export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}" + +# By setting an environment variable matching *_FILE to a file path, the prefixed environment +# variable will be overridden with the value specified in that file +symfony_env_vars=( + SYMFONY_PORT_NUMBER + SYMFONY_SKIP_DATABASE + SYMFONY_PROJECT_SKELETON + SYMFONY_DATABASE_HOST + SYMFONY_DATABASE_PORT_NUMBER + SYMFONY_DATABASE_NAME + SYMFONY_DATABASE_USER + SYMFONY_DATABASE_PASSWORD + MARIADB_HOST + MARIADB_PORT_NUMBER + MARIADB_DATABASE_NAME + MARIADB_DATABASE_USER + MARIADB_DATABASE_PASSWORD +) +for env_var in "${symfony_env_vars[@]}"; do + file_env_var="${env_var}_FILE" + if [[ -n "${!file_env_var:-}" ]]; then + if [[ -r "${!file_env_var:-}" ]]; then + export "${env_var}=$(< "${!file_env_var}")" + unset "${file_env_var}" + else + warn "Skipping export of '${env_var}'. '${!file_env_var:-}' is not readable." + fi + fi +done +unset symfony_env_vars + +# Paths +export SYMFONY_BASE_DIR="${BITNAMI_ROOT_DIR}/symfony" +export SYMFONY_SKELETON_DIR="${SYMFONY_BASE_DIR}/skeleton" + +# Symfony configuration +export SYMFONY_PORT_NUMBER="${SYMFONY_PORT_NUMBER:-8000}" +export SYMFONY_SKIP_DATABASE="${SYMFONY_SKIP_DATABASE:-no}" # only used during the first initialization +export SYMFONY_PROJECT_SKELETON="${SYMFONY_PROJECT_SKELETON:-}" + +# Database configuration +SYMFONY_DATABASE_HOST="${SYMFONY_DATABASE_HOST:-"${MARIADB_HOST:-}"}" +export SYMFONY_DATABASE_HOST="${SYMFONY_DATABASE_HOST:-mariadb}" # only used during the first initialization +SYMFONY_DATABASE_PORT_NUMBER="${SYMFONY_DATABASE_PORT_NUMBER:-"${MARIADB_PORT_NUMBER:-}"}" +export SYMFONY_DATABASE_PORT_NUMBER="${SYMFONY_DATABASE_PORT_NUMBER:-3306}" # only used during the first initialization +SYMFONY_DATABASE_NAME="${SYMFONY_DATABASE_NAME:-"${MARIADB_DATABASE_NAME:-}"}" +export SYMFONY_DATABASE_NAME="${SYMFONY_DATABASE_NAME:-bitnami_myapp}" # only used during the first initialization +SYMFONY_DATABASE_USER="${SYMFONY_DATABASE_USER:-"${MARIADB_DATABASE_USER:-}"}" +export SYMFONY_DATABASE_USER="${SYMFONY_DATABASE_USER:-bn_myapp}" # only used during the first initialization +SYMFONY_DATABASE_PASSWORD="${SYMFONY_DATABASE_PASSWORD:-"${MARIADB_DATABASE_PASSWORD:-}"}" +export SYMFONY_DATABASE_PASSWORD="${SYMFONY_DATABASE_PASSWORD:-}" # only used during the first initialization + +# Custom environment variables may be defined below diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/drupal/entrypoint.sh b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/symfony/entrypoint.sh similarity index 50% rename from bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/drupal/entrypoint.sh rename to bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/symfony/entrypoint.sh index 1baf33372eb76..10f5f85c040c1 100755 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/drupal/entrypoint.sh +++ b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/symfony/entrypoint.sh @@ -9,24 +9,22 @@ set -o nounset set -o pipefail # set -o xtrace # Uncomment this line for debugging purposes -# Load Drupal environment -. /opt/bitnami/scripts/drupal-env.sh - # Load libraries . /opt/bitnami/scripts/libbitnami.sh . /opt/bitnami/scripts/liblog.sh -. /opt/bitnami/scripts/libwebserver.sh +. /opt/bitnami/scripts/libos.sh + +# Load Symfony environment +. /opt/bitnami/scripts/symfony-env.sh print_welcome_page -if [[ "$1" = "/opt/bitnami/scripts/$(web_server_type)/run.sh" || "$1" = "/opt/bitnami/scripts/nginx-php-fpm/run.sh" ]]; then - info "** Starting Drupal setup **" - /opt/bitnami/scripts/"$(web_server_type)"/setup.sh +if [[ "$*" = *"/opt/bitnami/scripts/symfony/run.sh"* ]]; then + info "** Running Symfony setup **" /opt/bitnami/scripts/php/setup.sh /opt/bitnami/scripts/mysql-client/setup.sh - /opt/bitnami/scripts/drupal/setup.sh - /post-init.sh - info "** Drupal setup finished! **" + /opt/bitnami/scripts/symfony/setup.sh + info "** Symfony setup finished! **" fi echo "" diff --git a/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/symfony/postunpack.sh b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/symfony/postunpack.sh new file mode 100755 index 0000000000000..0b971ca484da5 --- /dev/null +++ b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/symfony/postunpack.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libsymfony.sh +. /opt/bitnami/scripts/libfs.sh +. /opt/bitnami/scripts/libos.sh + +# Load Symfony environment +. /opt/bitnami/scripts/symfony-env.sh + +# Ensure required directories exist +chmod g+rwX "$SYMFONY_BASE_DIR" +for dir in "/app" "$SYMFONY_SKELETON_DIR"; do + ensure_dir_exists "$dir" + configure_permissions_ownership "$dir" -d "775" -f "664" +done diff --git a/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/symfony/run.sh b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/symfony/run.sh new file mode 100755 index 0000000000000..f396deece71cb --- /dev/null +++ b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/symfony/run.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libsymfony.sh +. /opt/bitnami/scripts/liblog.sh +. /opt/bitnami/scripts/libservice.sh + +# Load Symfony environment +. /opt/bitnami/scripts/symfony-env.sh + +cd /app + +declare -a start_flags=("-S" "0.0.0.0:${SYMFONY_PORT_NUMBER}" "-t" "/app/public") +start_flags+=("$@") + +info "** Starting Symfony project **" +php "${start_flags[@]}" diff --git a/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/symfony/setup.sh b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/symfony/setup.sh new file mode 100755 index 0000000000000..f6ba998319ee3 --- /dev/null +++ b/bitnami/symfony/6.4/debian-11/rootfs/opt/bitnami/scripts/symfony/setup.sh @@ -0,0 +1,28 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libsymfony.sh + +# Load Symfony environment +. /opt/bitnami/scripts/symfony-env.sh + +# Load MySQL Client environment for 'mysql_remote_execute' (after 'symfony-env.sh' so that MODULE is not set to a wrong value) +. /opt/bitnami/scripts/mysql-client-env.sh + +# Ensure Symfony environment variables are valid +symfony_validate + +# Ensure Symfony app is initialized +symfony_initialize + +# Ensure all folders in /app are writable by the non-root "bitnami" user +chown -R bitnami:bitnami /app diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/post-init.d/php.sh b/bitnami/symfony/6.4/debian-11/rootfs/post-init.d/php.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/rootfs/post-init.d/php.sh rename to bitnami/symfony/6.4/debian-11/rootfs/post-init.d/php.sh diff --git a/bitnami/drupal/9/debian-11/rootfs/post-init.d/shell.sh b/bitnami/symfony/6.4/debian-11/rootfs/post-init.d/shell.sh similarity index 100% rename from bitnami/drupal/9/debian-11/rootfs/post-init.d/shell.sh rename to bitnami/symfony/6.4/debian-11/rootfs/post-init.d/shell.sh diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/post-init.d/sql-mysql.sh b/bitnami/symfony/6.4/debian-11/rootfs/post-init.d/sql-mysql.sh similarity index 100% rename from bitnami/drupal-nginx/9/debian-11/rootfs/post-init.d/sql-mysql.sh rename to bitnami/symfony/6.4/debian-11/rootfs/post-init.d/sql-mysql.sh diff --git a/bitnami/drupal/9/debian-11/rootfs/post-init.sh b/bitnami/symfony/6.4/debian-11/rootfs/post-init.sh similarity index 65% rename from bitnami/drupal/9/debian-11/rootfs/post-init.sh rename to bitnami/symfony/6.4/debian-11/rootfs/post-init.sh index 797987212cc50..8d27681c4c708 100755 --- a/bitnami/drupal/9/debian-11/rootfs/post-init.sh +++ b/bitnami/symfony/6.4/debian-11/rootfs/post-init.sh @@ -10,10 +10,10 @@ set -o pipefail # set -o xtrace # Uncomment this line for debugging purposes # Only execute init scripts once -if [[ ! -f "/bitnami/drupal/.user_scripts_initialized" && -d "/docker-entrypoint-init.d" ]]; then +if [[ ! -f "/bitnami/symfony/.user_scripts_initialized" && -d "/docker-entrypoint-init.d" ]]; then read -r -a init_scripts <<< "$(find "/docker-entrypoint-init.d" -type f -print0 | sort -z | xargs -0)" - if [[ "${#init_scripts[@]}" -gt 0 ]] && [[ ! -f "/bitnami/drupal/.user_scripts_initialized" ]]; then - mkdir -p "/bitnami/drupal" + if [[ "${#init_scripts[@]}" -gt 0 ]] && [[ ! -f "/bitnami/symfony/.user_scripts_initialized" ]]; then + mkdir -p "/bitnami/symfony" for init_script in "${init_scripts[@]}"; do for init_script_type_handler in /post-init.d/*.sh; do "$init_script_type_handler" "$init_script" @@ -21,5 +21,5 @@ if [[ ! -f "/bitnami/drupal/.user_scripts_initialized" && -d "/docker-entrypoint done fi - touch "/bitnami/drupal/.user_scripts_initialized" + touch "/bitnami/symfony/.user_scripts_initialized" fi diff --git a/bitnami/symfony/6.4/debian-11/tags-info.yaml b/bitnami/symfony/6.4/debian-11/tags-info.yaml new file mode 100644 index 0000000000000..5f00c1bd27c21 --- /dev/null +++ b/bitnami/symfony/6.4/debian-11/tags-info.yaml @@ -0,0 +1,4 @@ +rolling-tags: +- "6.4" +- 6.4-debian-11 +- 6.4.1 diff --git a/bitnami/symfony/7.0/debian-11/Dockerfile b/bitnami/symfony/7.0/debian-11/Dockerfile new file mode 100644 index 0000000000000..fbf98751ef4ea --- /dev/null +++ b/bitnami/symfony/7.0/debian-11/Dockerfile @@ -0,0 +1,59 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +FROM docker.io/bitnami/minideb:bullseye + +ARG TARGETARCH + +LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-12-12T18:26:32Z" \ + org.opencontainers.image.description="Application packaged by VMware, Inc" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.ref.name="7.0.1-debian-11-r0" \ + org.opencontainers.image.title="symfony" \ + org.opencontainers.image.vendor="VMware, Inc." \ + org.opencontainers.image.version="7.0.1" + +ENV OS_ARCH="${TARGETARCH:-amd64}" \ + OS_FLAVOUR="debian-11" \ + OS_NAME="linux" + +COPY prebuildfs / +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] +# Install required system packages and dependencies +RUN install_packages ca-certificates curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps sudo zlib1g +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ + COMPONENTS=( \ + "php-8.2.13-10-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.11.6-0-linux-${OS_ARCH}-debian-11" \ + "symfony-7.0.1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ + for COMPONENT in "${COMPONENTS[@]}"; do \ + if [ ! -f "${COMPONENT}.tar.gz" ]; then \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ + rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ + done +RUN apt-get autoremove --purge -y curl && \ + apt-get update && apt-get upgrade -y && \ + apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives +RUN /build/bitnami-user.sh + +COPY rootfs / +RUN /opt/bitnami/scripts/mysql-client/postunpack.sh +RUN /opt/bitnami/scripts/php/postunpack.sh +RUN /opt/bitnami/scripts/symfony/postunpack.sh +ENV APP_VERSION="7.0.1" \ + BITNAMI_APP_NAME="symfony" \ + PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/mysql/bin:/opt/bitnami/symfony/bin:$PATH" \ + PHP_ENABLE_OPCACHE="0" + +EXPOSE 8000 + +WORKDIR /app +ENTRYPOINT [ "/opt/bitnami/scripts/symfony/entrypoint.sh" ] +CMD [ "/opt/bitnami/scripts/symfony/run.sh" ] diff --git a/bitnami/symfony/7.0/debian-11/docker-compose.yml b/bitnami/symfony/7.0/debian-11/docker-compose.yml new file mode 100644 index 0000000000000..98632c8c94a61 --- /dev/null +++ b/bitnami/symfony/7.0/debian-11/docker-compose.yml @@ -0,0 +1,30 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +version: '2' + +services: + mariadb: + image: docker.io/bitnami/mariadb:11.1 + environment: + # ALLOW_EMPTY_PASSWORD is recommended only for development. + - ALLOW_EMPTY_PASSWORD=yes + - MARIADB_USER=bn_myapp + - MARIADB_DATABASE=bitnami_myapp + myapp: + image: docker.io/bitnami/symfony:7.0 + ports: + - '8000:8000' + environment: + # ALLOW_EMPTY_PASSWORD is recommended only for development. + - ALLOW_EMPTY_PASSWORD=yes + - SYMFONY_DATABASE_HOST=mariadb + - SYMFONY_DATABASE_PORT_NUMBER=3306 + - SYMFONY_DATABASE_USER=bn_myapp + - SYMFONY_DATABASE_NAME=bitnami_myapp + - SYMFONY_PROJECT_SKELETON=symfony/skeleton + volumes: + - './my-project:/app' + depends_on: + - mariadb + diff --git a/bitnami/symfony/7.0/debian-11/prebuildfs/build/bitnami-user.sh b/bitnami/symfony/7.0/debian-11/prebuildfs/build/bitnami-user.sh new file mode 100755 index 0000000000000..45dcdc0bab290 --- /dev/null +++ b/bitnami/symfony/7.0/debian-11/prebuildfs/build/bitnami-user.sh @@ -0,0 +1,8 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +useradd -ms /bin/bash bitnami +mkdir -p /opt/bitnami +sed -i -e 's/\s*Defaults\s*secure_path\s*=/# Defaults secure_path=/' /etc/sudoers +echo 'bitnami ALL=NOPASSWD: ALL' >> /etc/sudoers diff --git a/bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json new file mode 100644 index 0000000000000..cc3929c14e045 --- /dev/null +++ b/bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -0,0 +1,20 @@ +{ + "mysql-client": { + "arch": "amd64", + "distro": "debian-11", + "type": "NAMI", + "version": "10.11.6-0" + }, + "php": { + "arch": "amd64", + "distro": "debian-11", + "type": "NAMI", + "version": "8.2.13-10" + }, + "symfony": { + "arch": "amd64", + "distro": "debian-11", + "type": "NAMI", + "version": "7.0.1-0" + } +} \ No newline at end of file diff --git a/bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt new file mode 100644 index 0000000000000..76956b38e82c6 --- /dev/null +++ b/bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt @@ -0,0 +1,2 @@ +Bitnami containers ship with software bundles. You can find the licenses under: +/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh new file mode 100644 index 0000000000000..3853c789b2ea1 --- /dev/null +++ b/bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -0,0 +1,53 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +# +# Bitnami custom library + +# shellcheck disable=SC1091 + +# Load Generic Libraries +. /opt/bitnami/scripts/liblog.sh + +# Constants +BOLD='\033[1m' + +# Functions + +######################## +# Print the welcome page +# Globals: +# DISABLE_WELCOME_MESSAGE +# BITNAMI_APP_NAME +# Arguments: +# None +# Returns: +# None +######################### +print_welcome_page() { + if [[ -z "${DISABLE_WELCOME_MESSAGE:-}" ]]; then + if [[ -n "$BITNAMI_APP_NAME" ]]; then + print_image_welcome_page + fi + fi +} + +######################## +# Print the welcome page for a Bitnami Docker image +# Globals: +# BITNAMI_APP_NAME +# Arguments: +# None +# Returns: +# None +######################### +print_image_welcome_page() { + local github_url="https://github.com/bitnami/containers" + + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" +} + diff --git a/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh similarity index 100% rename from bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh rename to bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh diff --git a/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh similarity index 100% rename from bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh rename to bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh diff --git a/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh b/bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh similarity index 100% rename from bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh rename to bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh diff --git a/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh similarity index 100% rename from bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh rename to bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh diff --git a/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh similarity index 100% rename from bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh rename to bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh diff --git a/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh similarity index 100% rename from bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh rename to bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh diff --git a/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh similarity index 100% rename from bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh rename to bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh diff --git a/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh similarity index 100% rename from bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh rename to bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh diff --git a/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh similarity index 100% rename from bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh rename to bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh diff --git a/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh similarity index 100% rename from bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh rename to bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh diff --git a/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh similarity index 100% rename from bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh rename to bitnami/symfony/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh diff --git a/bitnami/symfony/7.0/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/symfony/7.0/debian-11/prebuildfs/usr/sbin/install_packages new file mode 100755 index 0000000000000..acbc3173208c0 --- /dev/null +++ b/bitnami/symfony/7.0/debian-11/prebuildfs/usr/sbin/install_packages @@ -0,0 +1,27 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -eu + +n=0 +max=2 +export DEBIAN_FRONTEND=noninteractive + +until [ $n -gt $max ]; do + set +e + ( + apt-get update -qq && + apt-get install -y --no-install-recommends "$@" + ) + CODE=$? + set -e + if [ $CODE -eq 0 ]; then + break + fi + if [ $n -eq $max ]; then + exit $CODE + fi + echo "apt failed, retrying" + n=$(($n + 1)) +done +apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/symfony/7.0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/symfony/7.0/debian-11/prebuildfs/usr/sbin/run-script new file mode 100755 index 0000000000000..b7a5bf1e50bff --- /dev/null +++ b/bitnami/symfony/7.0/debian-11/prebuildfs/usr/sbin/run-script @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -u + +if [ $# -eq 0 ]; then + >&2 echo "No arguments provided" + exit 1 +fi + +script=$1 +exit_code="${2:-96}" +fail_if_not_present="${3:-y}" + +if test -f "$script"; then + sh $script + + if [ $? -ne 0 ]; then + exit $((exit_code)) + fi +elif [ "$fail_if_not_present" = "y" ]; then + >&2 echo "script not found: $script" + exit 127 +fi diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh similarity index 100% rename from bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh rename to bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/libphp.sh b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/libphp.sh similarity index 100% rename from bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/libphp.sh rename to bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/libphp.sh diff --git a/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/libsymfony.sh b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/libsymfony.sh new file mode 100644 index 0000000000000..13e4cd4f9d517 --- /dev/null +++ b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/libsymfony.sh @@ -0,0 +1,151 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +# +# Bitnami Symfony library + +# shellcheck disable=SC1091 + +# Load Generic Libraries +. /opt/bitnami/scripts/libfs.sh +. /opt/bitnami/scripts/liblog.sh +. /opt/bitnami/scripts/libnet.sh +. /opt/bitnami/scripts/libos.sh +. /opt/bitnami/scripts/libservice.sh +. /opt/bitnami/scripts/libvalidations.sh + +# Load database library +. /opt/bitnami/scripts/libmysqlclient.sh + +######################## +# Validate settings in SYMFONY_* env vars +# Globals: +# SYMFONY_* +# Arguments: +# None +# Returns: +# None +######################### +symfony_validate() { + info "Validating settings in SYMFONY_* environment variables..." + local error_code=0 + + # Auxiliary functions + print_validation_error() { + error "$1" + error_code=1 + } + check_empty_value() { + if is_empty_value "${!1}"; then + print_validation_error "${1} must be set" + fi + } + check_yes_no_value() { + if ! is_yes_no_value "${!1}" && ! is_true_false_value "${!1}"; then + print_validation_error "The allowed values for ${1} are: yes no" + fi + } + check_resolved_hostname() { + if ! is_hostname_resolved "$1"; then + warn "Hostname ${1} could not be resolved, this could lead to connection issues" + fi + } + check_valid_port() { + local port_var="${1:?missing port variable}" + local err + if ! err="$(validate_port "${!port_var}")"; then + print_validation_error "An invalid port was specified in the environment variable ${port_var}: ${err}." + fi + } + + # Validate user inputs + check_yes_no_value "SYMFONY_SKIP_DATABASE" + check_empty_value "SYMFONY_PROJECT_SKELETON" + + # Database configuration validations + check_resolved_hostname "$SYMFONY_DATABASE_HOST" + check_valid_port "SYMFONY_DATABASE_PORT_NUMBER" + # Validate credentials + if is_boolean_yes "${ALLOW_EMPTY_PASSWORD:-}"; then + warn "You set the environment variable ALLOW_EMPTY_PASSWORD=${ALLOW_EMPTY_PASSWORD:-}. For safety reasons, do not use this flag in a production environment." + else + is_empty_value "$SYMFONY_DATABASE_PASSWORD" && print_validation_error "The SYMFONY_DATABASE_PASSWORD environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow a blank password. This is only recommended for development environments." + fi + + return "$error_code" +} + +######################## +# Ensure the Symfony app is initialized +# Globals: +# None +# Arguments: +# None +# Returns: +# None +######################### +symfony_initialize() { + # Devlopers use the /app mountpoint + if is_dir_empty "/app"; then + if [[ -d "${SYMFONY_BASE_DIR}/$(basename "$SYMFONY_PROJECT_SKELETON")" ]]; then + info "Copying ${SYMFONY_PROJECT_SKELETON} project files to /app" + cp -Lr --preserve=links "${SYMFONY_BASE_DIR}/$(basename "$SYMFONY_PROJECT_SKELETON")"/. /app + else + info "Creating $SYMFONY_PROJECT_SKELETON project at /app" + debug_execute composer create-project "$SYMFONY_PROJECT_SKELETON" /app + fi + # We skip the database configuration if it's explicitly mentioned or + # the skeleton for microservices/API(s) was chosen + if is_boolean_yes "$SYMFONY_SKIP_DATABASE"; then + info "Skipping database configuration" + else + info "Trying to connect to the database server" + symfony_wait_for_mysql_connection "$SYMFONY_DATABASE_HOST" "$SYMFONY_DATABASE_PORT_NUMBER" "$SYMFONY_DATABASE_NAME" "$SYMFONY_DATABASE_USER" "$SYMFONY_DATABASE_PASSWORD" + # The 'symfony/website-skeleton' already includes the Doctrine libraries + if [[ "$SYMFONY_PROJECT_SKELETON" != "symfony/website-skeleton" ]]; then + info "Trying to install required Symfony packs" + # Install Doctrine libraries, see https://symfony.com/doc/current/doctrine.html + # The command below could fail if there are incompatibilities between the + # symfony project and orm-pack, let's allow it to fail + debug_execute composer require symfony/orm-pack -d /app || true + fi + local credentials="$SYMFONY_DATABASE_USER" + [[ -n "$SYMFONY_DATABASE_PASSWORD" ]] && credentials+=":$SYMFONY_DATABASE_PASSWORD" + echo "DATABASE_URL=mysql://${credentials}@${SYMFONY_DATABASE_HOST}:${SYMFONY_DATABASE_PORT_NUMBER}/${SYMFONY_DATABASE_NAME}" >> "/app/.env" + fi + else + info "An existing project was detected, skipping project creation" + fi + + # Avoid exit code of previous commands to affect the result of this function + true +} + +######################## +# Wait until the database is accessible with the currently-known credentials +# Globals: +# * +# Arguments: +# $1 - database host +# $2 - database port +# $3 - database name +# $4 - database username +# $5 - database user password (optional) +# Returns: +# true if the database connection succeeded, false otherwise +######################### +symfony_wait_for_mysql_connection() { + local -r db_host="${1:?missing database host}" + local -r db_port="${2:?missing database port}" + local -r db_name="${3:?missing database name}" + local -r db_user="${4:?missing database user}" + local -r db_pass="${5:-}" + debug "Tring to access MariaDB with this info: $db_host $db_port $db_name $db_user $db_pass" + check_mysql_connection() { + echo "SELECT 1" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" + } + if ! retry_while "check_mysql_connection"; then + error "Could not connect to the database" + return 1 + fi +} diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/mysql-client-env.sh b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/mysql-client-env.sh similarity index 100% rename from bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/mysql-client-env.sh rename to bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/mysql-client-env.sh diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/mysql-client/postunpack.sh b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/mysql-client/postunpack.sh similarity index 100% rename from bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/mysql-client/postunpack.sh rename to bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/mysql-client/postunpack.sh diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/mysql-client/setup.sh b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/mysql-client/setup.sh similarity index 100% rename from bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/mysql-client/setup.sh rename to bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/mysql-client/setup.sh diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/php-env.sh b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/php-env.sh similarity index 100% rename from bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/php-env.sh rename to bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/php-env.sh diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/php/postunpack.sh b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/php/postunpack.sh similarity index 100% rename from bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/php/postunpack.sh rename to bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/php/postunpack.sh diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/php/reload.sh b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/php/reload.sh similarity index 100% rename from bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/php/reload.sh rename to bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/php/reload.sh diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/php/restart.sh b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/php/restart.sh similarity index 100% rename from bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/php/restart.sh rename to bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/php/restart.sh diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/php/run.sh b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/php/run.sh similarity index 100% rename from bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/php/run.sh rename to bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/php/run.sh diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/php/setup.sh b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/php/setup.sh similarity index 100% rename from bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/php/setup.sh rename to bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/php/setup.sh diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/php/start.sh b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/php/start.sh similarity index 100% rename from bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/php/start.sh rename to bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/php/start.sh diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/php/status.sh b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/php/status.sh similarity index 100% rename from bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/php/status.sh rename to bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/php/status.sh diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/php/stop.sh b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/php/stop.sh similarity index 100% rename from bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/php/stop.sh rename to bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/php/stop.sh diff --git a/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh new file mode 100644 index 0000000000000..b55f27fc4ea80 --- /dev/null +++ b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh @@ -0,0 +1,75 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +# +# Environment configuration for symfony + +# The values for all environment variables will be set in the below order of precedence +# 1. Custom environment variables defined below after Bitnami defaults +# 2. Constants defined in this file (environment variables with no default), i.e. BITNAMI_ROOT_DIR +# 3. Environment variables overridden via external files using *_FILE variables (see below) +# 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata) + +# Load logging library +# shellcheck disable=SC1090,SC1091 +. /opt/bitnami/scripts/liblog.sh + +export BITNAMI_ROOT_DIR="/opt/bitnami" +export BITNAMI_VOLUME_DIR="/bitnami" + +# Logging configuration +export MODULE="${MODULE:-symfony}" +export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}" + +# By setting an environment variable matching *_FILE to a file path, the prefixed environment +# variable will be overridden with the value specified in that file +symfony_env_vars=( + SYMFONY_PORT_NUMBER + SYMFONY_SKIP_DATABASE + SYMFONY_PROJECT_SKELETON + SYMFONY_DATABASE_HOST + SYMFONY_DATABASE_PORT_NUMBER + SYMFONY_DATABASE_NAME + SYMFONY_DATABASE_USER + SYMFONY_DATABASE_PASSWORD + MARIADB_HOST + MARIADB_PORT_NUMBER + MARIADB_DATABASE_NAME + MARIADB_DATABASE_USER + MARIADB_DATABASE_PASSWORD +) +for env_var in "${symfony_env_vars[@]}"; do + file_env_var="${env_var}_FILE" + if [[ -n "${!file_env_var:-}" ]]; then + if [[ -r "${!file_env_var:-}" ]]; then + export "${env_var}=$(< "${!file_env_var}")" + unset "${file_env_var}" + else + warn "Skipping export of '${env_var}'. '${!file_env_var:-}' is not readable." + fi + fi +done +unset symfony_env_vars + +# Paths +export SYMFONY_BASE_DIR="${BITNAMI_ROOT_DIR}/symfony" +export SYMFONY_SKELETON_DIR="${SYMFONY_BASE_DIR}/skeleton" + +# Symfony configuration +export SYMFONY_PORT_NUMBER="${SYMFONY_PORT_NUMBER:-8000}" +export SYMFONY_SKIP_DATABASE="${SYMFONY_SKIP_DATABASE:-no}" # only used during the first initialization +export SYMFONY_PROJECT_SKELETON="${SYMFONY_PROJECT_SKELETON:-}" + +# Database configuration +SYMFONY_DATABASE_HOST="${SYMFONY_DATABASE_HOST:-"${MARIADB_HOST:-}"}" +export SYMFONY_DATABASE_HOST="${SYMFONY_DATABASE_HOST:-mariadb}" # only used during the first initialization +SYMFONY_DATABASE_PORT_NUMBER="${SYMFONY_DATABASE_PORT_NUMBER:-"${MARIADB_PORT_NUMBER:-}"}" +export SYMFONY_DATABASE_PORT_NUMBER="${SYMFONY_DATABASE_PORT_NUMBER:-3306}" # only used during the first initialization +SYMFONY_DATABASE_NAME="${SYMFONY_DATABASE_NAME:-"${MARIADB_DATABASE_NAME:-}"}" +export SYMFONY_DATABASE_NAME="${SYMFONY_DATABASE_NAME:-bitnami_myapp}" # only used during the first initialization +SYMFONY_DATABASE_USER="${SYMFONY_DATABASE_USER:-"${MARIADB_DATABASE_USER:-}"}" +export SYMFONY_DATABASE_USER="${SYMFONY_DATABASE_USER:-bn_myapp}" # only used during the first initialization +SYMFONY_DATABASE_PASSWORD="${SYMFONY_DATABASE_PASSWORD:-"${MARIADB_DATABASE_PASSWORD:-}"}" +export SYMFONY_DATABASE_PASSWORD="${SYMFONY_DATABASE_PASSWORD:-}" # only used during the first initialization + +# Custom environment variables may be defined below diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/drupal/entrypoint.sh b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/symfony/entrypoint.sh similarity index 50% rename from bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/drupal/entrypoint.sh rename to bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/symfony/entrypoint.sh index 1baf33372eb76..10f5f85c040c1 100755 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/opt/bitnami/scripts/drupal/entrypoint.sh +++ b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/symfony/entrypoint.sh @@ -9,24 +9,22 @@ set -o nounset set -o pipefail # set -o xtrace # Uncomment this line for debugging purposes -# Load Drupal environment -. /opt/bitnami/scripts/drupal-env.sh - # Load libraries . /opt/bitnami/scripts/libbitnami.sh . /opt/bitnami/scripts/liblog.sh -. /opt/bitnami/scripts/libwebserver.sh +. /opt/bitnami/scripts/libos.sh + +# Load Symfony environment +. /opt/bitnami/scripts/symfony-env.sh print_welcome_page -if [[ "$1" = "/opt/bitnami/scripts/$(web_server_type)/run.sh" || "$1" = "/opt/bitnami/scripts/nginx-php-fpm/run.sh" ]]; then - info "** Starting Drupal setup **" - /opt/bitnami/scripts/"$(web_server_type)"/setup.sh +if [[ "$*" = *"/opt/bitnami/scripts/symfony/run.sh"* ]]; then + info "** Running Symfony setup **" /opt/bitnami/scripts/php/setup.sh /opt/bitnami/scripts/mysql-client/setup.sh - /opt/bitnami/scripts/drupal/setup.sh - /post-init.sh - info "** Drupal setup finished! **" + /opt/bitnami/scripts/symfony/setup.sh + info "** Symfony setup finished! **" fi echo "" diff --git a/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/symfony/postunpack.sh b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/symfony/postunpack.sh new file mode 100755 index 0000000000000..0b971ca484da5 --- /dev/null +++ b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/symfony/postunpack.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libsymfony.sh +. /opt/bitnami/scripts/libfs.sh +. /opt/bitnami/scripts/libos.sh + +# Load Symfony environment +. /opt/bitnami/scripts/symfony-env.sh + +# Ensure required directories exist +chmod g+rwX "$SYMFONY_BASE_DIR" +for dir in "/app" "$SYMFONY_SKELETON_DIR"; do + ensure_dir_exists "$dir" + configure_permissions_ownership "$dir" -d "775" -f "664" +done diff --git a/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/symfony/run.sh b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/symfony/run.sh new file mode 100755 index 0000000000000..f396deece71cb --- /dev/null +++ b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/symfony/run.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libsymfony.sh +. /opt/bitnami/scripts/liblog.sh +. /opt/bitnami/scripts/libservice.sh + +# Load Symfony environment +. /opt/bitnami/scripts/symfony-env.sh + +cd /app + +declare -a start_flags=("-S" "0.0.0.0:${SYMFONY_PORT_NUMBER}" "-t" "/app/public") +start_flags+=("$@") + +info "** Starting Symfony project **" +php "${start_flags[@]}" diff --git a/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/symfony/setup.sh b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/symfony/setup.sh new file mode 100755 index 0000000000000..f6ba998319ee3 --- /dev/null +++ b/bitnami/symfony/7.0/debian-11/rootfs/opt/bitnami/scripts/symfony/setup.sh @@ -0,0 +1,28 @@ +#!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libsymfony.sh + +# Load Symfony environment +. /opt/bitnami/scripts/symfony-env.sh + +# Load MySQL Client environment for 'mysql_remote_execute' (after 'symfony-env.sh' so that MODULE is not set to a wrong value) +. /opt/bitnami/scripts/mysql-client-env.sh + +# Ensure Symfony environment variables are valid +symfony_validate + +# Ensure Symfony app is initialized +symfony_initialize + +# Ensure all folders in /app are writable by the non-root "bitnami" user +chown -R bitnami:bitnami /app diff --git a/bitnami/drupal/9/debian-11/rootfs/post-init.d/php.sh b/bitnami/symfony/7.0/debian-11/rootfs/post-init.d/php.sh similarity index 100% rename from bitnami/drupal/9/debian-11/rootfs/post-init.d/php.sh rename to bitnami/symfony/7.0/debian-11/rootfs/post-init.d/php.sh diff --git a/bitnami/odoo/14/debian-11/rootfs/post-init.d/shell.sh b/bitnami/symfony/7.0/debian-11/rootfs/post-init.d/shell.sh similarity index 100% rename from bitnami/odoo/14/debian-11/rootfs/post-init.d/shell.sh rename to bitnami/symfony/7.0/debian-11/rootfs/post-init.d/shell.sh diff --git a/bitnami/drupal/9/debian-11/rootfs/post-init.d/sql-mysql.sh b/bitnami/symfony/7.0/debian-11/rootfs/post-init.d/sql-mysql.sh similarity index 100% rename from bitnami/drupal/9/debian-11/rootfs/post-init.d/sql-mysql.sh rename to bitnami/symfony/7.0/debian-11/rootfs/post-init.d/sql-mysql.sh diff --git a/bitnami/drupal-nginx/9/debian-11/rootfs/post-init.sh b/bitnami/symfony/7.0/debian-11/rootfs/post-init.sh similarity index 64% rename from bitnami/drupal-nginx/9/debian-11/rootfs/post-init.sh rename to bitnami/symfony/7.0/debian-11/rootfs/post-init.sh index f5546113a2a9a..8d27681c4c708 100755 --- a/bitnami/drupal-nginx/9/debian-11/rootfs/post-init.sh +++ b/bitnami/symfony/7.0/debian-11/rootfs/post-init.sh @@ -10,10 +10,10 @@ set -o pipefail # set -o xtrace # Uncomment this line for debugging purposes # Only execute init scripts once -if [[ ! -f "/bitnami/drupal-nginx/.user_scripts_initialized" && -d "/docker-entrypoint-init.d" ]]; then +if [[ ! -f "/bitnami/symfony/.user_scripts_initialized" && -d "/docker-entrypoint-init.d" ]]; then read -r -a init_scripts <<< "$(find "/docker-entrypoint-init.d" -type f -print0 | sort -z | xargs -0)" - if [[ "${#init_scripts[@]}" -gt 0 ]] && [[ ! -f "/bitnami/drupal-nginx/.user_scripts_initialized" ]]; then - mkdir -p "/bitnami/drupal-nginx" + if [[ "${#init_scripts[@]}" -gt 0 ]] && [[ ! -f "/bitnami/symfony/.user_scripts_initialized" ]]; then + mkdir -p "/bitnami/symfony" for init_script in "${init_scripts[@]}"; do for init_script_type_handler in /post-init.d/*.sh; do "$init_script_type_handler" "$init_script" @@ -21,5 +21,5 @@ if [[ ! -f "/bitnami/drupal-nginx/.user_scripts_initialized" && -d "/docker-entr done fi - touch "/bitnami/drupal-nginx/.user_scripts_initialized" + touch "/bitnami/symfony/.user_scripts_initialized" fi diff --git a/bitnami/symfony/7.0/debian-11/tags-info.yaml b/bitnami/symfony/7.0/debian-11/tags-info.yaml new file mode 100644 index 0000000000000..3e30deb877d63 --- /dev/null +++ b/bitnami/symfony/7.0/debian-11/tags-info.yaml @@ -0,0 +1,5 @@ +rolling-tags: +- "7.0" +- 7.0-debian-11 +- 7.0.1 +- latest diff --git a/bitnami/symfony/README.md b/bitnami/symfony/README.md index 59153eae175ec..5a9a9712a56a9 100644 --- a/bitnami/symfony/README.md +++ b/bitnami/symfony/README.md @@ -1,4 +1,4 @@ -# Symfony packaged by Bitnami +# Bitnami package for Symfony ## What is Symfony? @@ -24,7 +24,7 @@ docker-compose up * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/symfony/docker-compose.yml b/bitnami/symfony/docker-compose.yml index bd1214307d82c..98632c8c94a61 100644 --- a/bitnami/symfony/docker-compose.yml +++ b/bitnami/symfony/docker-compose.yml @@ -12,7 +12,7 @@ services: - MARIADB_USER=bn_myapp - MARIADB_DATABASE=bitnami_myapp myapp: - image: docker.io/bitnami/symfony:6.3 + image: docker.io/bitnami/symfony:7.0 ports: - '8000:8000' environment: @@ -22,6 +22,7 @@ services: - SYMFONY_DATABASE_PORT_NUMBER=3306 - SYMFONY_DATABASE_USER=bn_myapp - SYMFONY_DATABASE_NAME=bitnami_myapp + - SYMFONY_PROJECT_SKELETON=symfony/skeleton volumes: - './my-project:/app' depends_on: diff --git a/bitnami/telegraf/1/debian-11/Dockerfile b/bitnami/telegraf/1/debian-11/Dockerfile index 30e16bec438ba..fd78c43b28cc8 100644 --- a/bitnami/telegraf/1/debian-11/Dockerfile +++ b/bitnami/telegraf/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-23T20:05:36Z" \ + org.opencontainers.image.created="2023-12-13T22:52:07Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.28.3-debian-11-r0" \ + org.opencontainers.image.ref.name="1.29.1-debian-11-r0" \ org.opencontainers.image.title="telegraf" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.28.3" + org.opencontainers.image.version="1.29.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "telegraf-1.28.3-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "telegraf-1.29.1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami -ENV APP_VERSION="1.28.3" \ +ENV APP_VERSION="1.29.1" \ BITNAMI_APP_NAME="telegraf" \ PATH="/opt/bitnami/telegraf/bin:$PATH" diff --git a/bitnami/telegraf/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/telegraf/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 55ce26dba153c..50e441e403100 100644 --- a/bitnami/telegraf/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/telegraf/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.28.3-0" + "version": "1.29.1-0" } } \ No newline at end of file diff --git a/bitnami/telegraf/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/telegraf/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/telegraf/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/telegraf/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/telegraf/1/debian-11/tags-info.yaml b/bitnami/telegraf/1/debian-11/tags-info.yaml index 71353dad9e740..a2ec4fbc56ce6 100644 --- a/bitnami/telegraf/1/debian-11/tags-info.yaml +++ b/bitnami/telegraf/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.28.3 +- 1.29.1 - latest diff --git a/bitnami/telegraf/README.md b/bitnami/telegraf/README.md index 2a35876cdb3f5..285f087d57668 100644 --- a/bitnami/telegraf/README.md +++ b/bitnami/telegraf/README.md @@ -1,4 +1,4 @@ -# Telegraf ™ packaged by Bitnami +# Bitnami package for Telegraf ™ ## What is Telegraf ™? @@ -18,7 +18,7 @@ docker run --name telegraf bitnami/telegraf:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/tensorflow-resnet/2/debian-11/Dockerfile b/bitnami/tensorflow-resnet/2/debian-11/Dockerfile index f352efdac9eba..c394516ba3390 100644 --- a/bitnami/tensorflow-resnet/2/debian-11/Dockerfile +++ b/bitnami/tensorflow-resnet/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-26T17:05:56Z" \ + org.opencontainers.image.created="2023-12-02T07:28:59Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.13.1-debian-11-r8" \ + org.opencontainers.image.ref.name="2.14.1-debian-11-r1" \ org.opencontainers.image.title="tensorflow-resnet" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.13.1" + org.opencontainers.image.version="2.14.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl gcc-10 libgcc-s1 libstdc++6 procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "tensorflow-resnet-2.13.1-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "tensorflow-resnet-2.14.1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ @@ -43,7 +43,7 @@ RUN chmod g+rwX /opt/bitnami RUN mkdir /.local && chmod g+rwX /.local COPY rootfs / -ENV APP_VERSION="2.13.1" \ +ENV APP_VERSION="2.14.1" \ BITNAMI_APP_NAME="tensorflow-resnet" \ PATH="/opt/bitnami/tensorflow-resnet/bin:$PATH" diff --git a/bitnami/tensorflow-resnet/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/tensorflow-resnet/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 91b6cfaa0402f..d70408d2bee9e 100644 --- a/bitnami/tensorflow-resnet/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/tensorflow-resnet/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.13.1-2" + "version": "2.14.1-0" } } \ No newline at end of file diff --git a/bitnami/tensorflow-resnet/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/tensorflow-resnet/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/tensorflow-resnet/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/tensorflow-resnet/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/tensorflow-resnet/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/tensorflow-resnet/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/tensorflow-resnet/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/tensorflow-resnet/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/tensorflow-resnet/2/debian-11/tags-info.yaml b/bitnami/tensorflow-resnet/2/debian-11/tags-info.yaml index bea6ec267a076..e57f2bd4ad985 100644 --- a/bitnami/tensorflow-resnet/2/debian-11/tags-info.yaml +++ b/bitnami/tensorflow-resnet/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.13.1 +- 2.14.1 - latest diff --git a/bitnami/tensorflow-resnet/README.md b/bitnami/tensorflow-resnet/README.md index 45b6ff20a5183..4951ee868d13a 100644 --- a/bitnami/tensorflow-resnet/README.md +++ b/bitnami/tensorflow-resnet/README.md @@ -1,4 +1,4 @@ -# TensorFlow ResNet packaged by Bitnami +# Bitnami package for TensorFlow ResNet ## What is TensorFlow ResNet? @@ -30,7 +30,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/tensorflow-serving/2/debian-11/Dockerfile b/bitnami/tensorflow-serving/2/debian-11/Dockerfile index 326565c2db5f3..7af1fff0b27bb 100644 --- a/bitnami/tensorflow-serving/2/debian-11/Dockerfile +++ b/bitnami/tensorflow-serving/2/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-26T19:12:27Z" \ + org.opencontainers.image.created="2023-11-22T04:43:35Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.13.1-debian-11-r7" \ + org.opencontainers.image.ref.name="2.14.1-debian-11-r0" \ org.opencontainers.image.title="tensorflow-serving" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.13.1" + org.opencontainers.image.version="2.14.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -28,8 +28,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl gcc-10 libgcc-s1 libstdc++6 procps RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "tensorflow-serving-2.13.1-2-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ + "tensorflow-serving-2.14.1-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-3-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -49,7 +49,7 @@ RUN mkdir /.local && chmod g+rwX /.local COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/tensorflow-serving/postunpack.sh -ENV APP_VERSION="2.13.1" \ +ENV APP_VERSION="2.14.1" \ BITNAMI_APP_NAME="tensorflow-serving" \ JAVA_HOME="/opt/bitnami/java" diff --git a/bitnami/tensorflow-serving/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/tensorflow-serving/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 57393f6938296..5bd0ee27d30fb 100644 --- a/bitnami/tensorflow-serving/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/tensorflow-serving/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-3" }, "tensorflow-serving": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.13.1-2" + "version": "2.14.1-0" } } \ No newline at end of file diff --git a/bitnami/tensorflow-serving/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/tensorflow-serving/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/tensorflow-serving/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/tensorflow-serving/2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/tensorflow-serving/2/debian-11/tags-info.yaml b/bitnami/tensorflow-serving/2/debian-11/tags-info.yaml index bea6ec267a076..e57f2bd4ad985 100644 --- a/bitnami/tensorflow-serving/2/debian-11/tags-info.yaml +++ b/bitnami/tensorflow-serving/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.13.1 +- 2.14.1 - latest diff --git a/bitnami/tensorflow-serving/README.md b/bitnami/tensorflow-serving/README.md index 4cfe4f43c2082..ad7cc92bc0264 100644 --- a/bitnami/tensorflow-serving/README.md +++ b/bitnami/tensorflow-serving/README.md @@ -1,4 +1,4 @@ -# TensorFlow Serving packaged by Bitnami +# Bitnami package for TensorFlow Serving ## What is TensorFlow Serving? diff --git a/bitnami/tensorflow/2/debian-11/Dockerfile b/bitnami/tensorflow/2/debian-11/Dockerfile index 1209de125c8d1..75b6bd84e8547 100644 --- a/bitnami/tensorflow/2/debian-11/Dockerfile +++ b/bitnami/tensorflow/2/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-30T15:55:12Z" \ + org.opencontainers.image.created="2023-11-29T14:44:34Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.14.0-debian-11-r1" \ + org.opencontainers.image.ref.name="2.15.0-debian-11-r1" \ org.opencontainers.image.title="tensorflow" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.14.0" + org.opencontainers.image.version="2.15.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,21 +21,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "python-3.11.6-8-linux-${OS_ARCH}-debian-11" \ - "tensorflow-2.14.0-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + "python-3.11.6-11-linux-${OS_ARCH}-debian-11" \ + "tensorflow-2.15.0-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -45,7 +45,7 @@ RUN useradd -r -u 1001 -g root tensorflow RUN mkdir /.local && chmod g+rwX /.local RUN mkdir /app && chmod g+rwX /app -ENV APP_VERSION="2.14.0" \ +ENV APP_VERSION="2.15.0" \ BITNAMI_APP_NAME="tensorflow" \ PATH="/opt/bitnami/python/bin:$PATH" diff --git a/bitnami/tensorflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/tensorflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 389fe354fd9dc..c86f4ed87cc34 100644 --- a/bitnami/tensorflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/tensorflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.11.6-8" + "version": "3.11.6-11" }, "tensorflow": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.14.0-1" + "version": "2.15.0-2" } } \ No newline at end of file diff --git a/bitnami/tensorflow/2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/tensorflow/2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/tensorflow/2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/tensorflow/2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/tensorflow/2/debian-11/tags-info.yaml b/bitnami/tensorflow/2/debian-11/tags-info.yaml index 7e3e7baf58124..68e10eaafe2f5 100644 --- a/bitnami/tensorflow/2/debian-11/tags-info.yaml +++ b/bitnami/tensorflow/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.14.0 +- 2.15.0 - latest diff --git a/bitnami/tensorflow/README.md b/bitnami/tensorflow/README.md index 83a190911eedd..8f32030bd1bc7 100644 --- a/bitnami/tensorflow/README.md +++ b/bitnami/tensorflow/README.md @@ -1,4 +1,4 @@ -# Tensorflow packaged by Bitnami +# Bitnami package for Tensorflow ## What is Tensorflow? @@ -22,14 +22,14 @@ docker-compose up -d ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. -Looking to use Tensorflow in production? Try [VMware Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. +Looking to use Tensorflow in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. ## Why use a non-root container? @@ -90,7 +90,7 @@ If your Tensorflow app has a `requirements.txt` defining your app's dependencies ```console docker run -it --name tensorflow -v /path/to/app:/app bitnami/tensorflow \ - sh -c "pip install --file requirements.txt && python script.py" + sh -c "pip install -r requirements.txt && python script.py" ``` **Further Reading:** diff --git a/bitnami/thanos/0/debian-11/Dockerfile b/bitnami/thanos/0/debian-11/Dockerfile index fdee373a01b74..251264779de59 100644 --- a/bitnami/thanos/0/debian-11/Dockerfile +++ b/bitnami/thanos/0/debian-11/Dockerfile @@ -8,21 +8,21 @@ ARG TARGETARCH ENV OS_ARCH="${TARGETARCH:-amd64}" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "thanos-0.32.5-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "thanos-0.33.0-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done @@ -36,19 +36,19 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="scratch" \ - org.opencontainers.image.created="2023-10-19T09:06:52Z" \ + org.opencontainers.image.created="2023-12-19T11:20:45Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.32.5-debian-11-r0" \ + org.opencontainers.image.ref.name="0.33.0-debian-11-r0" \ org.opencontainers.image.title="thanos" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.32.5" + org.opencontainers.image.version="0.33.0" COPY prebuildfs / COPY rootfs / COPY --from=builder /opt/bitnami/thanos/bin/thanos /bin/thanos -ENV APP_VERSION="0.32.5" \ +ENV APP_VERSION="0.33.0" \ BITNAMI_APP_NAME="thanos" USER 1001 diff --git a/bitnami/thanos/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/thanos/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 6971f80267742..ae5d2c796200e 100644 --- a/bitnami/thanos/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/thanos/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.32.5-0" + "version": "0.33.0-0" } } \ No newline at end of file diff --git a/bitnami/thanos/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/thanos/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/thanos/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/thanos/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/thanos/0/debian-11/tags-info.yaml b/bitnami/thanos/0/debian-11/tags-info.yaml index 22ba28e193b43..23cf5d74ddae4 100644 --- a/bitnami/thanos/0/debian-11/tags-info.yaml +++ b/bitnami/thanos/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.32.5 +- 0.33.0 - latest diff --git a/bitnami/thanos/README.md b/bitnami/thanos/README.md index 889db968abcd9..f6582fab6eab4 100644 --- a/bitnami/thanos/README.md +++ b/bitnami/thanos/README.md @@ -1,4 +1,4 @@ -# Thanos packaged by Bitnami +# Bitnami package for Thanos ## What is Thanos? @@ -25,7 +25,8 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on minideb a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use Thanos in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. diff --git a/bitnami/tomcat/10.1/debian-11/Dockerfile b/bitnami/tomcat/10.1/debian-11/Dockerfile index 072e157c27f41..02f1fc5b408a0 100644 --- a/bitnami/tomcat/10.1/debian-11/Dockerfile +++ b/bitnami/tomcat/10.1/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-16T15:34:14Z" \ + org.opencontainers.image.created="2023-12-14T00:20:56Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.1.15-debian-11-r0" \ + org.opencontainers.image.ref.name="10.1.17-debian-11-r0" \ org.opencontainers.image.title="tomcat" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="10.1.15" + org.opencontainers.image.version="10.1.17" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,22 +22,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libssl1.1 procps xmlstarlet zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "tomcat-10.1.15-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "tomcat-10.1.17-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -48,7 +48,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/tomcat/postunpack.sh -ENV APP_VERSION="10.1.15" \ +ENV APP_VERSION="10.1.17" \ BITNAMI_APP_NAME="tomcat" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/tomcat/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/tomcat/10.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/tomcat/10.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index cc82d04d227d5..4d3b6c3b7808a 100644 --- a/bitnami/tomcat/10.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/tomcat/10.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" }, "tomcat": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.1.15-0" + "version": "10.1.17-0" } } \ No newline at end of file diff --git a/bitnami/tomcat/10.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/tomcat/10.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/tomcat/10.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/tomcat/10.1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/tomcat/10.1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/tomcat/10.1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/tomcat/10.1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/tomcat/10.1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/tomcat/10.1/debian-11/tags-info.yaml b/bitnami/tomcat/10.1/debian-11/tags-info.yaml index 8fa0ef3a6f6b7..6b9eebdbe6a68 100644 --- a/bitnami/tomcat/10.1/debian-11/tags-info.yaml +++ b/bitnami/tomcat/10.1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "10.1" - 10.1-debian-11 -- 10.1.15 +- 10.1.17 - latest diff --git a/bitnami/tomcat/8.5/debian-11/Dockerfile b/bitnami/tomcat/8.5/debian-11/Dockerfile index acb833ef1b0c3..1dea0c76e62a6 100644 --- a/bitnami/tomcat/8.5/debian-11/Dockerfile +++ b/bitnami/tomcat/8.5/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-16T15:33:34Z" \ + org.opencontainers.image.created="2023-12-14T04:55:24Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.5.95-debian-11-r0" \ + org.opencontainers.image.ref.name="8.5.97-debian-11-r0" \ org.opencontainers.image.title="tomcat" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="8.5.95" + org.opencontainers.image.version="8.5.97" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,22 +22,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libssl1.1 procps xmlstarlet zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "tomcat-8.5.95-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "tomcat-8.5.97-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -48,7 +48,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/tomcat/postunpack.sh -ENV APP_VERSION="8.5.95" \ +ENV APP_VERSION="8.5.97" \ BITNAMI_APP_NAME="tomcat" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/tomcat/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/tomcat/8.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/tomcat/8.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index bbd47bfe2e460..328015e1c6036 100644 --- a/bitnami/tomcat/8.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/tomcat/8.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" }, "tomcat": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.5.95-0" + "version": "8.5.97-0" } } \ No newline at end of file diff --git a/bitnami/tomcat/8.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/tomcat/8.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/tomcat/8.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/tomcat/8.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/tomcat/8.5/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/tomcat/8.5/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/tomcat/8.5/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/tomcat/8.5/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/tomcat/8.5/debian-11/tags-info.yaml b/bitnami/tomcat/8.5/debian-11/tags-info.yaml index f1bc1434123ce..3fd875307c257 100644 --- a/bitnami/tomcat/8.5/debian-11/tags-info.yaml +++ b/bitnami/tomcat/8.5/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "8.5" - 8.5-debian-11 -- 8.5.95 +- 8.5.97 diff --git a/bitnami/tomcat/9.0/debian-11/Dockerfile b/bitnami/tomcat/9.0/debian-11/Dockerfile index afd0679f4356c..1473798735dfe 100644 --- a/bitnami/tomcat/9.0/debian-11/Dockerfile +++ b/bitnami/tomcat/9.0/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-13T16:23:53Z" \ + org.opencontainers.image.created="2023-12-14T00:58:48Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="9.0.82-debian-11-r0" \ + org.opencontainers.image.ref.name="9.0.84-debian-11-r0" \ org.opencontainers.image.title="tomcat" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="9.0.82" + org.opencontainers.image.version="9.0.84" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,22 +22,22 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libssl1.1 procps xmlstarlet zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "tomcat-9.0.82-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "tomcat-9.0.84-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -48,7 +48,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/tomcat/postunpack.sh -ENV APP_VERSION="9.0.82" \ +ENV APP_VERSION="9.0.84" \ BITNAMI_APP_NAME="tomcat" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/tomcat/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/tomcat/9.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/tomcat/9.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 6d9ddc86f2e31..2112aab4ecfe8 100644 --- a/bitnami/tomcat/9.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/tomcat/9.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" }, "tomcat": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "9.0.82-0" + "version": "9.0.84-0" } } \ No newline at end of file diff --git a/bitnami/tomcat/9.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/tomcat/9.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/tomcat/9.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/tomcat/9.0/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/tomcat/9.0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/tomcat/9.0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/tomcat/9.0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/tomcat/9.0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/tomcat/9.0/debian-11/tags-info.yaml b/bitnami/tomcat/9.0/debian-11/tags-info.yaml index 6e92d63dcb7f9..27ce3d2fb79b8 100644 --- a/bitnami/tomcat/9.0/debian-11/tags-info.yaml +++ b/bitnami/tomcat/9.0/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "9.0" - 9.0-debian-11 -- 9.0.82 +- 9.0.84 diff --git a/bitnami/tomcat/README.md b/bitnami/tomcat/README.md index a43bbce769c8b..6a7c98f937a18 100644 --- a/bitnami/tomcat/README.md +++ b/bitnami/tomcat/README.md @@ -1,4 +1,4 @@ -# Apache Tomcat packaged by Bitnami +# Bitnami package for Apache Tomcat ## What is Apache Tomcat? @@ -21,7 +21,7 @@ You can find the default credentials and available configuration options in the * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/trivy/0/debian-11/Dockerfile b/bitnami/trivy/0/debian-11/Dockerfile index f13a55014c44c..77fa331957934 100644 --- a/bitnami/trivy/0/debian-11/Dockerfile +++ b/bitnami/trivy/0/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-28T08:58:34Z" \ + org.opencontainers.image.created="2023-12-18T21:29:34Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.46.1-debian-11-r0" \ + org.opencontainers.image.ref.name="0.48.1-debian-11-r0" \ org.opencontainers.image.title="trivy" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="0.46.1" + org.opencontainers.image.version="0.48.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "trivy-0.46.1-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "trivy-0.48.1-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -43,7 +43,7 @@ RUN apt-get autoremove --purge -y curl && \ RUN chmod g+rwX /opt/bitnami RUN mkdir /.cache && chmod g+rwX /.cache -ENV APP_VERSION="0.46.1" \ +ENV APP_VERSION="0.48.1" \ BITNAMI_APP_NAME="trivy" \ PATH="/opt/bitnami/trivy/bin:$PATH" diff --git a/bitnami/trivy/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/trivy/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 0265a8230de6c..e3ddc3fca9081 100644 --- a/bitnami/trivy/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/trivy/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.46.1-0" + "version": "0.48.1-0" } } \ No newline at end of file diff --git a/bitnami/trivy/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/trivy/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/trivy/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/trivy/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/trivy/0/debian-11/tags-info.yaml b/bitnami/trivy/0/debian-11/tags-info.yaml index c3af3151521fe..e99eb8155e9b5 100644 --- a/bitnami/trivy/0/debian-11/tags-info.yaml +++ b/bitnami/trivy/0/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "0" - 0-debian-11 -- 0.46.1 +- 0.48.1 - latest diff --git a/bitnami/trivy/README.md b/bitnami/trivy/README.md index 8d7e5f038bb8e..112c076f79d19 100644 --- a/bitnami/trivy/README.md +++ b/bitnami/trivy/README.md @@ -1,4 +1,4 @@ -# Trivy packaged by Bitnami +# Bitnami package for Trivy ## What is Trivy? @@ -18,7 +18,7 @@ docker run --name trivy bitnami/trivy:latest * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/vault-csi-provider/1/debian-11/Dockerfile b/bitnami/vault-csi-provider/1/debian-11/Dockerfile index dac5090ce12e2..9dd1b271f26a3 100644 --- a/bitnami/vault-csi-provider/1/debian-11/Dockerfile +++ b/bitnami/vault-csi-provider/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T06:38:00Z" \ + org.opencontainers.image.created="2023-12-07T01:40:34Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.4.0-debian-11-r140" \ + org.opencontainers.image.ref.name="1.4.1-debian-11-r3" \ org.opencontainers.image.title="vault-csi-provider" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.4.0" + org.opencontainers.image.version="1.4.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,27 +21,27 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "vault-csi-provider-1.4.0-6-linux-${OS_ARCH}-debian-11" \ - ) && \ + "vault-csi-provider-1.4.1-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN useradd -r -u 1001 -g root vault-csi-provider -ENV APP_VERSION="1.4.0" \ +ENV APP_VERSION="1.4.1" \ BITNAMI_APP_NAME="vault-csi-provider" \ PATH="/opt/bitnami/vault-csi-provider/bin:$PATH" diff --git a/bitnami/vault-csi-provider/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/vault-csi-provider/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 00b39e3c6615e..0fedd5b18f989 100644 --- a/bitnami/vault-csi-provider/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/vault-csi-provider/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.0-6" + "version": "1.4.1-2" } } \ No newline at end of file diff --git a/bitnami/vault-csi-provider/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/vault-csi-provider/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/vault-csi-provider/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/vault-csi-provider/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/vault-csi-provider/1/debian-11/tags-info.yaml b/bitnami/vault-csi-provider/1/debian-11/tags-info.yaml index 1880b30955dff..d2a09a91c84f5 100644 --- a/bitnami/vault-csi-provider/1/debian-11/tags-info.yaml +++ b/bitnami/vault-csi-provider/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.4.0 +- 1.4.1 - latest diff --git a/bitnami/vault-csi-provider/README.md b/bitnami/vault-csi-provider/README.md index 33c3a78ee78b2..3813e5b7fea25 100644 --- a/bitnami/vault-csi-provider/README.md +++ b/bitnami/vault-csi-provider/README.md @@ -1,4 +1,4 @@ -# HashiCorp Vault CSI Provider packaged by Bitnami +# Bitnami package for HashiCorp Vault CSI Provider ## What is HashiCorp Vault CSI Provider? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/vault-k8s/1/debian-11/Dockerfile b/bitnami/vault-k8s/1/debian-11/Dockerfile index 02b78acf04572..c1bd729f62fa2 100644 --- a/bitnami/vault-k8s/1/debian-11/Dockerfile +++ b/bitnami/vault-k8s/1/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T19:36:41Z" \ + org.opencontainers.image.created="2023-12-07T01:40:59Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.3.1-debian-11-r0" \ + org.opencontainers.image.ref.name="1.3.1-debian-11-r3" \ org.opencontainers.image.title="vault-k8s" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.3.1" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "vault-k8s-1.3.1-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "vault-k8s-1.3.1-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/vault-k8s/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/vault-k8s/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index cb80b2796c1c4..873440a8b82c9 100644 --- a/bitnami/vault-k8s/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/vault-k8s/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.3.1-0" + "version": "1.3.1-2" } } \ No newline at end of file diff --git a/bitnami/vault-k8s/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/vault-k8s/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/vault-k8s/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/vault-k8s/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/vault-k8s/README.md b/bitnami/vault-k8s/README.md index 352e24d9f24a0..e6a0fc69fc40d 100644 --- a/bitnami/vault-k8s/README.md +++ b/bitnami/vault-k8s/README.md @@ -1,10 +1,10 @@ -# HashiCorp Vault Kubernetes Integration packaged by Bitnami +# Bitnami package for HashiCorp Vault K8s Integration -## What is HashiCorp Vault Kubernetes Integration? +## What is HashiCorp Vault K8s Integration? > HashiCorp Vault Kubernetes Integration allows HashiCorp Vault to interact with the Kubernetes API. Vault is a tool for securely managing and accessing secrets. -[Overview of HashiCorp Vault Kubernetes Integration](https://github.com/hashicorp/vault-k8s) +[Overview of HashiCorp Vault K8s Integration](https://github.com/hashicorp/vault-k8s) Trademarks: This software listing is packaged by Bitnami. The respective trademarks mentioned in the offering are owned by the respective companies, and use of them does not imply any affiliation or endorsement. ## TL;DR @@ -25,11 +25,11 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. -Looking to use HashiCorp Vault Kubernetes Integration in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. +Looking to use HashiCorp Vault K8s Integration in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. ## Supported tags and respective `Dockerfile` links @@ -41,7 +41,7 @@ Subscribe to project updates by watching the [bitnami/containers GitHub repo](ht ## Get this image -The recommended way to get the Bitnami HashiCorp Vault Kubernetes Integration Docker Image is to pull the prebuilt image from the [Docker Hub Registry](https://hub.docker.com/r/bitnami/vault-k8s). +The recommended way to get the Bitnami HashiCorp Vault K8s Integration Docker Image is to pull the prebuilt image from the [Docker Hub Registry](https://hub.docker.com/r/bitnami/vault-k8s). ```console docker pull bitnami/vault-k8s:latest @@ -65,7 +65,7 @@ docker build -t bitnami/APP:latest . ### Upgrade this image -Bitnami provides up-to-date versions of HashiCorp Vault Kubernetes Integration, including security patches, soon after they are made upstream. We recommend that you follow these steps to upgrade your container. +Bitnami provides up-to-date versions of HashiCorp Vault K8s Integration, including security patches, soon after they are made upstream. We recommend that you follow these steps to upgrade your container. #### Step 1: Get the updated image @@ -111,7 +111,7 @@ To run commands inside this container you can use `docker run`, for example to e docker run --rm --name vault-k8s bitnami/vault-k8s:latest --help ``` -Check the [official HashiCorp Vault Kubernetes Integration documentation](https://github.com/hashicorp/vault-k8s) for more information about how to use HashiCorp Vault Kubernetes Integration. +Check the [official HashiCorp Vault K8s Integration documentation](https://github.com/hashicorp/vault-k8s) for more information about how to use HashiCorp Vault K8s Integration. ## Contributing diff --git a/bitnami/vault/1/debian-11/Dockerfile b/bitnami/vault/1/debian-11/Dockerfile index c0c402304ee09..a866a81f47ec2 100644 --- a/bitnami/vault/1/debian-11/Dockerfile +++ b/bitnami/vault/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-25T04:51:22Z" \ + org.opencontainers.image.created="2023-12-12T13:39:46Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.15.1-debian-11-r0" \ + org.opencontainers.image.ref.name="1.15.4-debian-11-r0" \ org.opencontainers.image.title="vault" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.15.1" + org.opencontainers.image.version="1.15.4" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,27 +21,27 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "vault-1.15.1-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "vault-1.15.4-0-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN useradd -r -u 1001 -g root vault -ENV APP_VERSION="1.15.1" \ +ENV APP_VERSION="1.15.4" \ BITNAMI_APP_NAME="vault" \ PATH="/opt/bitnami/vault/bin:$PATH" diff --git a/bitnami/vault/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/vault/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index f8c59e366b0f0..ca558a84ca363 100644 --- a/bitnami/vault/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/vault/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.15.1-0" + "version": "1.15.4-0" } } \ No newline at end of file diff --git a/bitnami/vault/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/vault/1/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/vault/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/vault/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/vault/1/debian-11/tags-info.yaml b/bitnami/vault/1/debian-11/tags-info.yaml index 9827ab463c38b..dadb65b89e54e 100644 --- a/bitnami/vault/1/debian-11/tags-info.yaml +++ b/bitnami/vault/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.15.1 +- 1.15.4 - latest diff --git a/bitnami/vault/README.md b/bitnami/vault/README.md index 9f5685278a0eb..c803266ba0c07 100644 --- a/bitnami/vault/README.md +++ b/bitnami/vault/README.md @@ -1,4 +1,4 @@ -# HashiCorp Vault packaged by Bitnami +# Bitnami package for HashiCorp Vault ## What is HashiCorp Vault? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/whereabouts/0/debian-11/Dockerfile b/bitnami/whereabouts/0/debian-11/Dockerfile index 14617afeb503e..787e179e3f503 100644 --- a/bitnami/whereabouts/0/debian-11/Dockerfile +++ b/bitnami/whereabouts/0/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T09:47:16Z" \ + org.opencontainers.image.created="2023-12-06T23:13:13Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="0.6.2-debian-11-r109" \ + org.opencontainers.image.ref.name="0.6.2-debian-11-r111" \ org.opencontainers.image.title="whereabouts" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="0.6.2" @@ -21,20 +21,20 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "whereabouts-0.6.2-5-linux-${OS_ARCH}-debian-11" \ - ) && \ + "whereabouts-0.6.2-7-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/whereabouts/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/whereabouts/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index b50d5368e0755..5607e13701604 100644 --- a/bitnami/whereabouts/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/whereabouts/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "0.6.2-5" + "version": "0.6.2-7" } } \ No newline at end of file diff --git a/bitnami/whereabouts/0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/whereabouts/0/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/whereabouts/0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/whereabouts/0/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/whereabouts/README.md b/bitnami/whereabouts/README.md index 5646a6b4f9cee..01e0cefac184d 100644 --- a/bitnami/whereabouts/README.md +++ b/bitnami/whereabouts/README.md @@ -1,8 +1,8 @@ -# Whereabouts packaged by Bitnami +# Bitnami package for Whereabouts ## What is Whereabouts? -> Whereabouts is a CNI plugin for Kubernetes clusters. It dynamically assigns IP addresses cluster-wide. Features both IPv4 and IPv6 addressing. +> Whereabouts is a CNI IPAM plugin for Kubernetes clusters. It dynamically assigns IP addresses cluster-wide. Features both IPv4 and IPv6 addressing. [Overview of Whereabouts](https://github.com/k8snetworkplumbingwg/whereabouts) Trademarks: This software listing is packaged by Bitnami. The respective trademarks mentioned in the offering are owned by the respective companies, and use of them does not imply any affiliation or endorsement. @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/wildfly/26/debian-11/Dockerfile b/bitnami/wildfly/26/debian-11/Dockerfile index 7d6cc988d95ff..798431bf61287 100644 --- a/bitnami/wildfly/26/debian-11/Dockerfile +++ b/bitnami/wildfly/26/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-09T20:33:07Z" \ + org.opencontainers.image.created="2023-12-17T11:08:01Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="26.1.3-debian-11-r200" \ + org.opencontainers.image.ref.name="26.1.3-debian-11-r205" \ org.opencontainers.image.title="wildfly" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="26.1.3" @@ -22,21 +22,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libaio1 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.8-7-5-linux-${OS_ARCH}-debian-11" \ - "wildfly-26.1.3-14-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "wildfly-26.1.3-19-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/wildfly/26/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/wildfly/26/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c097a88b4c6d5..26738488329ba 100644 --- a/bitnami/wildfly/26/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/wildfly/26/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.8-7-5" + "version": "17.0.9-11-6" }, "wildfly": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "26.1.3-14" + "version": "26.1.3-19" } } \ No newline at end of file diff --git a/bitnami/wildfly/26/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/wildfly/26/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/wildfly/26/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/wildfly/26/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/wildfly/26/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/wildfly/26/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/wildfly/26/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/wildfly/26/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/wildfly/30/debian-11/Dockerfile b/bitnami/wildfly/30/debian-11/Dockerfile index b8790703228c6..55195f1b25c81 100644 --- a/bitnami/wildfly/30/debian-11/Dockerfile +++ b/bitnami/wildfly/30/debian-11/Dockerfile @@ -8,13 +8,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-24T18:20:47Z" \ + org.opencontainers.image.created="2023-12-17T11:26:15Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="30.0.0-debian-11-r0" \ + org.opencontainers.image.ref.name="30.0.1-debian-11-r2" \ org.opencontainers.image.title="wildfly" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="30.0.0" + org.opencontainers.image.version="30.0.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,21 +22,21 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl libaio1 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.9-11-1-linux-${OS_ARCH}-debian-11" \ - "wildfly-30.0.0-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ + "wildfly-30.0.1-2-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -47,7 +47,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/wildfly/postunpack.sh -ENV APP_VERSION="30.0.0" \ +ENV APP_VERSION="30.0.1" \ BITNAMI_APP_NAME="wildfly" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/wildfly/bin:$PATH" \ diff --git a/bitnami/wildfly/30/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/wildfly/30/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 6e07b035c8c99..f0269baa910a9 100644 --- a/bitnami/wildfly/30/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/wildfly/30/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.9-11-1" + "version": "17.0.9-11-6" }, "wildfly": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "30.0.0-0" + "version": "30.0.1-2" } } \ No newline at end of file diff --git a/bitnami/wildfly/30/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/wildfly/30/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/wildfly/30/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/wildfly/30/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/wildfly/30/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/wildfly/30/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/wildfly/30/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/wildfly/30/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/wildfly/30/debian-11/tags-info.yaml b/bitnami/wildfly/30/debian-11/tags-info.yaml index 35d4321fbc56a..da068746d5b72 100644 --- a/bitnami/wildfly/30/debian-11/tags-info.yaml +++ b/bitnami/wildfly/30/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "30" - 30-debian-11 -- 30.0.0 +- 30.0.1 - latest diff --git a/bitnami/wildfly/README.md b/bitnami/wildfly/README.md index 92597f1eaebe7..e23c45dd80657 100644 --- a/bitnami/wildfly/README.md +++ b/bitnami/wildfly/README.md @@ -1,4 +1,4 @@ -# WildFly packaged by Bitnami +# Bitnami package for WildFly ## What is WildFly? @@ -25,7 +25,7 @@ docker-compose up -d * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. diff --git a/bitnami/wordpress-nginx/6/debian-11/Dockerfile b/bitnami/wordpress-nginx/6/debian-11/Dockerfile index 9a5ba2a52d5d3..e4f3178a287ee 100644 --- a/bitnami/wordpress-nginx/6/debian-11/Dockerfile +++ b/bitnami/wordpress-nginx/6/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-31T01:28:18Z" \ + org.opencontainers.image.created="2023-12-19T01:15:59Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.3.2-debian-11-r5" \ + org.opencontainers.image.ref.name="6.4.2-debian-11-r6" \ org.opencontainers.image.title="wordpress-nginx" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="6.3.2" + org.opencontainers.image.version="6.4.2" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,24 +21,24 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl less libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libgeoip1 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.2.12-0-linux-${OS_ARCH}-debian-11" \ - "nginx-1.25.3-0-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.11.5-1-linux-${OS_ARCH}-debian-11" \ - "wordpress-6.3.2-6-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "php-8.2.13-11-linux-${OS_ARCH}-debian-11" \ + "nginx-1.25.3-1-linux-${OS_ARCH}-debian-11" \ + "mysql-client-11.1.3-1-linux-${OS_ARCH}-debian-11" \ + "wordpress-6.4.2-7-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -52,7 +52,7 @@ RUN /opt/bitnami/scripts/nginx/postunpack.sh RUN /opt/bitnami/scripts/php/postunpack.sh RUN /opt/bitnami/scripts/nginx-php-fpm/postunpack.sh RUN /opt/bitnami/scripts/wordpress/postunpack.sh -ENV APP_VERSION="6.3.2" \ +ENV APP_VERSION="6.4.2" \ BITNAMI_APP_NAME="wordpress-nginx" \ NGINX_HTTPS_PORT_NUMBER="" \ NGINX_HTTP_PORT_NUMBER="" \ diff --git a/bitnami/wordpress-nginx/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/wordpress-nginx/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index f0a0770d5628a..0f610e73c1331 100644 --- a/bitnami/wordpress-nginx/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/wordpress-nginx/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,30 +3,30 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.11.5-1" + "version": "11.1.3-1" }, "nginx": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.25.3-0" + "version": "1.25.3-1" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.12-0" + "version": "8.2.13-11" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" }, "wordpress": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "6.3.2-6" + "version": "6.4.2-7" } } \ No newline at end of file diff --git a/bitnami/wordpress-nginx/6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/wordpress-nginx/6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/wordpress-nginx/6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/wordpress-nginx/6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/wordpress-nginx/6/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/wordpress-nginx/6/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/wordpress-nginx/6/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/wordpress-nginx/6/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf b/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf index 6c2b5b1ba288f..aaf0428032c41 100644 --- a/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf +++ b/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/nginx/conf/nginx.conf @@ -33,7 +33,7 @@ http { gzip_proxied any; gzip_types text/plain text/css application/javascript text/xml application/xml+rss; keepalive_timeout 65; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; + ssl_protocols TLSv1.2 TLSv1.3; ssl_ciphers HIGH:!aNULL:!MD5; client_max_body_size 80M; server_tokens off; diff --git a/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/libwordpress.sh b/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/libwordpress.sh index 3db0be8c1dc23..370bdf81ee320 100644 --- a/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/libwordpress.sh +++ b/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/libwordpress.sh @@ -92,6 +92,7 @@ wordpress_validate() { check_yes_no_value "WORDPRESS_SKIP_BOOTSTRAP" check_multi_value "WORDPRESS_AUTO_UPDATE_LEVEL" "major minor none" check_yes_no_value "WORDPRESS_ENABLE_REVERSE_PROXY" + check_yes_no_value "WORDPRESS_ENABLE_XML_RPC" # Multisite validations check_yes_no_value "WORDPRESS_ENABLE_MULTISITE" @@ -726,6 +727,12 @@ wordpress_generate_web_server_configuration() { error "Unknown WordPress Multisite network mode" return 1 fi + + if ! is_boolean_yes "$WORDPRESS_ENABLE_XML_RPC"; then + apache_config+=$'\n'"$(render-template "${template_dir}/apache-wordpress-disable-xml-rpc.tpl")" + nginx_config+=$'\n'"$(render-template "${template_dir}/nginx-wordpress-disable-xml-rpc.tpl")" + fi + web_server_config_create_flags+=("--apache-extra-directory-configuration" "$apache_config" "--nginx-additional-configuration" "$nginx_config") [[ -n "$nginx_external_config" ]] && web_server_config_create_flags+=("--nginx-external-configuration" "$nginx_external_config") ensure_web_server_app_configuration_exists "wordpress" --type "php" "${web_server_config_create_flags[@]}" diff --git a/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh b/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh index 9126f28812cff..ee9aabde12783 100644 --- a/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh +++ b/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh @@ -47,6 +47,7 @@ wordpress_env_vars=( WORDPRESS_LOGGED_IN_SALT WORDPRESS_NONCE_SALT WORDPRESS_ENABLE_REVERSE_PROXY + WORDPRESS_ENABLE_XML_RPC WORDPRESS_USERNAME WORDPRESS_PASSWORD WORDPRESS_EMAIL @@ -144,6 +145,7 @@ export WORDPRESS_SECURE_AUTH_SALT="${WORDPRESS_SECURE_AUTH_SALT:-}" export WORDPRESS_LOGGED_IN_SALT="${WORDPRESS_LOGGED_IN_SALT:-}" export WORDPRESS_NONCE_SALT="${WORDPRESS_NONCE_SALT:-}" export WORDPRESS_ENABLE_REVERSE_PROXY="${WORDPRESS_ENABLE_REVERSE_PROXY:-no}" # only used during the first initialization +export WORDPRESS_ENABLE_XML_RPC="${WORDPRESS_ENABLE_XML_RPC:-no}" # only used during the first initialization # WordPress credentials export WORDPRESS_USERNAME="${WORDPRESS_USERNAME:-user}" # only used during the first initialization diff --git a/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/bitnami-templates/apache-wordpress-disable-xml-rpc.tpl b/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/bitnami-templates/apache-wordpress-disable-xml-rpc.tpl new file mode 100644 index 0000000000000..d0b19736135ac --- /dev/null +++ b/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/bitnami-templates/apache-wordpress-disable-xml-rpc.tpl @@ -0,0 +1,8 @@ +# BEGIN Disable WordPress XML-RPC endpoint +# Disable the outdated WordPress XML-RPC endpoint to prevent security vulnerabilities. +# https://github.com/bitnami/containers/pull/51077 + +Order Allow,Deny +Deny from all + +# END Disable WordPress XML-RPC endpoint \ No newline at end of file diff --git a/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/bitnami-templates/nginx-wordpress-disable-xml-rpc.tpl b/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/bitnami-templates/nginx-wordpress-disable-xml-rpc.tpl new file mode 100644 index 0000000000000..0db5dd1fa0d74 --- /dev/null +++ b/bitnami/wordpress-nginx/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/bitnami-templates/nginx-wordpress-disable-xml-rpc.tpl @@ -0,0 +1,7 @@ +# BEGIN Disable WordPress XML-RPC endpoint +# Disable the outdated WordPress XML-RPC endpoint to prevent security vulnerabilities. +# https://github.com/bitnami/containers/pull/51077 +location = /xmlrpc.php { + deny all; +} +# END Disable WordPress XML-RPC endpoint \ No newline at end of file diff --git a/bitnami/wordpress-nginx/6/debian-11/tags-info.yaml b/bitnami/wordpress-nginx/6/debian-11/tags-info.yaml index c3195b4eeed7c..b358e47ce95b9 100644 --- a/bitnami/wordpress-nginx/6/debian-11/tags-info.yaml +++ b/bitnami/wordpress-nginx/6/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "6" - 6-debian-11 -- 6.3.2 +- 6.4.2 - latest diff --git a/bitnami/wordpress-nginx/README.md b/bitnami/wordpress-nginx/README.md index 401c04f5028ab..1279a299a80b4 100644 --- a/bitnami/wordpress-nginx/README.md +++ b/bitnami/wordpress-nginx/README.md @@ -1,4 +1,4 @@ -# WordPress with NGINX packaged by Bitnami +# Bitnami package for WordPress with NGINX ## What is WordPress with NGINX? @@ -17,12 +17,12 @@ docker-compose up ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use WordPress with NGINX in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. @@ -66,10 +66,10 @@ WordPress requires access to a MySQL or MariaDB database to store information. W ### Run the application using Docker Compose -The main folder of this repository contains a functional [`docker-compose.yml`](https://github.com/bitnami/containers/blob/main/bitnami/wordpress/docker-compose.yml) file. Run the application using it as shown below: +The main folder of this repository contains a functional [`docker-compose.yml`](https://github.com/bitnami/containers/blob/main/bitnami/wordpress-nginx/docker-compose.yml) file. Run the application using it as shown below: ```console -curl -sSL https://raw.githubusercontent.com/bitnami/containers/main/bitnami/wordpress/docker-compose.yml > docker-compose.yml +curl -sSL https://raw.githubusercontent.com/bitnami/containers/main/bitnami/wordpress-nginx/docker-compose.yml > docker-compose.yml docker-compose up ``` @@ -195,7 +195,7 @@ docker run -d --name wordpress \ When you start the WordPress image, you can adjust the configuration of the instance by passing one or more environment variables either on the docker-compose file or on the `docker run` command line. If you want to add a new environment variable: -- For docker-compose add the variable name and value under the application section in the [`docker-compose.yml`](https://github.com/bitnami/containers/blob/main/bitnami/wordpress/docker-compose.yml) file present in this repository: +- For docker-compose add the variable name and value under the application section in the [`docker-compose.yml`](https://github.com/bitnami/containers/blob/main/bitnami/wordpress-nginx/docker-compose.yml) file present in this repository: ```yaml wordpress: @@ -240,6 +240,7 @@ Available environment variables: - `WORDPRESS_SKIP_BOOTSTRAP`: Skip the WordPress installation wizard. This is necessary when providing a database with existing WordPress data. Default: **no** - `WORDPRESS_AUTO_UPDATE_LEVEL`: Level of auto-updates to allow for the WordPress core installation. Valid values: `major`, `minor`, `none`. Default: **none** - `WORDPRESS_ENABLE_REVERSE_PROXY`: Enable WordPress support for reverse proxy headers. Default: **no** +- `WORDPRESS_ENABLE_XML_RPC`: Enable the WordPress XML-RPC endpoint. Default: **no** #### Multisite configuration @@ -311,7 +312,7 @@ To configure WordPress to send email using SMTP you can set the following enviro This would be an example of SMTP configuration using a Gmail account: -- Modify the [`docker-compose.yml`](https://github.com/bitnami/containers/blob/main/bitnami/wordpress/docker-compose.yml) file present in this repository: +- Modify the [`docker-compose.yml`](https://github.com/bitnami/containers/blob/main/bitnami/wordpress-nginx/docker-compose.yml) file present in this repository: ```yaml wordpress: @@ -346,7 +347,7 @@ This would be an example of SMTP configuration using a Gmail account: The Bitnami WordPress container supports connecting the WordPress application to an external database. This would be an example of using an external database for WordPress. -- Modify the [`docker-compose.yml`](https://github.com/bitnami/containers/blob/main/bitnami/wordpress/docker-compose.yml) file present in this repository: +- Modify the [`docker-compose.yml`](https://github.com/bitnami/containers/blob/main/bitnami/wordpress-nginx/docker-compose.yml) file present in this repository: ```diff wordpress: @@ -571,6 +572,10 @@ Based on the extended image, you can update the [`docker-compose.yml`](https://g ## Notable Changes +### 6.4.1-debian-11-r5 + +- The XML-RCP endpoint has been disabled by default. Users can manually activate via the new `WORDPRESS_ENABLE_XML_RPC` environment variable. + ### 5.7.1-debian-10-r22 - The size of the container image has been decreased. diff --git a/bitnami/wordpress/6/debian-11/Dockerfile b/bitnami/wordpress/6/debian-11/Dockerfile index 4bbd5f0025d02..abf3692bcd171 100644 --- a/bitnami/wordpress/6/debian-11/Dockerfile +++ b/bitnami/wordpress/6/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-31T01:28:14Z" \ + org.opencontainers.image.created="2023-12-19T01:14:43Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.3.2-debian-11-r5" \ + org.opencontainers.image.ref.name="6.4.2-debian-11-r6" \ org.opencontainers.image.title="wordpress" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="6.3.2" + org.opencontainers.image.version="6.4.2" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -21,25 +21,25 @@ ENV HOME="/" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl less libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.2.12-0-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.58-0-linux-${OS_ARCH}-debian-11" \ - "mysql-client-11.1.2-2-linux-${OS_ARCH}-debian-11" \ - "libphp-8.2.12-0-linux-${OS_ARCH}-debian-11" \ - "wordpress-6.3.2-6-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ - ) && \ + "php-8.2.13-11-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.58-2-linux-${OS_ARCH}-debian-11" \ + "mysql-client-11.1.3-1-linux-${OS_ARCH}-debian-11" \ + "libphp-8.2.13-0-linux-${OS_ARCH}-debian-11" \ + "wordpress-6.4.2-7-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ @@ -55,7 +55,7 @@ RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh RUN /opt/bitnami/scripts/wordpress/postunpack.sh ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ - APP_VERSION="6.3.2" \ + APP_VERSION="6.4.2" \ BITNAMI_APP_NAME="wordpress" \ PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/wp-cli/bin:$PATH" diff --git a/bitnami/wordpress/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/wordpress/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index e667822c54b6c..b2cf4fcfd9fa9 100644 --- a/bitnami/wordpress/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/wordpress/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,36 +3,36 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.58-0" + "version": "2.4.58-2" }, "libphp": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.12-0" + "version": "8.2.13-0" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.1.2-2" + "version": "11.1.3-1" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.12-0" + "version": "8.2.13-11" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-4" }, "wordpress": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "6.3.2-6" + "version": "6.4.2-7" } } \ No newline at end of file diff --git a/bitnami/wordpress/6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/wordpress/6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/wordpress/6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/wordpress/6/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/wordpress/6/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/wordpress/6/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/wordpress/6/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/wordpress/6/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh index 765d1d8ce1ed5..6a480ad4ddde9 100755 --- a/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh +++ b/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh @@ -46,6 +46,7 @@ apache_setup_bitnami_config() { local -a modules_to_disable=( "http2_module" "proxy_hcheck_module" + "proxy_html_module" "proxy_http2_module" ) for module in "${modules_to_disable[@]}"; do diff --git a/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/libwordpress.sh b/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/libwordpress.sh index 3db0be8c1dc23..370bdf81ee320 100644 --- a/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/libwordpress.sh +++ b/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/libwordpress.sh @@ -92,6 +92,7 @@ wordpress_validate() { check_yes_no_value "WORDPRESS_SKIP_BOOTSTRAP" check_multi_value "WORDPRESS_AUTO_UPDATE_LEVEL" "major minor none" check_yes_no_value "WORDPRESS_ENABLE_REVERSE_PROXY" + check_yes_no_value "WORDPRESS_ENABLE_XML_RPC" # Multisite validations check_yes_no_value "WORDPRESS_ENABLE_MULTISITE" @@ -726,6 +727,12 @@ wordpress_generate_web_server_configuration() { error "Unknown WordPress Multisite network mode" return 1 fi + + if ! is_boolean_yes "$WORDPRESS_ENABLE_XML_RPC"; then + apache_config+=$'\n'"$(render-template "${template_dir}/apache-wordpress-disable-xml-rpc.tpl")" + nginx_config+=$'\n'"$(render-template "${template_dir}/nginx-wordpress-disable-xml-rpc.tpl")" + fi + web_server_config_create_flags+=("--apache-extra-directory-configuration" "$apache_config" "--nginx-additional-configuration" "$nginx_config") [[ -n "$nginx_external_config" ]] && web_server_config_create_flags+=("--nginx-external-configuration" "$nginx_external_config") ensure_web_server_app_configuration_exists "wordpress" --type "php" "${web_server_config_create_flags[@]}" diff --git a/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh b/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh index 9126f28812cff..ee9aabde12783 100644 --- a/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh +++ b/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress-env.sh @@ -47,6 +47,7 @@ wordpress_env_vars=( WORDPRESS_LOGGED_IN_SALT WORDPRESS_NONCE_SALT WORDPRESS_ENABLE_REVERSE_PROXY + WORDPRESS_ENABLE_XML_RPC WORDPRESS_USERNAME WORDPRESS_PASSWORD WORDPRESS_EMAIL @@ -144,6 +145,7 @@ export WORDPRESS_SECURE_AUTH_SALT="${WORDPRESS_SECURE_AUTH_SALT:-}" export WORDPRESS_LOGGED_IN_SALT="${WORDPRESS_LOGGED_IN_SALT:-}" export WORDPRESS_NONCE_SALT="${WORDPRESS_NONCE_SALT:-}" export WORDPRESS_ENABLE_REVERSE_PROXY="${WORDPRESS_ENABLE_REVERSE_PROXY:-no}" # only used during the first initialization +export WORDPRESS_ENABLE_XML_RPC="${WORDPRESS_ENABLE_XML_RPC:-no}" # only used during the first initialization # WordPress credentials export WORDPRESS_USERNAME="${WORDPRESS_USERNAME:-user}" # only used during the first initialization diff --git a/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/bitnami-templates/apache-wordpress-disable-xml-rpc.tpl b/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/bitnami-templates/apache-wordpress-disable-xml-rpc.tpl new file mode 100644 index 0000000000000..d0b19736135ac --- /dev/null +++ b/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/bitnami-templates/apache-wordpress-disable-xml-rpc.tpl @@ -0,0 +1,8 @@ +# BEGIN Disable WordPress XML-RPC endpoint +# Disable the outdated WordPress XML-RPC endpoint to prevent security vulnerabilities. +# https://github.com/bitnami/containers/pull/51077 + +Order Allow,Deny +Deny from all + +# END Disable WordPress XML-RPC endpoint \ No newline at end of file diff --git a/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/bitnami-templates/nginx-wordpress-disable-xml-rpc.tpl b/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/bitnami-templates/nginx-wordpress-disable-xml-rpc.tpl new file mode 100644 index 0000000000000..0db5dd1fa0d74 --- /dev/null +++ b/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/wordpress/bitnami-templates/nginx-wordpress-disable-xml-rpc.tpl @@ -0,0 +1,7 @@ +# BEGIN Disable WordPress XML-RPC endpoint +# Disable the outdated WordPress XML-RPC endpoint to prevent security vulnerabilities. +# https://github.com/bitnami/containers/pull/51077 +location = /xmlrpc.php { + deny all; +} +# END Disable WordPress XML-RPC endpoint \ No newline at end of file diff --git a/bitnami/wordpress/6/debian-11/tags-info.yaml b/bitnami/wordpress/6/debian-11/tags-info.yaml index c3195b4eeed7c..b358e47ce95b9 100644 --- a/bitnami/wordpress/6/debian-11/tags-info.yaml +++ b/bitnami/wordpress/6/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "6" - 6-debian-11 -- 6.3.2 +- 6.4.2 - latest diff --git a/bitnami/wordpress/README.md b/bitnami/wordpress/README.md index 095176a1c09f9..1291e897cfd43 100644 --- a/bitnami/wordpress/README.md +++ b/bitnami/wordpress/README.md @@ -1,4 +1,4 @@ -# WordPress packaged by Bitnami +# Bitnami package for WordPress ## What is WordPress? @@ -17,12 +17,12 @@ docker-compose up -d ## Why use Bitnami Images? -- Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. -- With Bitnami images the latest bug fixes and features are available as soon as possible. -- Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -- All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. -- All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. -- Bitnami container images are released on a regular basis with the latest distribution packages available. +* Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. +* With Bitnami images the latest bug fixes and features are available as soon as possible. +* Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. +* All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. +* Bitnami container images are released on a regular basis with the latest distribution packages available. Looking to use WordPress in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. @@ -246,6 +246,7 @@ Available environment variables: - `WORDPRESS_SKIP_BOOTSTRAP`: Skip the WordPress installation wizard. This is necessary when providing a database with existing WordPress data. Default: **no** - `WORDPRESS_AUTO_UPDATE_LEVEL`: Level of auto-updates to allow for the WordPress core installation. Valid values: `major`, `minor`, `none`. Default: **none** - `WORDPRESS_ENABLE_REVERSE_PROXY`: Enable WordPress support for reverse proxy headers. Default: **no** +- `WORDPRESS_ENABLE_XML_RPC`: Enable the WordPress XML-RPC endpoint. Default: **no** #### Salt and keys configuration @@ -590,6 +591,10 @@ Based on the extended image, you can update the [`docker-compose.yml`](https://g ## Notable Changes +### 6.4.1-debian-11-r5 + +- The XML-RCP endpoint has been disabled by default. Users can manually activate via the new `WORDPRESS_ENABLE_XML_RPC` environment variable. + ### 5.7.1-debian-10-r21 - The size of the container image has been decreased. diff --git a/bitnami/zookeeper/3.7/debian-11/Dockerfile b/bitnami/zookeeper/3.7/debian-11/Dockerfile index abd7d48e15a02..350b96d13da7f 100644 --- a/bitnami/zookeeper/3.7/debian-11/Dockerfile +++ b/bitnami/zookeeper/3.7/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T15:53:07Z" \ + org.opencontainers.image.created="2023-12-02T09:33:41Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.7.2-debian-11-r1" \ + org.opencontainers.image.ref.name="3.7.2-debian-11-r3" \ org.opencontainers.image.title="zookeeper" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.7.2" @@ -22,22 +22,22 @@ ENV HOME="/" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:/opt/bitnami/zookeeper/bin:$PATH" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl netcat-openbsd procps xmlstarlet zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "java-11.0.20-8-5-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-3-linux-${OS_ARCH}-debian-11" \ + "java-11.0.21-10-6-linux-${OS_ARCH}-debian-11" \ "zookeeper-3.7.2-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/zookeeper/3.7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/zookeeper/3.7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index e01272b67968e..da043e475a3bd 100644 --- a/bitnami/zookeeper/3.7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/zookeeper/3.7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,13 +3,13 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.0.20-8-5" + "version": "11.0.21-10-6" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-3" }, "zookeeper": { "arch": "amd64", diff --git a/bitnami/zookeeper/3.7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/zookeeper/3.7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/zookeeper/3.7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/zookeeper/3.7/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/zookeeper/3.7/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/zookeeper/3.7/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/zookeeper/3.7/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/zookeeper/3.7/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/zookeeper/3.8/debian-11/Dockerfile b/bitnami/zookeeper/3.8/debian-11/Dockerfile index 7e7ca6ca72ee2..26a165e796733 100644 --- a/bitnami/zookeeper/3.8/debian-11/Dockerfile +++ b/bitnami/zookeeper/3.8/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T21:04:55Z" \ + org.opencontainers.image.created="2023-12-02T08:27:31Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.8.3-debian-11-r1" \ + org.opencontainers.image.ref.name="3.8.3-debian-11-r3" \ org.opencontainers.image.title="zookeeper" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.8.3" @@ -22,22 +22,22 @@ ENV HOME="/" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:/opt/bitnami/zookeeper/bin:$PATH" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl netcat-openbsd procps xmlstarlet zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "java-11.0.20-8-5-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-3-linux-${OS_ARCH}-debian-11" \ + "java-11.0.21-10-6-linux-${OS_ARCH}-debian-11" \ "zookeeper-3.8.3-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/zookeeper/3.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/zookeeper/3.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index ca03dcab3182a..be0a1252ceb67 100644 --- a/bitnami/zookeeper/3.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/zookeeper/3.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,13 +3,13 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.0.20-8-5" + "version": "11.0.21-10-6" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-3" }, "zookeeper": { "arch": "amd64", diff --git a/bitnami/zookeeper/3.8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/zookeeper/3.8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/zookeeper/3.8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/zookeeper/3.8/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/zookeeper/3.8/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/zookeeper/3.8/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/zookeeper/3.8/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/zookeeper/3.8/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/zookeeper/3.9/debian-11/Dockerfile b/bitnami/zookeeper/3.9/debian-11/Dockerfile index ebae538c6c5ee..2602c2c1a04ff 100644 --- a/bitnami/zookeeper/3.9/debian-11/Dockerfile +++ b/bitnami/zookeeper/3.9/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-10-11T19:09:41Z" \ + org.opencontainers.image.created="2023-12-02T07:28:07Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.9.1-debian-11-r1" \ + org.opencontainers.image.ref.name="3.9.1-debian-11-r3" \ org.opencontainers.image.title="zookeeper" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.9.1" @@ -22,22 +22,22 @@ ENV HOME="/" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:/opt/bitnami/zookeeper/bin:$PATH" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl netcat-openbsd procps xmlstarlet zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-2-linux-${OS_ARCH}-debian-11" \ - "java-11.0.20-8-5-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-3-linux-${OS_ARCH}-debian-11" \ + "java-11.0.21-10-6-linux-${OS_ARCH}-debian-11" \ "zookeeper-3.9.1-0-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ diff --git a/bitnami/zookeeper/3.9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/zookeeper/3.9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index bee95b3ab705c..50b435a0d0d91 100644 --- a/bitnami/zookeeper/3.9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/zookeeper/3.9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,13 +3,13 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.0.20-8-5" + "version": "11.0.21-10-6" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-2" + "version": "1.0.7-3" }, "zookeeper": { "arch": "amd64", diff --git a/bitnami/zookeeper/3.9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/zookeeper/3.9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e28..3853c789b2ea1 100644 --- a/bitnami/zookeeper/3.9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/zookeeper/3.9/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/zookeeper/3.9/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/zookeeper/3.9/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277eb..b7a5bf1e50bff 100755 --- a/bitnami/zookeeper/3.9/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/zookeeper/3.9/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/zookeeper/README.md b/bitnami/zookeeper/README.md index bcefffcc5569a..52546a24e876a 100644 --- a/bitnami/zookeeper/README.md +++ b/bitnami/zookeeper/README.md @@ -1,4 +1,4 @@ -# Apache ZooKeeper packaged by Bitnami +# Bitnami package for Apache ZooKeeper ## What is Apache ZooKeeper? @@ -30,7 +30,7 @@ services: * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. * Bitnami containers, virtual machines and cloud images use the same components and configuration approach - making it easy to switch between formats based on your project needs. -* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading Linux distribution. +* All our images are based on [**minideb**](https://github.com/bitnami/minideb) -a minimalist Debian based container image that gives you a small base container image and the familiarity of a leading Linux distribution- or **scratch** -an explicitly empty image-. * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available.