Mirrors/go-chasquid-smtp
1
0
Fork 0
mirror of https://blitiri.com.ar/repos/chasquid synced 2025-12-20 15:07:03 +00:00
Code Releases Activity

tests: Reorder Dockerfile statements to allow caching

Browse Source 
Docker creates intermediate layers on each command (for most commands),
but the COPY was invalidating them too early, every time it runs it was
generating a different layer.

This patch moves the COPY down to the bottom, and adds a bit more
organization to the commands below.
This commit is contained in:
Alberto Bertogli
2018-10-21 18:41:23 +01:00
parent 4ecc5461d3
commit d0c7c3d40a
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
test/Dockerfile
View File

@@ -12,40 +12,41 @@
FROM golang:latest FROM golang:latest
WORKDIR /go/src/blitiri.com.ar/go/chasquid WORKDIR /go/src/blitiri.com.ar/go/chasquid
COPY . .
# Make debconf/frontend non-interactive, to avoid distracting output about the # Make debconf/frontend non-interactive, to avoid distracting output about the
# lack of $TERM. # lack of $TERM.
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
# Install the basics for the integration tests.
RUN apt-get update -q RUN apt-get update -q
# Install the required packages for the integration tests.
RUN apt-get install -y -q python3 msmtp RUN apt-get install -y -q python3 msmtp
# Packages for the (optional) dovecot integration test. # Install the optional packages for the integration tests.
RUN apt-get install -y -q gettext-base dovecot-imapd RUN apt-get install -y -q \
gettext-base dovecot-imapd \
exim4-daemon-light \
dnsmasq
# Packages for the (optional) exim integration test. # Prepare exim.
RUN apt-get install -y -q exim4-daemon-light RUN mkdir -p test/t-02-exim/.exim4 \
RUN cd test/t-02-exim && mkdir -p .exim4 && ln -s /usr/sbin/exim4 .exim4/ && ln -s /usr/sbin/exim4 test/t-02-exim/.exim4
# Packages for the (optional) TLS tracking test. # Install binaries for the (optional) DKIM integration test.
RUN apt-get install -y -q dnsmasq
# Packages for the (optional) DKIM integration test.
RUN go get github.com/driusan/dkim/... \ RUN go get github.com/driusan/dkim/... \
&& go install github.com/driusan/dkim/cmd/dkimsign \ && go install github.com/driusan/dkim/cmd/dkimsign \
&& go install github.com/driusan/dkim/cmd/dkimverify \ && go install github.com/driusan/dkim/cmd/dkimverify \
&& go install github.com/driusan/dkim/cmd/dkimkeygen && go install github.com/driusan/dkim/cmd/dkimkeygen
# Copy into the container. Everything below this line will not be cached.
COPY . .
# Install chasquid and its dependencies. # Install chasquid and its dependencies.
RUN go get -d -v ./... RUN go get -d -v ./... && go install -v ./...
RUN go install -v ./...
# Don't run the tests as root: it makes some integration tests more difficult, # Don't run the tests as root: it makes some integration tests more difficult,
# as for example Exim has hard-coded protections against running as root. # as for example Exim has hard-coded protections against running as root.
RUN useradd -m chasquid RUN useradd -m chasquid && chown -R chasquid:chasquid .
RUN chown -R chasquid:chasquid .
USER chasquid USER chasquid
# Tests expect the $USER variable set. # Tests expect the $USER variable set.