Skip to content

Commit cb8cdfe

Browse files
committed
Flattening file structure further.
Standardizing on image-specific docker locations.
1 parent c4155bf commit cb8cdfe

File tree

11 files changed

+3
-3
lines changed

11 files changed

+3
-3
lines changed

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ services:
4444

4545
studio-app:
4646
<<: *studio-worker
47-
entrypoint: python docker/entrypoint.py
47+
entrypoint: python docker/studio-dev/entrypoint.py
4848
command: pnpm run devserver
4949
ports:
5050
- "8080:8080"

docker/Dockerfile.nginx.prod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM nginx:1.25
22

33
# Build from inside the directory by overriding this.
4-
ARG SRC_DIR=docker/prod/nginx
4+
ARG SRC_DIR=docker/nginx
55

66
RUN rm /etc/nginx/conf.d/* # if there's stuff here, nginx won't read sites-enabled
77
COPY ${SRC_DIR}/nginx.conf /etc/nginx/nginx.conf
File renamed without changes.
File renamed without changes.

docker/prod/nginx/includes/content/default.conf renamed to docker/nginx/includes/content/default.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# DO NOT RENAME: referenced by docker/prod/nginx/entrypoint.sh
1+
# DO NOT RENAME: referenced by docker/nginx/entrypoint.sh
22

33
# assume development
44
location @emulator {

docker/prod/nginx/includes/content/develop-studio-content.conf renamed to docker/nginx/includes/content/develop-studio-content.conf

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)