Skip to content

Commit 28a2b4c

Browse files
committed
s6 for all archs, remove cruft
1 parent d44143b commit 28a2b4c

File tree

9 files changed

+44
-432
lines changed

9 files changed

+44
-432
lines changed

docker/Dockerfile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,21 @@ ENV S6_FIX_ATTRS_HIDDEN=1
4444
RUN echo "fs.file-max = 65535" > /etc/sysctl.conf
4545

4646
# s6 overlay
47-
RUN curl -L -o /tmp/s6-overlay-amd64.tar.gz "https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-amd64.tar.gz" \
48-
&& tar -xzf /tmp/s6-overlay-amd64.tar.gz -C /
47+
COPY scripts/install-s6 /tmp/install-s6
48+
RUN /tmp/install-s6 "${TARGETPLATFORM}" && rm -rf /tmp/*
4949

5050
EXPOSE 80/tcp 81/tcp 443/tcp
5151

5252
COPY docker/rootfs /
5353

5454
# Remove frontend service not required for prod, dev nginx config as well
55-
RUN rm -rf /etc/services.d/frontend /etc/nginx/conf.d/dev.conf
55+
# and remove any other cruft
56+
RUN rm -rf /etc/services.d/frontend \
57+
/etc/nginx/conf.d/dev.conf \
58+
/var/cache/* \
59+
/var/log/* \
60+
/tmp/* \
61+
/var/lib/dpkg/status-old
5662

5763
VOLUME /data
5864

Binary file not shown.
Binary file not shown.
Binary file not shown.
-820 KB
Binary file not shown.
-2.77 KB
Binary file not shown.

docker/rootfs/var/www/html/index.html

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

0 commit comments

Comments
 (0)