Skip to content

Commit

Permalink
Remove custom Traefik image (#216)
Browse files Browse the repository at this point in the history
Pin Traefik to version 2.10 #209.
  • Loading branch information
marein authored Feb 7, 2024
1 parent 7e8e450 commit 47152e1
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 8 deletions.
2 changes: 1 addition & 1 deletion deploy/single-server/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion docker/traefik/Dockerfile

This file was deleted.

2 changes: 0 additions & 2 deletions project
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,13 @@ 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 .
}

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
}

Expand Down

0 comments on commit 47152e1

Please sign in to comment.