Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PMM-7 Run supervisor as pmm during build #3309

Merged
merged 3 commits into from
Nov 15, 2024
Merged

PMM-7 Run supervisor as pmm during build #3309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad61daa
PMM-7 Run supervisor as pmm during build
ademidoff Nov 14, 2024
d2240d1
PMM-7 Fix label assignment syntax warning
ademidoff Nov 14, 2024
88fba9f
PMM-7 Clean yum cache as well
ademidoff Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build/ansible/pmm-docker/post-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
- /var/log/nginx
- /var/lib/pgsql
- /srv/pmm-encryption.key
- /var/cache/yum

- name: Remove users created by installers
user:
Expand Down
3 changes: 3 additions & 0 deletions build/ansible/roles/pmm-images/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,9 @@
# During build time, this will be the first start of supervisord.
- name: Start supervisord
shell: supervisord -c /etc/supervisord.conf &
become: true
become_user: pmm
become_method: su

- name: Run initialization playbook
include_role:
Expand Down
10 changes: 5 additions & 5 deletions build/docker/server/Dockerfile.el9
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ RUN install -T -p -m 644 /opt/ansible/ansible.cfg /etc/ansible/ansible.cfg && \
ansible-playbook -vvv /opt/ansible/pmm-docker/post-build.yml && \
sed -i '/^assumeyes/d' /etc/dnf/dnf.conf

LABEL org.opencontainers.image.created ${BUILD_DATE}
LABEL org.opencontainers.image.licenses AGPL-3.0
LABEL org.opencontainers.image.title Percona Monitoring and Management
LABEL org.opencontainers.image.vendor Percona LLC
LABEL org.opencontainers.image.version ${VERSION}
LABEL org.opencontainers.image.created=${BUILD_DATE}
LABEL org.opencontainers.image.licenses=AGPL-3.0
LABEL org.opencontainers.image.title="Percona Monitoring and Management"
LABEL org.opencontainers.image.vendor="Percona LLC"
LABEL org.opencontainers.image.version=${VERSION}

USER pmm

Expand Down
Loading