From 47152e1fd1f05591daa7d553b2e3bd76b3871a4c Mon Sep 17 00:00:00 2001
From: Markus Reinhold <markusreinhold@icloud.com>
Date: Wed, 7 Feb 2024 22:19:31 +0100
Subject: [PATCH] Remove custom Traefik image (#216)

Pin Traefik to version 2.10 #209.
---
 deploy/single-server/docker-compose.yml | 2 +-
 docker-compose.ci.yml                   | 2 +-
 docker-compose.yml                      | 4 +---
 docker/traefik/Dockerfile               | 1 -
 project                                 | 2 --
 5 files changed, 3 insertions(+), 8 deletions(-)
 delete mode 100644 docker/traefik/Dockerfile

diff --git a/deploy/single-server/docker-compose.yml b/deploy/single-server/docker-compose.yml
index 65287f79..ee866892 100644
--- a/deploy/single-server/docker-compose.yml
+++ b/deploy/single-server/docker-compose.yml
@@ -35,7 +35,7 @@ x-php-container:
 
 services:
     traefik:
-        image: marein/php-gaming-website:traefik
+        image: traefik:2.10
         command:
             - --metrics.prometheus=true
             - --providers.docker
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
index a0790680..68ec3259 100644
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.yml
@@ -21,7 +21,7 @@ services:
     #  Database and application  #
     ##############################
     traefik:
-        image: marein/php-gaming-website:traefik
+        image: traefik:2.10
         command:
             - --providers.docker
             - --providers.docker.exposedbydefault=false
diff --git a/docker-compose.yml b/docker-compose.yml
index d21cd167..17f69cf7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,9 +29,7 @@ services:
     #  Database and application  #
     ##############################
     traefik:
-        build:
-            context: .
-            dockerfile: ./docker/traefik/Dockerfile
+        image: traefik:2.10
         command:
             - --metrics.prometheus=true
             - --providers.docker
diff --git a/docker/traefik/Dockerfile b/docker/traefik/Dockerfile
deleted file mode 100644
index 9f2a2b67..00000000
--- a/docker/traefik/Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-FROM traefik:2.10
diff --git a/project b/project
index d9746c7a..38cbb5ee 100755
--- a/project
+++ b/project
@@ -95,7 +95,6 @@ acceptance() {
 
 buildProductionImages() {
     docker build --build-arg environment=production --file docker/php-fpm/Dockerfile --tag marein/php-gaming-website:php-fpm .
-    docker build --file docker/traefik/Dockerfile --tag marein/php-gaming-website:traefik .
     docker build --file docker/nchan/Dockerfile --tag marein/php-gaming-website:nchan .
 }
 
@@ -103,7 +102,6 @@ pushProductionImages() {
     echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 
     docker push marein/php-gaming-website:php-fpm
-    docker push marein/php-gaming-website:traefik
     docker push marein/php-gaming-website:nchan
 }