Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,3 @@ web.config
vwd.webinfo
WebEssentials-Settings.json
vendor
composer.lock
6 changes: 5 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ COPY package.json ./

RUN npm install

RUN npx tsc --version
Comment thread
BigSpaceships marked this conversation as resolved.
Outdated

COPY package.json tsconfig.json gulpfile.js ./
COPY assets ./assets
RUN npm run-script build
Expand All @@ -14,7 +16,7 @@ RUN npm run-script build
FROM docker.io/php:7.3-apache
LABEL author="Devin Matte <matted@csh.rit.edu>"

RUN echo "deb-src http://deb.debian.org/debian buster main" >> /etc/apt/sources.list
RUN echo "deb-src http://archive.debian.org/debian buster main" >> /etc/apt/sources.list

RUN apt-get -yq update && \
apt-get -yq install \
Expand Down Expand Up @@ -59,6 +61,8 @@ RUN a2enmod rewrite && a2enmod headers && a2enmod expires && \
sed -i '/Listen/{s/\([0-9]\+\)/8080/; :a;n; ba}' /etc/apache2/ports.conf && \
chmod og+rwx /var/lock/apache2 && chmod -R og+rwx /var/run/apache2

RUN git config --global --add safe.directory /var/www/html

COPY . /var/www/html
COPY --from=builder /usr/src/schedule/assets/prod /var/www/html/assets/prod

Expand Down
2 changes: 1 addition & 1 deletion api/generate.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function ajaxErrorHandler($errno, $errstr, $errfile, $errline) {
}

$course = strtoupper($course);
preg_match('/([A-Z]{4})[-\s]*(\d{0,3}[A-Z]?)?(?:[-\s]+(\d{0,2}[A-Z]?\d?))?/', $course, $courseParts);
preg_match('/([A-Z0-9]{4})[-\s]*(\d{0,3}[A-Z]?)?(?:[-\s]+(\d{0,2}[A-Z]?\d?))?/', $course, $courseParts);

// Query base: Noncancelled courses from the requested term
$query = "SELECT s.id
Expand Down
Loading
Loading