From 88660cdd78809af937f3718ef5df817cc3d3881d Mon Sep 17 00:00:00 2001 From: William Petit Date: Wed, 17 Jun 2020 23:48:56 +0200 Subject: [PATCH] Fix Docker packaging --- .dockerignore | 2 +- misc/docker/Dockerfile | 9 ++++++++- misc/docker/config-patch.yml | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 misc/docker/config-patch.yml diff --git a/.dockerignore b/.dockerignore index 279fc8e..e4adc91 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,6 +3,6 @@ /vendor /data /bin -/misc/docker +/misc/docker/Dockerfile /.env /.env.dist \ No newline at end of file diff --git a/misc/docker/Dockerfile b/misc/docker/Dockerfile index 32e2447..ac5a441 100644 --- a/misc/docker/Dockerfile +++ b/misc/docker/Dockerfile @@ -14,8 +14,13 @@ COPY . /src WORKDIR /src +RUN cp -f misc/docker/config-patch.yml misc/release/config-patch.yml + +RUN go get github.com/krishicks/yaml-patch/cmd/yaml-patch + RUN npm install \ && make vendor \ + && echo "---" > ./misc/release/config-patch.yml \ && make ARCH_TARGETS=amd64 release FROM busybox @@ -24,4 +29,6 @@ COPY --from=build /src/release/fake-smtp-linux-amd64 /app WORKDIR /app -CMD ["bin/fake-smtp", "--config", "fake-smtp.yml"] \ No newline at end of file +RUN mkdir -p /app + +CMD ["bin/fake-smtp", "--config", "config.yml"] \ No newline at end of file diff --git a/misc/docker/config-patch.yml b/misc/docker/config-patch.yml new file mode 100644 index 0000000..cf67519 --- /dev/null +++ b/misc/docker/config-patch.yml @@ -0,0 +1,4 @@ +--- +- op: replace + path: /smtp/debug + value: false \ No newline at end of file