-
-
Notifications
You must be signed in to change notification settings - Fork 324
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
update traefik to v2.x #396
Open
ycyin
wants to merge
2
commits into
Joxit:main
Choose a base branch
from
ycyin:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
version: '3.7' | ||
|
||
services: | ||
registry-ui: | ||
image: joxit/docker-registry-ui:latest | ||
environment: | ||
- SINGLE_REGISTRY=true | ||
- REGISTRY_TITLE=Docker Registry UI | ||
# For deleting images, you need to activate the delete feature in the UI with DELETE_IMAGES=true and in your registry. | ||
- DELETE_IMAGES=true | ||
- SHOW_CONTENT_DIGEST=true | ||
- NGINX_PROXY_PASS_URL=http://registry:5000 | ||
- SHOW_CATALOG_NB_TAGS=true | ||
- CATALOG_MIN_BRANCHES=1 | ||
- CATALOG_MAX_BRANCHES=1 | ||
- TAGLIST_PAGE_SIZE=100 | ||
- REGISTRY_SECURED=true | ||
- CATALOG_ELEMENTS_LIMIT=1000 | ||
networks: | ||
- traefik-net | ||
deploy: | ||
replicas: 1 | ||
restart_policy: | ||
condition: on-failure | ||
labels: | ||
- "traefik.enable=true" | ||
- "traefik.http.routers.registryui.rule=Host(`myregistry.com`)" | ||
- "traefik.http.routers.registryui.entrypoints=web" | ||
- "traefik.http.services.registryui.loadbalancer.server.port=80" | ||
- "traefik.http.routers.registryui.service=registryui" | ||
configs: | ||
- source: ui_nginx_config | ||
target: /etc/nginx/conf.d/default.conf | ||
|
||
registry: | ||
image: registry:2.8.3 | ||
volumes: | ||
- /images:/var/lib/registry | ||
- /htpasswd:/auth | ||
environment: | ||
- REGISTRY_AUTH=htpasswd | ||
- REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm | ||
- REGISTRY_AUTH_HTPASSWD_PATH=/auth | ||
- REGISTRY_HTTP_RELATIVEURLS=true | ||
# For deleting images, you need to activate the delete feature in the registry. | ||
- REGISTRY_STORAGE_DELETE_ENABLED=true | ||
deploy: | ||
replicas: 1 | ||
restart_policy: | ||
condition: on-failure | ||
placement: | ||
constraints: | ||
- node.role == manager | ||
networks: | ||
- traefik-net | ||
|
||
networks: | ||
traefik-net: | ||
external: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
version: "3.7" | ||
|
||
services: | ||
traefik: | ||
image: traefik:v2.11.8 | ||
ports: | ||
- "80:80" | ||
command: | ||
- --api.insecure=false # set to 'false' on production | ||
- --api.dashboard=true # see https://docs.traefik.io/v2.11/operations/dashboard/#secure-mode for how to secure the dashboard | ||
- --api.debug=false # enable additional endpoints for debugging and profiling | ||
- --log.level=INFO # debug while we get it working, for more levels/info see https://docs.traefik.io/observability/logs/ | ||
- --log.format=common | ||
- --accesslog=true | ||
- --accesslog.fields.names.StartUTC=drop | ||
- --providers.docker=true | ||
- --providers.docker.swarmMode=true | ||
- --providers.docker.exposedbydefault=false | ||
- --providers.docker.network=public | ||
- --entryPoints.web.address=:80 | ||
- --entryPoints.web.transport.respondingTimeouts.readTimeout=0 # https://doc.traefik.io/traefik/v2.11/routing/entrypoints/#respondingtimeouts | ||
- --entryPoints.web.transport.respondingTimeouts.idleTimeout=0 | ||
- --entryPoints.web.forwardedHeaders.insecure | ||
# - --entryPoints.websecure.address=:443 | ||
environment: | ||
- TZ=Asia/Shanghai | ||
volumes: | ||
- /var/run/docker.sock:/var/run/docker.sock | ||
networks: | ||
- traefik-net | ||
deploy: | ||
resources: | ||
limits: | ||
cpus: '4' | ||
memory: 8g | ||
reservations: | ||
cpus: '1' | ||
memory: 2g | ||
replicas: 1 | ||
restart_policy: | ||
condition: on-failure | ||
placement: | ||
constraints: | ||
- node.role == manager | ||
labels: | ||
- "traefik.enable=true" | ||
- "traefik.http.routers.dashboard.rule=Host(`mytraefik.com`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))" | ||
- "traefik.http.routers.dashboard.service=api@internal" # Let the dashboard access the traefik api | ||
- "traefik.http.routers.dashboard.entrypoints=web" # Let the dashboard access the traefik api | ||
- "traefik.http.services.traefik.loadbalancer.server.port=9090" | ||
- "traefik.http.middlewares.auth.basicauth.users=admin:$apr1$XXrpwZre$ItZSXpoeB6bdPLCGT7eXG0" | ||
- "traefik.http.routers.dashboard.middlewares=auth" | ||
|
||
networks: | ||
traefik-net: | ||
external: true |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
admin:$apr1$XXrpwZre$ItZSXpoeB6bdPLCGT7eXG0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
server { | ||
listen 80; | ||
server_name localhost; | ||
# disable any limits to avoid HTTP 413 for large image uploads | ||
client_max_body_size 0; | ||
|
||
# required to avoid HTTP 411: see Issue #1486 (https://github.com/moby/moby/issues/1486) | ||
chunked_transfer_encoding on; | ||
# required for strict SNI checking: see Issue #70 (https://github.com/Joxit/docker-registry-ui/issues/70) | ||
proxy_ssl_server_name on; | ||
proxy_buffering off; | ||
# Fix push and pull of large images: see Issue #282 (https://github.com/Joxit/docker-registry-ui/issues/282) | ||
proxy_request_buffering off; | ||
proxy_ignore_headers "X-Accel-Buffering"; | ||
|
||
location / { | ||
root /usr/share/nginx/html; | ||
index index.html index.htm; | ||
} | ||
|
||
location /v2 { | ||
# Do not allow connections from docker 1.5 and earlier | ||
# docker pre-1.6.0 did not properly set the user agent on ping, catch "Go *" user agents | ||
if ($http_user_agent ~ "^(docker\/1\.(3|4|5(?!\.[0-9]-dev))|Go ).*$" ) { | ||
return 404; | ||
} | ||
proxy_ignore_client_abort on; | ||
client_body_timeout 300; | ||
proxy_read_timeout 300; | ||
proxy_send_timeout 300; | ||
keepalive_timeout 150; | ||
proxy_http_version 1.1; | ||
proxy_set_header Host "$http_host"; | ||
|
||
#r set $registry_server "http://registry:5000"; | ||
#r proxy_pass $registry_server; | ||
proxy_pass http://registry:5000; | ||
} | ||
|
||
# error_page 404 /404.html; | ||
|
||
# redirect server error pages to the static page /50x.html | ||
# | ||
error_page 500 502 503 504 /50x.html; | ||
location = /50x.html { | ||
root /usr/share/nginx/html; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,37 +6,6 @@ if ! [[ `docker network ls | grep "traefik-net"` ]] &>/dev/null; then | |
fi | ||
|
||
|
||
if ! [[ `docker service ls | grep "traefik2"` ]] &>/dev/null; then | ||
dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | ||
docker stack deploy --compose-file docker-compose-swarm-traefik.yml docker-traefik | ||
|
||
# ensure acme.json wich will contains the letsencrypt certificates | ||
touch "$dir"/acme.json && chmod 600 "$dir"/acme.json | ||
|
||
docker service create --name traefik2 --detach=false \ | ||
--constraint node.role==manager \ | ||
--update-parallelism 1 --update-delay 10s \ | ||
--mode global \ | ||
--publish 80:80 \ | ||
--publish 443:443 \ | ||
--read-only \ | ||
--mount type=bind,source="$(pwd)"/acme.json,target=/etc/traefik/acme.json \ | ||
--mount type=bind,source=/var/run/docker.sock,target=/var/run/docker.sock \ | ||
--network traefik-net \ | ||
traefik:1.7.4-alpine \ | ||
--entrypoints='Name:http Address::80 Redirect.EntryPoint:https' \ | ||
--entrypoints='Name:https Address::443 TLS' \ | ||
--defaultentrypoints=http,https \ | ||
--acme \ | ||
--acme.storage=/etc/traefik/acme.json \ | ||
--acme.entryPoint=https \ | ||
--acme.httpChallenge.entryPoint=http \ | ||
[email protected] \ | ||
--docker \ | ||
--docker.swarmMode \ | ||
--docker.domain=mydomain.com \ | ||
--docker.exposedByDefault=false \ | ||
--docker.watch \ | ||
--api | ||
fi | ||
|
||
docker stack deploy --compose-file docker-compose-swarm.yml docker-registry | ||
docker stack deploy --compose-file docker-compose-swarm-registry.yml docker-registry |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why did you add the nginx configuration? It's not working with the bundled version?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Only the following configuration is added to ensure that the default 60s is not interrupted when transferring large images.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this not necessary, or is it another issue?