Skip to content

Commit

Permalink
Merge branch 'dev' into USAGOV-2046-remove-actions-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
@akf
akf authored Dec 27, 2024
2 parents dbeae2d + 6c44375 commit afcbaf2
Show file tree
Hide file tree
Showing 44 changed files with 1,681 additions and 919 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ commands:
echo "git checkout << parameters.envname >>"
echo "git fetch --all --tags"
echo "git pull"
echo bin/deploy/git-annotated-tag-creator.sh << parameters.envname >> << pipeline.number >> $CMS_DIGEST $WAF_DIGEST
echo bin/deploy/git-annotated-tag-creator.sh << parameters.envname >> << pipeline.number >> $CMS_DIGEST $WAF_DIGEST $WWW_DIGEST
echo
fi
- run:
Expand Down
102 changes: 51 additions & 51 deletions .docker/Dockerfile-cms
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ RUN COMPOSER_MEMORY_LIMIT=-1 composer install --ignore-platform-reqs --no-intera

# USER www-data
###############################################################
FROM node:20.10-bullseye-slim AS theme-builder
FROM node:20-bullseye-slim AS theme-builder

ARG BUID=1000
ARG BGID=1000
Expand Down Expand Up @@ -104,7 +104,7 @@ RUN npm install --production=false --prefix /var/www/web/themes/custom/usagov \
&& chown -R node:node /var/www/web/themes

###############################################################
FROM alpine:3.18 AS cms
FROM alpine:3.20 AS cms

ARG S6_VERSION
ENV S6_VERSION ${S6_VERSION:-v2.2.0.3}
Expand Down Expand Up @@ -153,54 +153,54 @@ RUN sed -E -i "s/:x:${BUID}:/:x:1919:/g" /etc/passwd \
mariadb-connector-c \
nginx \
nginx-mod-http-lua \
php81 \
php81-fpm \
php81-bcmath \
php81-bz2 \
php81-calendar \
php81-curl \
php81-ctype \
php81-dom \
php81-fileinfo \
php81-ftp \
php81-gd \
php81-intl \
php81-iconv \
php81-imap \
php81-intl \
php81-json \
php81-ldap \
php81-mbstring \
php81-mysqlnd \
php81-openssl \
php81-opcache \
php81-pcntl \
php81-pdo \
php81-pdo_mysql \
php81-pdo_sqlite \
php81-pear \
php81-pecl-imagick \
php81-pecl-xdebug \
php81-phar \
php81-posix \
php81-session \
php81-simplexml \
php81-shmop \
php81-soap \
php81-sockets \
php81-sodium \
php81-sqlite3 \
php81-sysvmsg \
php81-sysvsem \
php81-sysvshm \
php81-tokenizer \
php81-tidy \
php81-xsl \
php81-xml \
php81-xmlreader \
php81-xmlwriter \
php81-zip \
php81-zlib \
php83 \
php83-fpm \
php83-bcmath \
php83-bz2 \
php83-calendar \
php83-curl \
php83-ctype \
php83-dom \
php83-fileinfo \
php83-ftp \
php83-gd \
php83-intl \
php83-iconv \
php83-imap \
php83-intl \
php83-json \
php83-ldap \
php83-mbstring \
php83-mysqlnd \
php83-openssl \
php83-opcache \
php83-pcntl \
php83-pdo \
php83-pdo_mysql \
php83-pdo_sqlite \
php83-pear \
php83-pecl-imagick \
php83-pecl-xdebug \
php83-phar \
php83-posix \
php83-session \
php83-simplexml \
php83-shmop \
php83-soap \
php83-sockets \
php83-sodium \
php83-sqlite3 \
php83-sysvmsg \
php83-sysvsem \
php83-sysvshm \
php83-tokenizer \
php83-tidy \
php83-xsl \
php83-xml \
php83-xmlreader \
php83-xmlwriter \
php83-zip \
php83-zlib \
&& mkdir -p /var/www/web/sites/default/files \
# s6 supervisor setup
&& tar xzf /tmp/s6overlay.tar.gz -C / \
Expand All @@ -217,7 +217,7 @@ RUN sed -E -i "s/:x:${BUID}:/:x:1919:/g" /etc/passwd \
&& mkdir -p /run/nginx/ \
&& touch /run/nginx/nginx.pid \
# php setup
&& ln -s /usr/sbin/php-fpm81 /usr/sbin/php-fpm
&& ln -s /usr/sbin/php-fpm83 /usr/sbin/php-fpm

# new relic setup
COPY bin/src/newrelic.sh /local/newrelic.sh
Expand Down
102 changes: 51 additions & 51 deletions .docker/Dockerfile-www
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

###############################################################
FROM alpine:3.18 AS www
FROM alpine:3.20 AS www

ARG S6_VERSION
ENV S6_VERSION ${S6_VERSION:-v2.2.0.3}
Expand Down Expand Up @@ -49,54 +49,54 @@ RUN sed -E -i "s/:x:${BUID}:/:x:1919:/g" /etc/passwd \
mariadb-connector-c \
nginx \
nginx-mod-http-lua \
php81 \
# php81-fpm \
php81-bcmath \
php81-bz2 \
php81-calendar \
php81-curl \
php81-ctype \
php81-dom \
php81-fileinfo \
php81-ftp \
php81-gd \
php81-intl \
php81-iconv \
php81-imap \
php81-intl \
php81-json \
php81-ldap \
php81-mbstring \
php81-mysqlnd \
php81-openssl \
php81-opcache \
php81-pcntl \
php81-pdo \
php81-pdo_mysql \
php81-pdo_sqlite \
php81-pear \
php81-pecl-imagick \
php81-pecl-xdebug \
php81-phar \
php81-posix \
php81-session \
php81-simplexml \
php81-shmop \
php81-soap \
php81-sockets \
php81-sodium \
php81-sqlite3 \
php81-sysvmsg \
php81-sysvsem \
php81-sysvshm \
php81-tokenizer \
php81-tidy \
php81-xsl \
php81-xml \
php81-xmlreader \
php81-xmlwriter \
php81-zip \
php81-zlib \
php83 \
# php83-fpm \
php83-bcmath \
php83-bz2 \
php83-calendar \
php83-curl \
php83-ctype \
php83-dom \
php83-fileinfo \
php83-ftp \
php83-gd \
php83-intl \
php83-iconv \
php83-imap \
php83-intl \
php83-json \
php83-ldap \
php83-mbstring \
php83-mysqlnd \
php83-openssl \
php83-opcache \
php83-pcntl \
php83-pdo \
php83-pdo_mysql \
php83-pdo_sqlite \
php83-pear \
php83-pecl-imagick \
php83-pecl-xdebug \
php83-phar \
php83-posix \
php83-session \
php83-simplexml \
php83-shmop \
php83-soap \
php83-sockets \
php83-sodium \
php83-sqlite3 \
php83-sysvmsg \
php83-sysvsem \
php83-sysvshm \
php83-tokenizer \
php83-tidy \
php83-xsl \
php83-xml \
php83-xmlreader \
php83-xmlwriter \
php83-zip \
php83-zlib \
&& mkdir -p /var/www/web/sites/default/files \
# s6 supervisor setup
&& tar xzf /tmp/s6overlay.tar.gz -C / \
Expand All @@ -111,10 +111,10 @@ RUN sed -E -i "s/:x:${BUID}:/:x:1919:/g" /etc/passwd \
&& ln -s /dev/stderr /var/log/nginx/error.log \
&& ln -s /dev/stdout /var/log/nginx/access.log \
&& mkdir -p /run/nginx/ \
&& touch /run/nginx/nginx.pid
&& touch /run/nginx/nginx.pid
# \
# php setup
#&& ln -s /usr/sbin/php-fpm81 /usr/sbin/php-fpm
#&& ln -s /usr/sbin/php-fpm83 /usr/sbin/php-fpm

# new relic setup
COPY bin/src/newrelic.sh /local/newrelic.sh
Expand Down
1 change: 1 addition & 0 deletions .docker/src-cms/50_xdebug.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ xdebug.client_host=host.docker.internal
xdebug.idekey=VSCODE
xdebug.max_nesting_level=1500
xdebug.mode=debug
# xdebug.start_with_request=1
13 changes: 0 additions & 13 deletions .docker/src-cms/etc/nginx/partials/drupal.conf.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,19 +79,6 @@
}

location / {
# Decode the URI for proper matching
set $decoded_uri $uri;
# We will react on URLs ending with spaces, non-breaking spaces, thin-space, and Em-space
if ($decoded_uri ~* ^(.+?)(%C2%A0|\xA0|%E2%80%89|\xE2\x80\x89|%E2%80%83|\xE2\x80\x83)+$) {
set $clean_uri $1;
return 301 $clean_uri;
}
# Match and strip other partial %C2 sequences from the end of the URI
if ($uri ~* ^(.+?)(%C2|\xC2)+$) {
set $clean_uri $1;
return 301 $clean_uri;
}

# try_files $uri @rewrite; # For Drupal <= 6
try_files $uri /index.php?$query_string; # For Drupal >= 7
}
Expand Down
0 .docker/src-cms/etc/php81/auto_prepend.php → .docker/src-cms/etc/php83/auto_prepend.php
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion .docker/src-cms/etc/php81/php-fpm.conf → .docker/src-cms/etc/php83/php-fpm.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ daemonize = no

events.mechanism = epoll

include=/etc/php81/php-fpm.d/*.conf
include=/etc/php83/php-fpm.d/*.conf
0 ...src-cms/etc/php81/php-fpm.d/env.conf.tmpl → ...src-cms/etc/php83/php-fpm.d/env.conf.tmpl
View file
File renamed without changes.
0 .docker/src-cms/etc/php81/php-fpm.d/www.conf → .docker/src-cms/etc/php83/php-fpm.d/www.conf
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion .docker/src-cms/etc/php81/php.ini → .docker/src-cms/etc/php83/php.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ report_memleaks = On
track_errors = Off
html_errors = On

auto_prepend_file = /etc/php81/auto_prepend.php
auto_prepend_file = /etc/php83/auto_prepend.php
auto_append_file =

default_mimetype = "text/html"
Expand Down
4 changes: 0 additions & 4 deletions .docker/src-waf/etc/nginx/conf.d/default.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,6 @@ server {
if ($http_x_usa_forwarded_host ~* ^(www\.)?govloans\.gov$) {
set $HostMatchFail "matched";
}
# gsa.benefits.gov is for testing; we can remove it after cutover
if ($http_x_usa_forwarded_host ~* ^gsa\.benefits\.gov$) {
set $HostMatchFail "matched";
}

if ($HostMatchFail = "NOMATCH") {
# didn't match expected host; redirect to home page.
Expand Down
6 changes: 0 additions & 6 deletions .docker/src-waf/etc/nginx/snippets/domain-redirects.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,6 @@
break;
}

## gsa.benefits.gov is for testing of the benefits rewrites and can be removed after cutover:
if ($cf_forwarded_host ~* ^gsa\.benefits\.gov$) {
set $port 8889;
break;
}

## govloans.gov (part of the benefits.gov transition)
if ($cf_forwarded_host ~* ^(www\.)?govloans\.gov$) {
set $port 8889;
Expand Down
14 changes: 0 additions & 14 deletions .docker/src-www/etc/nginx/partials/staticsite.conf.tmpl
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,4 @@

location / {
# Decode the URI for proper matching
set $decoded_uri $uri;
if ($decoded_uri ~* ^(.+?)(%C2%A0|\xA0|%E2%80%89|\xE2\x80\x89|%E2%80%83|\xE2\x80\x83)+$) {
set $clean_uri $1;
return 301 $clean_uri;
}
# Match and strip other partial %C2 sequences from the end of the URI
if ($uri ~* ^(.+?)(%C2|\xC2)+$) {
set $clean_uri $1;
return 301 $clean_uri;
}
}

# spanish main url - easier as a separate case vs in another regex
location ~* ^/(es)$ {
error_page 404 @notFoundSpanish;
Expand Down
Loading

0 comments on commit afcbaf2

Please sign in to comment.