Skip to content

Commit 11175aa

Browse files
committed
revert docker/dev before PR
1 parent 7fcc4a7 commit 11175aa

File tree

2 files changed

+13
-66
lines changed

2 files changed

+13
-66
lines changed

docker/dev/Dockerfile

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,32 @@
11
FROM jc21/alpine-nginx-full:node
22
LABEL maintainer="Jamie Curnow <[email protected]>"
33

4+
ENV S6_LOGGING=0
45
ENV SUPPRESS_NO_CONFIG_WARNING=1
56
ENV S6_FIX_ATTRS_HIDDEN=1
6-
ENV NODE_ENV=production
77

88
RUN echo "fs.file-max = 65535" > /etc/sysctl.conf \
99
&& apk update \
1010
&& apk add python3 certbot jq \
1111
&& python3 -m ensurepip \
1212
&& rm -rf /var/cache/apk/*
1313

14+
# Task
15+
RUN cd /usr \
16+
&& curl -sL https://taskfile.dev/install.sh | sh \
17+
&& cd /root
18+
19+
COPY rootfs /
20+
RUN rm -f /etc/nginx/conf.d/production.conf
21+
1422
# s6 overlay
15-
COPY scripts/install-s6 /tmp/install-s6
16-
RUN /tmp/install-s6 "${TARGETPLATFORM}" && rm -f /tmp/install-s6
23+
RUN curl -L -o /tmp/s6-overlay-amd64.tar.gz "https://github.com/just-containers/s6-overlay/releases/download/v1.22.1.0/s6-overlay-amd64.tar.gz" \
24+
&& tar -xzf /tmp/s6-overlay-amd64.tar.gz -C /
1725

1826
EXPOSE 80
1927
EXPOSE 81
2028
EXPOSE 443
2129

22-
COPY docker/rootfs /
23-
ADD backend /app
24-
ADD frontend/dist /app/frontend
25-
COPY global /app/global
26-
27-
WORKDIR /app
28-
RUN yarn install
29-
30-
# Remove frontend service not required for prod, dev nginx config as well
31-
RUN rm -rf /etc/services.d/frontend RUN rm -f /etc/nginx/conf.d/dev.conf
30+
ENTRYPOINT [ "/init" ]
3231

33-
VOLUME [ "/data", "/etc/letsencrypt" ]
34-
ENTRYPOINT [ "/init" ]
32+
HEALTHCHECK --interval=5s --timeout=3s CMD /bin/check-health

docker/dev/docker-compose.yaml

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

0 commit comments

Comments
 (0)