Skip to content

Commit cddc677

Browse files
committed
Moving nginx files out of and housing them with other image-specific files.
1 parent 840dcad commit cddc677

File tree

8 files changed

+10
-3
lines changed

8 files changed

+10
-3
lines changed

k8s/images/nginx/Dockerfile

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
FROM nginx:1.25
22

3+
# Build from inside the directory by overriding this.
4+
ARG SRC_DIR=k8s/images/nginx
5+
36
RUN rm /etc/nginx/conf.d/* # if there's stuff here, nginx won't read sites-enabled
4-
COPY deploy/nginx.conf /etc/nginx/nginx.conf
5-
COPY deploy/includes /etc/nginx/includes
6-
COPY k8s/images/nginx/entrypoint.sh /usr/bin
7+
COPY ${SRC_DIR}/nginx.conf /etc/nginx/nginx.conf
8+
COPY ${SRC_DIR}/includes /etc/nginx/includes
9+
COPY ${SRC_DIR}/entrypoint.sh /usr/bin
10+
11+
# Really seems like it _should_ be here, as it's referenced by `nginx.conf`.
12+
# But it's hasn't been for years.
13+
# COPY ${SRC_DIR}/mime.types /etc/nginx/mime.types
714

815
CMD ["entrypoint.sh"]
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)