Skip to content

Commit 471d396

Browse files
committed
Simpler architecture with no apache config.
1 parent 069a499 commit 471d396

4 files changed

Lines changed: 5 additions & 27 deletions

File tree

Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
FROM php:apache
22

3-
RUN a2enmod rewrite
4-
5-
COPY apache-conf/color.brick.design.conf /etc/apache2/sites-available/000-default.conf
6-
7-
RUN mkdir -p /var/www/app/cache/parts && chown -R www-data:www-data /var/www/app/cache
3+
RUN mkdir -p /var/www/cache/parts && chown -R www-data:www-data /var/www/cache
84

95
EXPOSE 80

apache-conf/color.brick.design.conf

Lines changed: 0 additions & 18 deletions
This file was deleted.

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ services:
55
restart: unless-stopped
66
env_file: .env
77
volumes:
8-
- ./public:/var/www/app/public:ro
9-
- ./server:/var/www/app/server:ro
10-
- ./data:/var/www/app/data:ro
8+
- ./public:/var/www/html:ro
9+
- ./server:/var/www/server:ro
10+
- ./data:/var/www/data:ro
1111

1212
tunnel:
1313
image: cloudflare/cloudflared:latest

public/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
$view = "parts";
139139
if ($get_sets == []) { ?>
140140
<p>Does colorblindness make it difficult to see whether parts in a set are actually different colors?<br><br>
141-
Enter a set name or number to see a list of parts (and their count) in colors similar enough to be confusing for the selected color deficiency. <a href="/set=10197-1">Try a sample</a>.</p>
141+
Enter a set name or number to see a list of parts (and their count) in colors similar enough to be confusing for the selected color deficiency. <a href="/?set=10197-1">Try a sample</a>.</p>
142142
<?php
143143
} else if (array_key_exists("view", $_GET) && $_GET["view"] === "colors")
144144
show_similar_colors($parts_bycolor, $similar_color_bank);

0 commit comments

Comments
 (0)