Skip to content

Commit 11c4fa5

Browse files
committed
Applying our diffs to the docker file until richarvey#292 is merged.
1 parent 69df3d6 commit 11c4fa5

File tree

2 files changed

+53
-2
lines changed

2 files changed

+53
-2
lines changed

Dockerfile

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.2.7-fpm-alpine3.18
1+
FROM php:8.3.0-fpm-alpine3.18
22

33
LABEL maintainer="Ric Harvey <[email protected]>"
44

@@ -76,7 +76,6 @@ RUN apk add --no-cache --virtual .sys-deps \
7676
pecl install -o -f mongodb && \
7777
echo "extension=redis.so" > /usr/local/etc/php/conf.d/redis.ini && \
7878
echo "extension=mongodb.so" > /usr/local/etc/php/conf.d/mongodb.ini && \
79-
echo "zend_extension=xdebug" > /usr/local/etc/php/conf.d/xdebug.ini && \
8079
docker-php-source delete && \
8180
mkdir -p /var/www/app && \
8281
# Install composer and certbot
@@ -152,3 +151,50 @@ EXPOSE 443 80
152151

153152
WORKDIR "/var/www/html"
154153
CMD ["/start.sh"]
154+
155+
# Bring in our nginx customizations
156+
COPY conf/nginx-site.conf /etc/nginx/sites-available/default.conf
157+
COPY conf/nginx.conf /etc/nginx/nginx.conf
158+
159+
# TS Customizations
160+
RUN apk add --no-cache mysql-client \
161+
su-exec \
162+
rsync
163+
RUN export PATH="~/.composer/vendor/bin:$PATH" && \
164+
echo "sendmail_path=`which true`" >> ${php_vars} \
165+
&& echo "memory_limit = 256M" >> ${php_vars} \
166+
# Get WP CLI
167+
&& curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar \
168+
&& chmod +x wp-cli.phar \
169+
&& mv wp-cli.phar /usr/local/bin/wp \
170+
# Get Drush launcher
171+
&& wget -O drush.phar https://github.com/drush-ops/drush-launcher/releases/download/0.5.1/drush.phar \
172+
&& chmod +x drush.phar \
173+
&& mv drush.phar /usr/local/bin/drush \
174+
# Get Terminus
175+
&& mkdir -p /var/www/.composer \
176+
&& cd /var/www/.composer \
177+
&& curl -O https://raw.githubusercontent.com/pantheon-systems/terminus-installer/master/builds/installer.phar \
178+
&& php installer.phar install \
179+
# Get Drupal console
180+
&& curl https://drupalconsole.com/installer -L -o drupal.phar \
181+
&& chmod +x drupal.phar \
182+
&& mv drupal.phar /usr/local/bin/drupal
183+
# Get java for Behat/selenium/chromedriver tests
184+
RUN apk add --no-cache openjdk8-jre \
185+
patch
186+
187+
# Add an extension for commerce.
188+
RUN docker-php-ext-install bcmath
189+
190+
# Get Google Chrome (well, chromium)
191+
RUN apk add -U --no-cache --allow-untrusted chromium
192+
193+
# Add packages and settings for screener.io automated visual regression testing
194+
RUN apk add --update jq
195+
RUN apk add -U --no-cache nghttp2-dev npm
196+
RUN npm config set unsafe-perm=true
197+
ENV NODE_PATH /usr/lib/node_modules
198+
RUN npm install dotenv@latest --global
199+
RUN npm install screener-runner@latest --global
200+
# End TS Customizations

conf/nginx.conf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ http {
3333
server_tokens off;
3434
#gzip on;
3535

36+
# TS Customizations start.
37+
fastcgi_buffers 128 2048k;
38+
fastcgi_buffer_size 2048k;
39+
# TS Customizations end.
40+
3641
# Disabled due to license
3742
# geoip2 /etc/nginx/GeoLite2-Country.mmdb {
3843
# auto_reload 1h;

0 commit comments

Comments
 (0)