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.

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

Add labels to Dockerfile, minor improvements #1572

Merged
merged 2 commits into from
May 10, 2021
Merged

Conversation

lucacome
Copy link
Member

@lucacome lucacome commented May 5, 2021

  • Moved all the labels to a single layer and used org.opencontainers.image format
  • Added detection of NGINX version in the Makefile for UBI and removed the hardcoded one

@lucacome lucacome self-assigned this May 5, 2021
@github-actions github-actions bot added the chore Pull requests for routine tasks label May 5, 2021

RUN mkdir -p /var/lib/nginx /etc/nginx/secrets /etc/nginx/stream-conf.d \
&& setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx 'cap_net_bind_service=+ep' /usr/sbin/nginx-debug \
&& chown -R nginx:0 /etc/nginx /var/cache/nginx /var/lib/nginx \
&& setcap -v 'cap_net_bind_service=+ep' /usr/sbin/nginx 'cap_net_bind_service=+ep' /usr/sbin/nginx-debug \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will check that setcap worked.

@lucacome lucacome requested review from a team, pleshakov and soneillf5 and removed request for a team May 7, 2021 18:19
@lucacome lucacome merged commit bfc4177 into master May 10, 2021
@lucacome lucacome deleted the chore/polish-dockerfile branch May 10, 2021 16:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Pull requests for routine tasks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants