diff --git a/.github/workflows/podman-tests.yml b/.github/workflows/podman-tests.yml index e3cf551883..fa1773182b 100644 --- a/.github/workflows/podman-tests.yml +++ b/.github/workflows/podman-tests.yml @@ -6,7 +6,7 @@ on: - v3 pull_request: paths: - - 'documentation/docs/install-pmm/install-pmm-server/baremetal/podman.md' + - 'documentation/docs/install-pmm/install-pmm-server/baremetal/podman/index.md' workflow_dispatch: @@ -16,13 +16,13 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 1 - name: Install pandoc run: | - wget https://github.com/jgm/pandoc/releases/download/2.18/pandoc-2.18-1-amd64.deb + curl -O -sSfL https://github.com/jgm/pandoc/releases/download/2.18/pandoc-2.18-1-amd64.deb sudo apt-get install -y ./pandoc-2.18-1-amd64.deb rm pandoc-2.18-1-amd64.deb @@ -30,7 +30,7 @@ jobs: run: cp documentation/resources/bin/doc_test_template.sh ./documentation/docs_test_podman.sh - name: Get CodeBlocks and push them to test template - run: pandoc -i documentation/docs/install-pmm/install-pmm-server/baremetal/podman.md --lua-filter documentation/resources/bin/CodeBlock.lua -t html -o /dev/null >> documentation/docs_test_podman.sh + run: pandoc -i documentation/docs/install-pmm/install-pmm-server/baremetal/podman/index.md --lua-filter documentation/resources/bin/CodeBlock.lua -t html -o /dev/null >> documentation/docs_test_podman.sh - name: Run podman tests run: ./documentation/docs_test_podman.sh @@ -41,7 +41,7 @@ jobs: cat ./documentation/docs_test_podman.sh pandoc --version podman version - podman ps --all || true - systemctl status --user pmm-server || true + podman ps --all + systemctl --user status pmm-server.service || true podman inspect pmm-server || true - journalctl -r || true + journalctl --user -xe diff --git a/documentation/docs/install-pmm/install-pmm-server/baremetal/podman/index.md b/documentation/docs/install-pmm/install-pmm-server/baremetal/podman/index.md index b0b5468ba4..b82ff71687 100644 --- a/documentation/docs/install-pmm/install-pmm-server/baremetal/podman/index.md +++ b/documentation/docs/install-pmm/install-pmm-server/baremetal/podman/index.md @@ -200,16 +200,16 @@ To run Podman as a non-privileged user: Type=simple # set environment for this unit - Environment=PMM_PUBLIC_PORT=8443 + Environment=PMM_PUBLIC_PORT=443 Environment=PMM_VOLUME_NAME=%N - Environment=PMM_TAG=2.33.0 + Environment=PMM_TAG=2.44.0 Environment=PMM_IMAGE=docker.io/percona/pmm-server Environment=PMM_ENV_FILE=%h/.config/pmm-server/pmm-server.env # optional env file that could override previous env settings for this unit EnvironmentFile=-%h/.config/pmm-server/env - ExecStart=/usr/bin/podman run --rm --replace=true --name=%N -p ${PMM_PUBLIC_PORT}:443/tcp --ulimit=host --volume=${PMM_VOLUME_NAME}:/srv --env-file=${PMM_ENV_FILE} --health-cmd=none --health-interval=disable ${PMM_IMAGE}:${PMM_TAG} + ExecStart=/usr/bin/podman run --rm --replace=true --name=%N -p ${PMM_PUBLIC_PORT}:8443/tcp --ulimit=host --volume=${PMM_VOLUME_NAME}:/srv --env-file=${PMM_ENV_FILE} --health-cmd=none --health-interval=disable ${PMM_IMAGE}:${PMM_TAG} ExecStop=/usr/bin/podman stop -t 10 %N Restart=on-failure RestartSec=20 @@ -247,9 +247,9 @@ To run Podman as a non-privileged user: SystemD service uses some environment variables that could be customized if needed: ```text - Environment=PMM_PUBLIC_PORT=8443 + Environment=PMM_PUBLIC_PORT=443 Environment=PMM_VOLUME_NAME=%N - Environment=PMM_TAG=2.33.0 + Environment=PMM_TAG=2.44.0 Environment=PMM_IMAGE=docker.io/percona/pmm-server ``` @@ -258,9 +258,9 @@ To run Podman as a non-privileged user: ```sh mkdir -p ~/.config/pmm-server/ cat << "EOF" > ~/.config/pmm-server/env - PMM_TAG=2.31.0 + PMM_TAG=2.44.0 PMM_IMAGE=docker.io/percona/pmm-server - PMM_PUBLIC_PORT=8443 + PMM_PUBLIC_PORT=443 EOF ```