From 0968eb8afe5292945590c1746ee0f008518097c9 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko.korhonen@druid.fi>
Date: Thu, 8 Aug 2024 13:29:39 +0300
Subject: [PATCH] Traefik 3.1.2 and Mailpit 1.20.0

---
 Dockerfile      | 9 +++------
 docker-bake.hcl | 7 -------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2ed69ff..5a60f35 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,9 @@
-ARG TRAEFIK_VERSION
-ARG MAILPIT_VERSION=1.17.1
+ARG MAILPIT_VERSION=1.20.0
 
 #
 # Mailpit binary
 #
-FROM golang:alpine as mailpit-builder
+FROM golang:alpine AS mailpit-builder
 
 ARG MAILPIT_VERSION
 WORKDIR /app
@@ -19,10 +18,9 @@ RUN CGO_ENABLED=0 go build -ldflags "-s -w -X github.com/axllent/mailpit/config.
 #
 # Stonehenge
 #
-FROM traefik:${TRAEFIK_VERSION} as stonehenge
+FROM traefik:3.1.2 AS stonehenge
 
 ARG MAILPIT_VERSION
-ARG TRAEFIK_VERSION
 ARG TARGETARCH
 ARG USER=druid
 ARG UID=1000
@@ -32,7 +30,6 @@ ENV SOCKET_DIR=/tmp/${USER}_ssh-agent
 ENV SSH_AUTH_SOCK=${SOCKET_DIR}/socket
 ENV SSH_AUTH_PROXY_SOCK=${SOCKET_DIR}/proxy-socket
 ENV MAILPIT_VERSION=${MAILPIT_VERSION}
-ENV TRAEFIK_VERSION=${TRAEFIK_VERSION}
 
 RUN wget -O /usr/local/bin/mkcert "https://dl.filippo.io/mkcert/latest?for=linux/${TARGETARCH}"
 
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 0d1300c..5a68eb5 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -2,10 +2,6 @@ variable "REPO_NAME" {
     default = "druidfi/stonehenge"
 }
 
-variable "TRAEFIK_VERSION" {
-    default = "3.0.2"
-}
-
 group "default" {
     targets = ["traefik"]
 }
@@ -28,8 +24,5 @@ target "common" {
 target "traefik" {
     inherits = ["common"]
     context = "."
-    args = {
-        TRAEFIK_VERSION = "${TRAEFIK_VERSION}"
-    }
     tags = ["${REPO_NAME}:5", "${REPO_NAME}:5.0", "${REPO_NAME}:latest"]
 }