diff --git a/Dockerfile b/Dockerfile index a150bb6..f0a3f09 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,11 +3,10 @@ FROM node:23.6-bullseye-slim RUN apt-get update && apt-get install curl -y WORKDIR /opt/prod/app - -RUN curl --output bore.tar.gz -L https://github.com/ekzhang/bore/releases/download/v0.5.3/bore-v0.5.3-x86_64-unknown-linux-musl.tar.gz +COPY . . RUN tar -zxf bore.tar.gz -EXPOSE 22766 +EXPOSE 6022 EXPOSE 7835 -EXPOSE 6888 +EXPOSE 6080 CMD [ "./bore", "server" ] \ No newline at end of file diff --git a/bore.tar.gz b/bore.tar.gz new file mode 100644 index 0000000..778431b Binary files /dev/null and b/bore.tar.gz differ diff --git a/compose.yaml b/compose.yaml index 2af674b..e7d2484 100644 --- a/compose.yaml +++ b/compose.yaml @@ -7,16 +7,20 @@ services: environment: - 'BORE_SECRET=${BORE_SECRET}' ports: - - '22766:22766' - - '7835:7835' + - '6022:6022' healthcheck: test: ["CMD", "/bin/sh", "-c", "exit 0"] + command: + - '--entrypoints.bore-tcp.address=:7835' labels: - traefik.enable=true - traefik.http.middlewares.gzip.compress=true - traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https - - traefik.http.routers.http-0-d0ws408wc4cc0o4ksws80kw0-bore-tunnel.entryPoints=http,https + - traefik.http.routers.http-0-d0ws408wc4cc0o4ksws80kw0-bore-tunnel.entryPoints=http - traefik.http.routers.http-0-d0ws408wc4cc0o4ksws80kw0-bore-tunnel.middlewares=gzip - - 'traefik.http.routers.http-0-d0ws408wc4cc0o4ksws80kw0-bore-tunnel.rule=HostRegexp(`^(?:.+\.)?ikea\.jdf2\.org$`) && PathPrefix(`/`)' + - 'traefik.http.routers.http-0-d0ws408wc4cc0o4ksws80kw0-bore-tunnel.rule=HostRegexp(`^(?:.+-)?ikea\.jdf2\.org$`) && PathPrefix(`/`)' - traefik.http.routers.http-0-d0ws408wc4cc0o4ksws80kw0-bore-tunnel.service=http-0-d0ws408wc4cc0o4ksws80kw0-bore-tunnel - - traefik.http.services.http-0-d0ws408wc4cc0o4ksws80kw0-bore-tunnel.loadbalancer.server.port=8080 \ No newline at end of file + - traefik.http.services.http-0-d0ws408wc4cc0o4ksws80kw0-bore-tunnel.loadbalancer.server.port=6080 + - traefik.tcp.routers.tcpecho-le.entrypoints=bore-tcp + - traefik.tcp.routers.tcpecho-le.rule=HostSNI(`bore-pretzel.jdf2.org`) + - traefik.tcp.services.tcpecho-le.loadbalancer.server.port=7835 \ No newline at end of file