-
Notifications
You must be signed in to change notification settings - Fork 2
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
feat: BL-17333 - Dockerfile and resources for Apache PHP 8.2, base image only #42
Merged
Merged
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
de990b9
Dockerfile and resources for apache php8.3
CWRahien 1d5f71c
filename uppercased
CWRahien 1602e85
force commit change filename
CWRahien b8fa653
remove filename typo to reprompt gha job
CWRahien d6fee7d
repush failed run
CWRahien 56a1445
add apache proxy files and sysconfig
CWRahien cbce5e4
lint fixes
CWRahien ac6a2cf
lint fixes
CWRahien 744e5da
lint fixes, removing update command
CWRahien 37f0302
rm cache apk* to remove unneeded cache load
CWRahien 218590f
finally, add package versions
CWRahien cd50c1a
more package versions
CWRahien 909bfd2
attempt ignore for package version until we resolve each package spec…
CWRahien 441fd1a
nocache options
CWRahien 8580023
use dockerhub alpine image
CWRahien f98d76e
add tailing lines, remove superfluous comment
CWRahien a49a9cf
Merge branch 'main' into feat/BL-17333-base_docker_image
CWRahien c22a99c
revert to 8.2, scale to base php image
CWRahien 6318354
remove defunct zip
CWRahien b8e838c
php82 file name change
CWRahien File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
FROM php:8.2-fpm-alpine3.20 | ||
|
||
# hadolint ignore=DL3018 | ||
RUN apk update && \ | ||
apk upgrade --no-cache && \ | ||
apk add --no-cache \ | ||
jq \ | ||
openrc \ | ||
apache2 \ | ||
apache2-ctl \ | ||
build-base \ | ||
apache2-proxy && \ | ||
apk del php82-apache2 && \ | ||
rm /var/cache/apk/* | ||
|
||
|
||
# (Default Virtual Host is created with Apache install) | ||
# Disable prefork and enable event | ||
RUN sed -ri -e 's!^LoadModule mpm_prefork_module modules/mod_mpm_prefork.so!#LoadModule mpm_prefork_module modules/mod_mpm_prefork.so!g' /etc/apache2/httpd.conf && \ | ||
sed -ri -e 's!^#LoadModule mpm_event_module modules/mod_mpm_event.so!LoadModule mpm_event_module modules/mod_mpm_event.so!g' /etc/apache2/httpd.conf && \ | ||
sed -ri -e 's!^#LoadModule expires_module modules/mod_expires.so!LoadModule expires_module modules/mod_expires.so!g' /etc/apache2/httpd.conf && \ | ||
sed -ri -e 's!^#LoadModule rewrite_module modules/mod_rewrite.so!LoadModule rewrite_module modules/mod_rewrite.so!g' /etc/apache2/httpd.conf | ||
|
||
# Copy Apache FPM proxy config | ||
COPY ./php-fpm-proxy.conf /etc/apache2/conf.d/php-fpm-proxy.conf | ||
|
||
# Apache Config file | ||
COPY ./httpd-sysconfig /etc/sysconfig/httpd | ||
|
||
# Apache service start script | ||
COPY httpd-foreground /usr/local/bin/ | ||
RUN chmod +x /usr/local/bin/httpd-foreground |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
#!/bin/sh | ||
set -e | ||
# (this short script is taken from the official Apache Alpine dockerfile) | ||
|
||
# Apache gets grumpy about PID files pre-existing | ||
rm -f /usr/local/apache2/logs/httpd.pid | ||
|
||
exec httpd -DFOREGROUND "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# | ||
# This file can be used to set additional environment variables for | ||
# the httpd process, or pass additional options to the httpd | ||
# executable. | ||
# | ||
# Note: With previous versions of httpd, the MPM could be changed by | ||
# editing an "HTTPD" variable here. With the current version, that | ||
# variable is now ignored. The MPM is a loadable module, and the | ||
# choice of MPM can be changed by editing the configuration file | ||
# /etc/httpd/conf.modules.d/00-mpm.conf. | ||
# | ||
|
||
# | ||
# To pass additional options (for instance, -D definitions) to the | ||
# httpd binary at startup, set OPTIONS here. | ||
# | ||
#OPTIONS= | ||
|
||
# | ||
# This setting ensures the httpd process is started in the "C" locale | ||
# by default. (Some modules will not behave correctly if | ||
# case-sensitive string comparisons are performed in a different | ||
# locale.) | ||
# | ||
LANG=C | ||
|
||
umask 0027 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<FilesMatch \.php$> | ||
SetHandler "proxy:fcgi://127.0.0.1:9000" | ||
</FilesMatch> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How come the PHP 8.0 lines were added in this PR without a respective Dockerfile? Can we sort this please - it has broken the CI.
@CWRahien @jcrozier @barkerl
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That looks to be the php8.0 VOL cli image if i had to guess. It looks like this will have been a timing/rebasing issue after those were removed from the VOL side.
I think these can probably safely be removed, the CI workflows weren't failing prior to merge.