diff --git a/.gitignore b/.gitignore index afdd503..b402f37 100644 --- a/.gitignore +++ b/.gitignore @@ -76,7 +76,7 @@ cmd/benchmark/data !*.css !*.ts !*.html -!Dockerfile +!contrib/stella/Dockerfile !*.lock !*.nix !license @@ -88,10 +88,10 @@ cmd/benchmark/data !.gitignore !version !out.jsonl -!Dockerfile* +!contrib/stella/Dockerfile !strfry.conf !config.toml -!.dockerignore +!contrib/stella/.dockerignore !*.jsx !*.tsx !app/web/dist diff --git a/.dockerignore b/contrib/stella/.dockerignore similarity index 94% rename from .dockerignore rename to contrib/stella/.dockerignore index 3f8e9b3..e172294 100644 --- a/.dockerignore +++ b/contrib/stella/.dockerignore @@ -2,7 +2,7 @@ # Fixes: failed to solve: error from sender: open cmd/benchmark/data/postgres: permission denied # Benchmark data and reports (mounted at runtime via volumes) -cmd/benchmark/data/ +../../cmd/benchmark/data/ cmd/benchmark/reports/ # VCS and OS cruft diff --git a/APACHE-PROXY-GUIDE.md b/contrib/stella/APACHE-PROXY-GUIDE.md similarity index 100% rename from APACHE-PROXY-GUIDE.md rename to contrib/stella/APACHE-PROXY-GUIDE.md diff --git a/DOCKER.md b/contrib/stella/DOCKER.md similarity index 100% rename from DOCKER.md rename to contrib/stella/DOCKER.md diff --git a/Dockerfile b/contrib/stella/Dockerfile similarity index 98% rename from Dockerfile rename to contrib/stella/Dockerfile index ba872f1..3c08ae1 100644 --- a/Dockerfile +++ b/contrib/stella/Dockerfile @@ -19,11 +19,11 @@ RUN apk add --no-cache libsecp256k1-dev WORKDIR /build # Copy go modules first (for better caching) -COPY go.mod go.sum ./ +COPY ../../go.mod go.sum ./ RUN go mod download # Copy source code -COPY . . +COPY ../.. . # Build the relay with optimizations from v0.4.8 RUN CGO_ENABLED=1 GOOS=linux go build -ldflags "-w -s" -o relay . diff --git a/SERVICE-WORKER-FIX.md b/contrib/stella/SERVICE-WORKER-FIX.md similarity index 100% rename from SERVICE-WORKER-FIX.md rename to contrib/stella/SERVICE-WORKER-FIX.md diff --git a/WEBSOCKET-DEBUG.md b/contrib/stella/WEBSOCKET-DEBUG.md similarity index 100% rename from WEBSOCKET-DEBUG.md rename to contrib/stella/WEBSOCKET-DEBUG.md diff --git a/debug-websocket.sh b/contrib/stella/debug-websocket.sh similarity index 100% rename from debug-websocket.sh rename to contrib/stella/debug-websocket.sh diff --git a/docker-compose.yml b/contrib/stella/docker-compose.yml similarity index 99% rename from docker-compose.yml rename to contrib/stella/docker-compose.yml index 322e1f8..34aff18 100644 --- a/docker-compose.yml +++ b/contrib/stella/docker-compose.yml @@ -4,7 +4,7 @@ services: orly-relay: build: - context: . + context: ../.. dockerfile: Dockerfile image: silberengel/next-orly:latest container_name: orly-relay diff --git a/manage-relay.sh b/contrib/stella/manage-relay.sh similarity index 100% rename from manage-relay.sh rename to contrib/stella/manage-relay.sh diff --git a/stella-relay.service b/contrib/stella/stella-relay.service similarity index 100% rename from stella-relay.service rename to contrib/stella/stella-relay.service