diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index ccd2914..0000000 --- a/Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -FROM php:7.4-fpm -ARG ENVIORNMENT_TYPE - -#Install dependencies and php extensions -RUN apt-get update && apt-get install -y \ - git \ - libfreetype6-dev \ - libjpeg62-turbo-dev \ - libpng-dev \ - libpq-dev \ - unzip \ - wget \ - supervisor \ - apache2 \ - && docker-php-ext-configure gd \ - && docker-php-ext-install -j$(nproc) gd - -#Install AWS CLI v2 -RUN if [ "$ENVIORNMENT_TYPE" != "local" ] ;then \ - curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \ - && unzip awscliv2.zip \ - && ./aws/install\ - ;fi - -RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf -RUN apachectl start - -#Create user ssm-user -RUN useradd -ms /bin/bash ssm-user -RUN mkdir -p /var/www/html \ - && chown ssm-user:www-data /var/www/html - -#install composer -COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer - -#Copy over files -COPY --chown=ssm-user:www-data . /var/www/html/ - -WORKDIR /var/www/html -#run setup script -RUN chmod +x deploy/udoit-ng.sh -RUN deploy/udoit-ng.sh - -CMD php-fpm diff --git a/deploy/udoit-ng.sh b/deploy/udoit-ng.sh deleted file mode 100644 index cbbb884..0000000 --- a/deploy/udoit-ng.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -# change to the new file location -cd /var/www/html - -# copy localConfig from S3 if you are not on local -if [ "$ENVIORNMENT_TYPE" != "local" ] -then - aws s3 cp s3://cidilabs-devops/udoit3/.env.local.$ENVIORNMENT_TYPE /var/www/html/.env.local -fi - -# run composer install -composer install --no-dev --no-interaction --no-progress --optimize-autoloader - -# change all file and directory permissions to give apache sufficient access -sudo find /var/www/html -type f -exec chmod 664 {} + -o -type d -exec chmod 775 {} + - -# only setup newrelic if not on local. -if [ "$ENVIORNMENT_TYPE" != "local" ] -then - # create .user.ini file for New Relic (PHP-FPM only) - touch /var/www/html/public/.user.ini - # add New Relic appname - echo -e "\nnewrelic.appname = \"$NEW_RELIC_APP_NAME\"" >> /var/www/html/public/.user.ini -fi - -# start queue monitor -/usr/bin/supervisord - -# restart apaches -# apachectl restart diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 833db8f..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: '3.3' - -services: - php: - build: - context: . - dockerfile: Dockerfile - volumes: - - .:/var/www/html - ports: - - "8000:8000" -volumes: - web: - dbdata: diff --git a/src/Rule/BrokenRedirectedLink.php b/src/Rule/BrokenRedirectedLink.php index 4937501..aa83a37 100644 --- a/src/Rule/BrokenRedirectedLink.php +++ b/src/Rule/BrokenRedirectedLink.php @@ -66,7 +66,7 @@ public function check() foreach ($this->getAllElements('a') as $a) { $href = $a->getAttribute('href'); if ($href) { - $links[$href] = $a; // href should exclude start with '#' + $links[$href] = $a; } } $this->linkCheck($links);