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

Fix example Dockerfile #113

Merged
merged 3 commits into from
Mar 18, 2024
Merged

Fix example Dockerfile #113

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
9b33ab4
Add composer installer
ackintosh Mar 18, 2024
000c6f6
Fix the redis extension version to 5.x
ackintosh Mar 18, 2024
32abdc5
Add XDEBUG_MODE to enable coverage report
ackintosh Mar 18, 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 docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ services:
GANESHA_EXAMPLE_REDIS: "redis"
GANESHA_EXAMPLE_MONGO: "mongo"
RUN_IN_DOCKER_COMPOSE: 1
XDEBUG_MODE: coverage
memcached:
image: memcached:1.5.4
container_name: memcached
Expand Down
10 changes: 4 additions & 6 deletions examples/client/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM php:8.0-cli

COPY install_composer.sh /tmp/

RUN apt-get update \
&& apt-get install --no-install-recommends -y git \
&& apt-get install --no-install-recommends -y libmemcached-dev \
Expand All @@ -11,7 +13,7 @@ RUN apt-get update \
&& echo 'extension=zip.so' >> /usr/local/etc/php/php.ini \
&& yes '' | pecl install memcached \
&& echo 'extension=memcached.so' >> /usr/local/etc/php/php.ini \
&& yes '' | pecl install redis \
&& yes '' | pecl install redis-5.3.7 \
&& echo 'extension=redis.so' >> /usr/local/etc/php/php.ini \
&& yes '' | pecl install xdebug-3.1.5 \
&& echo 'zend_extension=xdebug.so' >> /usr/local/etc/php/php.ini \
Expand All @@ -25,9 +27,5 @@ RUN apt-get update \
&& rm -rf /var/cache/apt/* \
# Install composer
# https://getcomposer.org/download/
&& php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
&& php -r "if (hash_file('sha384', 'composer-setup.php') === '55ce33d7678c5a611085589f1f3ddf8b3c52d662cd01d4ba75c0ee0459970c2200a51f492d557530c71c15d8dba01eae') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
&& php composer-setup.php \
&& php -r "unlink('composer-setup.php');" \
&& /tmp/install_composer.sh \
&& mv composer.phar /usr/local/bin/composer

19 changes: 19 additions & 0 deletions examples/client/install_composer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/sh

# https://getcomposer.org/doc/faqs/how-to-install-composer-programmatically.md

EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')"
php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', 'composer-setup.php');")"

if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]
then
>&2 echo 'ERROR: Invalid installer checksum'
rm composer-setup.php
exit 1
fi

php composer-setup.php --quiet
RESULT=$?
rm composer-setup.php
exit $RESULT
Loading