Commit 5edf964d authored by MrMan's avatar MrMan

Modify image builds

- update rust version v1.27 -> v1.32
- tag local image for e2e testing
parent 47a6f498
Pipeline #47783394 failed with stage
in 1 minute and 46 seconds
......@@ -19,6 +19,7 @@ ENV=development # | production
IMAGE_NAME:=postmgr
BUILDER_IMAGE_NAME:=postmgr/builder
REGISTRY_PATH=registry.gitlab.com/postmgr
LOCAL_TEST_IMAGE_NAME=postmgr-test
FQ_IMAGE_NAME=$(REGISTRY_PATH)/$(IMAGE_NAME):$(VERSION)
FQ_BUILDER_IMAGE_NAME=$(REGISTRY_PATH)/$(BUILDER_IMAGE_NAME):$(VERSION)
......@@ -65,7 +66,11 @@ watch: check-tool-cargo check-tool-cargo-watch
cargo watch -x build
image:
docker build -f infra/docker/Dockerfile -t $(FQ_IMAGE_NAME) .
docker build \
-f infra/docker/Dockerfile \
-t $(FQ_IMAGE_NAME) \
-t $(LOCAL_TEST_IMAGE_NAME) \
.
builder-image:
docker build -f infra/docker/builder.Dockerfile -t $(FQ_BUILDER_IMAGE_NAME) .
......
FROM rust:1.27.1
FROM rust:1.32-slim
WORKDIR /usr/src/postmgr
COPY . .
# Install postfix
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install postfix rsyslog telnet ca-certificates libsasl2-modules
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install make postfix rsyslog telnet ca-certificates libsasl2-modules
RUN ln -s /usr/sbin/postfix /usr/bin/postfix
# Add submission group for postfix to use
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment