STALE: Alpine support for NGINX Unit #259

jaydrogers · 2023-12-08T16:23:21Z

What this PR does

This PR is focused on getting NGINX Unit to work with Debian and Alpine.

Proposed Solution

Notes on how things work

https://release-v3-0.docker-php.pages.dev/docs/getting-started/contributing

Add Embed support

Convert the base image to use ZTS for embed support (Enable embed also on alpine cli docker-library/php#1355 (comment))

Update installer to support Debian and Alpine

docker-php/src/variations/unit/Dockerfile

Lines 21 to 60 in aa4ad44

    
               mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules && \ 
        
               cd /usr/src/ && \ 
        
               hg clone -u ${NGINX_UNIT_VERSION} https://hg.nginx.org/unit && \ 
        
               cd unit && \ 
        
               NCPU="$(getconf _NPROCESSORS_ONLN)" && \ 
        
               DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" && \ 
        
               CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" && \ 
        
               LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" && \ 
        
               CONFIGURE_ARGS_MODULES="--prefix=/usr \ 
        
                           --statedir=/var/lib/unit \ 
        
                           --control=unix:/var/run/control.unit.sock \ 
        
                           --runstatedir=/var/run \ 
        
                           --pid=/var/run/unit.pid \ 
        
                           --logdir=/var/log \ 
        
                           --log=/dev/stdout \ 
        
                           --tmpdir=/var/tmp \ 
        
                           --user=www-data \ 
        
                           --group=www-data \ 
        
                           --openssl \ 
        
                           --libdir=/usr/lib/$DEB_HOST_MULTIARCH" && \ 
        
               CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES --njs" && \ 
        
               make -j $NCPU -C pkg/contrib .njs && \ 
        
               export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build && \ 
        
               ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug && \ 
        
               make -j $NCPU unitd && \ 
        
               install -pm755 build/sbin/unitd /usr/sbin/unitd-debug && \ 
        
               make clean && \ 
        
               ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules && \ 
        
               make -j $NCPU unitd && \ 
        
               install -pm755 build/sbin/unitd /usr/sbin/unitd && \ 
        
               make clean && \ 
        
               /bin/true && \ 
        
               ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug && \ 
        
               ./configure php && \ 
        
               make -j $NCPU php-install && \ 
        
               make clean && \ 
        
               ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules && \ 
        
               ./configure php && \ 
        
               make -j $NCPU php-install && \ 
        
               mkdir -p /var/lib/unit/

Break the scripts into two separate files
Load the script based on the OS installing

Features to support

Compile NGINX Unit from source with the provided PHP version from the base image
Enable the copying of unitd for "production use"
Enable the copying of unitd-debug for debug use

Important notes on current functionality

We will continue to use the "Docker CMD Override" currently in place

https://github.com/serversideup/docker-php/blob/release/v3.0/src/variations/unit/etc/entrypoint.d/10-init-unit.sh#L192

Validating functionality

Ensure 8.3.12 works with bookworm

bash scripts/dev.sh --variation unit --version 8.3.13 --os bookworm

Ensure 8.3.12 works with alpine

bash scripts/dev.sh --variation unit --version 8.3.13 --os  alpine

Ensure 7.4.33 works with bullseye

bash scripts/dev.sh --variation unit --version 7.4.33 --os bullseye

Ensure 7.4.33 works with alpine

bash scripts/dev.sh --variation unit --version 7.4.33 --os  alpine

customization

images

marketing layout

component

jaydrogers · 2023-12-08T16:40:17Z

Pinging @tippexs for help 😃

jaydrogers · 2024-01-10T17:11:58Z

Hey @tippexs,

Just checking in on this item. I know you're super busy and its a community contribution -- so no sweat!

Even if you could just give me a few pointers or things to read on how to compile from source for Alpine & Debian, I might be able to tackle this myself.

Let me know your thoughts. Hope you're getting rest in between all your work too!

Thanks a ton for your help. 👍

# Conflicts: # .github/workflows/action_marketing-site-preview.yml # .github/workflows/action_marketing-site-publish.yml # .github/workflows/service_docker-build-and-publish.yml # docs/content/docs/2.getting-started/3.default-configurations.md # docs/content/docs/2.getting-started/6.about.md # docs/content/docs/3.guide/4.adding-your-own-start-up-scripts.md # docs/content/docs/3.guide/7.migrating-from-v2-to-v3.md # docs/content/docs/6.reference/1.environment-variable-specification.md # docs/nuxt.config.ts # scripts/assemble-docker-tags.sh # scripts/conf/php-versions-base-config.yml # scripts/dev.sh # src/common/etc/entrypoint.d/0-container-info.sh # src/common/etc/entrypoint.d/1-debug-mode.sh # src/common/etc/entrypoint.d/50-laravel-automations.sh # src/common/usr/local/bin/docker-php-serversideup-entrypoint # src/common/usr/local/bin/docker-php-serversideup-install-php-ext-installer # src/common/usr/local/etc/php/php.ini # src/s6/etc/entrypoint.d/10-init-webserver-config.sh # src/s6/usr/local/bin/docker-php-serversideup-s6-init # src/variations/cli/Dockerfile # src/variations/fpm-apache/etc/apache2/conf-available/remoteip.conf # src/variations/fpm-apache/etc/apache2/conf-available/security.conf # src/variations/fpm-apache/etc/apache2/mods-available/mpm_event.conf # src/variations/fpm-apache/etc/apache2/sites-available/ssl-full.conf # src/variations/fpm-apache/etc/apache2/sites-available/ssl-mixed.conf # src/variations/fpm-apache/etc/apache2/sites-available/ssl-off.conf # src/variations/fpm-apache/etc/apache2/vhost-templates/http.conf # src/variations/fpm-apache/etc/apache2/vhost-templates/https.conf # src/variations/fpm-apache/etc/s6-overlay/s6-rc.d/apache2/data/check # src/variations/fpm-apache/etc/s6-overlay/s6-rc.d/apache2/notification-fd # src/variations/fpm-apache/etc/s6-overlay/s6-rc.d/apache2/run # src/variations/fpm-apache/etc/s6-overlay/s6-rc.d/apache2/type # src/variations/fpm-nginx/Dockerfile # src/variations/fpm-nginx/etc/nginx/nginx.conf.template # src/variations/fpm/Dockerfile # src/variations/unit/Dockerfile # src/variations/unit/etc/entrypoint.d/10-init-unit.sh

jaydrogers · 2024-02-07T18:49:51Z

I just did a big merge of the release/v3.0 into main and it will be cleaner to re-open this PR when this feature is ready.

I moved all the notes here: #233 (comment)

jaydrogers added 30 commits October 19, 2023 15:54

Changed output

1082b89

Force JSON

e5faf95

Fixed variable reference

5eba03d

Reduced image versions

416c537

Show the file

4d72494

Fixed script reference

b37080c

Fixed typo

594279c

Fixed variable name

bd02c2f

Fixed file reference

9c13f47

Made file explicit

d52c496

Fixed directory

1470bbb

Fixed directory

4a03a21

Fixed variable

21e660a

Adjusted script location

be9575f

Hopefully this works

8ed0690

Added debugging

185e318

Changed script location

3781f83

More debugging

36c7b90

Added artifacts

72167d2

Removed extra listing

f77fec8

Added debugging

33c434d

Added move commadn

11b9382

Adjusted variables

2ba590d

Changed input

c2afe08

Fixed inputs

4017fcb

Removed dash

fc61b37

Adjusted versions to be first

b4097b5

Organized structure better

0ab3a97

Improved logic

fd9d502

Fixed logic

4622631

jaydrogers added 17 commits December 5, 2023 14:34

Removed arrow for compatibility reasons

f549541

Update link to discussion

8f695a8

Update PHP Docker Images with improved

cc9271d

customization

Added PHP 8.3 support

070dc0b

Update description in index.md file

449a3bc

Update description of serversideup/php Docker

d60dd90

images

Update PHP Docker Images name

0633ee9

Changed to PNG image

bfb0625

Update ogImageHeight in marketing layout

bab46fa

Update ogDescription and twitterDescription in

4d18344

marketing layout

Update social image file type

b421672

Update social image

cfee212

Adjusted OG image template

8637e21

Adjusted borders

432cb39

Update border and rounded styles in OgImage

8b2c4c4

component

Update command reference in PHP Docker image

aa4ad44

Set to ZTS to get embed (docker-library/php#1358 (comment))

358f225

jaydrogers changed the title ~~Set to ZTS to get embed (https://github.com/docker-library/php/pull/1…~~ Alpine support for NGINX Unit Dec 8, 2023

jaydrogers linked an issue Dec 8, 2023 that may be closed by this pull request

Alpine version of NGINX Unit does not exist: no PHP embed SAPI found #233

Open

10 tasks

jaydrogers mentioned this pull request Dec 8, 2023

Alpine version of NGINX Unit does not exist: no PHP embed SAPI found #233

Open

10 tasks

jaydrogers assigned jaydrogers and unassigned jaydrogers Dec 26, 2023

jaydrogers changed the base branch from release/v3.0 to main February 7, 2024 18:40

jaydrogers closed this Feb 7, 2024

jaydrogers changed the title ~~Alpine support for NGINX Unit~~ STALE: Alpine support for NGINX Unit Feb 7, 2024

jaydrogers deleted the 233-unit-alpine branch February 7, 2024 19:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

STALE: Alpine support for NGINX Unit #259

STALE: Alpine support for NGINX Unit #259

jaydrogers commented Dec 8, 2023 •

edited

Loading

jaydrogers commented Dec 8, 2023

jaydrogers commented Jan 10, 2024

jaydrogers commented Feb 7, 2024

	mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules && \
	cd /usr/src/ && \
	hg clone -u ${NGINX_UNIT_VERSION} https://hg.nginx.org/unit && \
	cd unit && \
	NCPU="$(getconf _NPROCESSORS_ONLN)" && \
	DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" && \
	CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" && \
	LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" && \
	CONFIGURE_ARGS_MODULES="--prefix=/usr \
	--statedir=/var/lib/unit \
	--control=unix:/var/run/control.unit.sock \
	--runstatedir=/var/run \
	--pid=/var/run/unit.pid \
	--logdir=/var/log \
	--log=/dev/stdout \
	--tmpdir=/var/tmp \
	--user=www-data \
	--group=www-data \
	--openssl \
	--libdir=/usr/lib/$DEB_HOST_MULTIARCH" && \
	CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES --njs" && \
	make -j $NCPU -C pkg/contrib .njs && \
	export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build && \
	./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug && \
	make -j $NCPU unitd && \
	install -pm755 build/sbin/unitd /usr/sbin/unitd-debug && \
	make clean && \
	./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules && \
	make -j $NCPU unitd && \
	install -pm755 build/sbin/unitd /usr/sbin/unitd && \
	make clean && \
	/bin/true && \
	./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug && \
	./configure php && \
	make -j $NCPU php-install && \
	make clean && \
	./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules && \
	./configure php && \
	make -j $NCPU php-install && \
	mkdir -p /var/lib/unit/

STALE: Alpine support for NGINX Unit #259

STALE: Alpine support for NGINX Unit #259

Conversation

jaydrogers commented Dec 8, 2023 • edited Loading

What this PR does

Proposed Solution

Notes on how things work

Add Embed support

Update installer to support Debian and Alpine

Features to support

Important notes on current functionality

Validating functionality

jaydrogers commented Dec 8, 2023

jaydrogers commented Jan 10, 2024

jaydrogers commented Feb 7, 2024

jaydrogers commented Dec 8, 2023 •

edited

Loading