Skip to content

Commit

Permalink
no more tests/websocket-service/{Dockerfile,*} for debug-caddy, use p…
Browse files Browse the repository at this point in the history
…rebuild image instead.
  • Loading branch information
itaru2622 committed Sep 22, 2024
1 parent 9ea26a0 commit 4114e7b
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 87 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ make docker-start f=./docker-compose-debug-caddy.yaml services=

# test HTTPS and WSS with your docker environment
curl -L https://test-wss.${DOMAIN}/
open -L https://test-wss.${DOMAIN}/ on browser.
wscat -c https://test-wss.${DOMAIN}/ws with CUI nodejs wscat package

# test reverse proxy mapping if it works as expected for bluesky
Expand Down
37 changes: 8 additions & 29 deletions docker-compose-builder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,39 +77,18 @@ services:

# debug for caddy>>>
test-wss:
image: itaru2622/gorilla-websocket:bookworm
build:
context: ./tests/websocket-service
dockerfile: Dockerfile
args:
- http_proxy=${http_proxy}
- https_proxy=${https_proxy}
- no_proxy=${no_proxy}
- JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
image: itaru2622/fastapi:bookworm
environment:
- GOINSECURE=${GOINSECURE}
- NODE_TLS_REJECT_UNAUTHORIZED=${NODE_TLS_REJECT_UNAUTHORIZED}
- ENABLE_WSS=true
- SCRIPT=*.go
working_dir: /opt/gorilla-websocket/examples/chat
volumes:
- ./certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro
- app=main:app
- opts=--host 0.0.0.0 --port 8080
working_dir: /opt/fastapi-samples/3catchall

test-ws:
image: itaru2622/gorilla-websocket:bookworm
build:
context: ./tests/websocket-service
dockerfile: Dockerfile
args:
- http_proxy=${http_proxy}
- https_proxy=${https_proxy}
- no_proxy=${no_proxy}
- JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
image: itaru2622/fastapi:bookworm
environment:
- SCRIPT=*.go
working_dir: /opt/gorilla-websocket/examples/chat
volumes:
- ./certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro
- app=main:app
- opts=--host 0.0.0.0 --port 8080
working_dir: /opt/fastapi-samples/3catchall

# debug for caddy <<<
# debug for bluesky with indigo subcmds >>>
Expand Down
19 changes: 8 additions & 11 deletions docker-compose-debug-caddy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,18 @@ services:
# ends: to generate HTTPS certifications on-demand <<<<<

test-wss:
image: itaru2622/gorilla-websocket:bookworm
image: itaru2622/fastapi:bookworm
environment:
- ENABLE_WSS=true
- SCRIPT=*.go
working_dir: /opt/gorilla-websocket/examples/chat
volumes:
- ./certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro
- app=main:app
- opts=--host 0.0.0.0 --port 8080
working_dir: /opt/fastapi-samples/3catchall

test-ws:
image: itaru2622/gorilla-websocket:bookworm
image: itaru2622/fastapi:bookworm
environment:
- SCRIPT=*.go
working_dir: /opt/gorilla-websocket/examples/chat
volumes:
- ./certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro
- app=main:app
- opts=--host 0.0.0.0 --port 8080
working_dir: /opt/fastapi-samples/3catchall

# starts: fakes to check caddy mapping rule for social-app, pds, bsky(appview) >>>>>>>>>>
# refer https://github.com/itaru2622/docker-fastapi.git for docker image of itaru2622/fastapi
Expand Down
23 changes: 8 additions & 15 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,25 +76,18 @@ services:
# debug for caddy>>>

test-wss:
image: itaru2622/gorilla-websocket:bookworm
image: itaru2622/fastapi:bookworm
environment:
- GOINSECURE=${GOINSECURE}
- NODE_TLS_REJECT_UNAUTHORIZED=${NODE_TLS_REJECT_UNAUTHORIZED}
- ENABLE_WSS=true
- SCRIPT=*.go
working_dir: /opt/gorilla-websocket/examples/chat
volumes:
- ./certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro
- app=main:app
- opts=--host 0.0.0.0 --port 8080
working_dir: /opt/fastapi-samples/3catchall

test-ws:
image: itaru2622/gorilla-websocket:bookworm
image: itaru2622/fastapi:bookworm
environment:
- SCRIPT=*.go
working_dir: /opt/gorilla-websocket/examples/chat
volumes:
- ./certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro
# debug for caddy <<<
# debug for bluesky with indigo subcmds >>>
- app=main:app
- opts=--host 0.0.0.0 --port 8080
working_dir: /opt/fastapi-samples/3catchall

test-indigo:
image: itaru2622/bluesky-indigo-tools:${asof}
Expand Down
17 changes: 0 additions & 17 deletions tests/websocket-service/Dockerfile

This file was deleted.

14 changes: 0 additions & 14 deletions tests/websocket-service/start.sh

This file was deleted.

0 comments on commit 4114e7b

Please sign in to comment.