diff --git a/compose.yml b/docker-compose.yaml similarity index 64% rename from compose.yml rename to docker-compose.yaml index 2effe81..5e4ce5e 100644 --- a/compose.yml +++ b/docker-compose.yaml @@ -1,6 +1,6 @@ -# rocketchat.yml volumes: mongodb_data: { driver: local } + traefik: { driver: local } services: rocketchat: @@ -32,7 +32,7 @@ services: - "${BIND_IP:-0.0.0.0}:${HOST_PORT:-3000}:${PORT:-3000}" mongodb: - image: docker.io/bitnami/mongodb:${MONGODB_VERSION:-5.0} + image: docker.io/bitnami/mongodb:${MONGODB_VERSION:-6.0} restart: always volumes: - mongodb_data:/bitnami/mongodb @@ -44,4 +44,29 @@ services: MONGODB_INITIAL_PRIMARY_PORT_NUMBER: ${MONGODB_INITIAL_PRIMARY_PORT_NUMBER:-27017} MONGODB_ADVERTISED_HOSTNAME: ${MONGODB_ADVERTISED_HOSTNAME:-mongodb} MONGODB_ENABLE_JOURNAL: ${MONGODB_ENABLE_JOURNAL:-true} - ALLOW_EMPTY_PASSWORD: ${ALLOW_EMPTY_PASSWORD:-yes} \ No newline at end of file + ALLOW_EMPTY_PASSWORD: ${ALLOW_EMPTY_PASSWORD:-yes} + ulimits: + nofile: + soft: 64000 + hard: 64000 + + traefik: + image: docker.io/traefik:${TRAEFIK_RELEASE:-v2.9.8} + restart: always + command: + - --api.insecure=false + - --providers.docker=true + - --providers.docker.exposedbydefault=false + - --entrypoints.web.address=:80 + - --entrypoints.web.http.redirections.entryPoint.to=https + - --entrypoints.web.http.redirections.entryPoint.scheme=https + - --entrypoints.https.address=:443 + - --certificatesresolvers.le.acme.tlschallenge=true + - --certificatesresolvers.le.acme.email=${LETSENCRYPT_EMAIL?need email for cert expiry notifications} + - --certificatesresolvers.le.acme.storage=/letsencrypt/acme.json + ports: + - 80:80 + - 443:443 + volumes: + - traefik:/letsencrypt:rw + - /run/docker.sock:/var/run/docker.sock:ro \ No newline at end of file diff --git a/traefik.yml b/traefik.yml deleted file mode 100644 index 61d50b6..0000000 --- a/traefik.yml +++ /dev/null @@ -1,25 +0,0 @@ -# traefik.yml -volumes: - traefik: { driver: local } - -services: - traefik: - image: docker.io/traefik:${TRAEFIK_RELEASE:-v2.9.8} - restart: always - command: - - --api.insecure=false - - --providers.docker=true - - --providers.docker.exposedbydefault=false - - --entrypoints.web.address=:80 - - --entrypoints.web.http.redirections.entryPoint.to=https - - --entrypoints.web.http.redirections.entryPoint.scheme=https - - --entrypoints.https.address=:443 - - --certificatesresolvers.le.acme.tlschallenge=true - - --certificatesresolvers.le.acme.email=${LETSENCRYPT_EMAIL?need email for cert expiry notifications} - - --certificatesresolvers.le.acme.storage=/letsencrypt/acme.json - ports: - - 80:80 - - 443:443 - volumes: - - traefik:/letsencrypt:rw - - /run/docker.sock:/var/run/docker.sock:ro \ No newline at end of file