File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -99,15 +99,15 @@ ENV PATH="/opt/cmdeploy/bin:${PATH}"
9999RUN ln -s /etc/chatmail/chatmail.ini /opt/chatmail/chatmail.ini
100100
101101ARG CHATMAIL_INIT_SERVICE_PATH=/lib/systemd/system/chatmail-init.service
102- COPY ./docker/chatmail-init.service "$CHATMAIL_INIT_SERVICE_PATH"
102+ COPY ./docker/scripts/ chatmail-init.service "$CHATMAIL_INIT_SERVICE_PATH"
103103RUN ln -sf "$CHATMAIL_INIT_SERVICE_PATH" "/etc/systemd/system/multi-user.target.wants/chatmail-init.service"
104104
105105# Remove default nginx site config at build time (not in entrypoint)
106106RUN rm -f /etc/nginx/sites-enabled/default
107107
108- COPY --chmod=555 ./docker/chatmail-init.sh /chatmail-init.sh
109- COPY --chmod=555 ./docker/entrypoint.sh /entrypoint.sh
110- COPY --chmod=555 ./docker/healthcheck.sh /healthcheck.sh
108+ COPY --chmod=555 ./docker/scripts/ chatmail-init.sh /chatmail-init.sh
109+ COPY --chmod=555 ./docker/scripts/ entrypoint.sh /entrypoint.sh
110+ COPY --chmod=555 ./docker/scripts/ healthcheck.sh /healthcheck.sh
111111
112112HEALTHCHECK --interval=10s --start-period=180s --timeout=10s --retries=3 \
113113 CMD /healthcheck.sh
Original file line number Diff line number Diff line change @@ -23,8 +23,8 @@ services:
2323 # - ./data/www:/opt/chatmail-www
2424
2525 ## Debug — mount scripts for live editing:
26- # - ./chatmail-init.sh:/chatmail-init.sh
27- # - ./entrypoint.sh:/entrypoint.sh
26+ # - ./scripts/ chatmail-init.sh:/chatmail-init.sh
27+ # - ./scripts/ entrypoint.sh:/entrypoint.sh
2828
2929 # environment:
3030 ## Mount certs (above) and set TLS_EXTERNAL_CERT_AND_KEY to in-container paths.
Original file line number Diff line number Diff line change @@ -9,5 +9,5 @@ export GIT_HASH=$(git rev-parse HEAD)
99export SOURCE_REF=$( git symbolic-ref --short HEAD 2> /dev/null || echo " $GIT_HASH " )
1010export SOURCE_URL=$( git remote get-url origin 2> /dev/null || echo " unknown" )
1111export BUILD_DATE=$( date -u +%Y-%m-%dT%H:%M:%SZ)
12- cp " $( dirname " $0 " ) /.dockerignore" .dockerignore
12+ cp " $( dirname " $0 " ) /../. dockerignore" .dockerignore
1313exec docker compose -f docker/docker-compose.yaml build " $@ "
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
You can’t perform that action at this time.
0 commit comments