Merge pull request #6 from linomp/dev

Dev
linomp · Aug 21, 2024 · 2e8f3aa · 2e8f3aa
2 parents eb918f0 + 33ac201
commit 2e8f3aa
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 99 deletions.
diff --git a/c/msys_server/Makefile b/c/msys_server/Makefile
diff --git a/c/msys_server/webserver.c b/c/msys_server/webserver.c
diff --git a/c/server/Makefile b/c/server/Makefile
diff --git a/c/server/webserver.c b/c/server/webserver.c
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.8'
 services:
   go-server:
     build:
-      context: ./go
+      context: ./src
       dockerfile: Dockerfile
     ports:
       - "8001:8001"

diff --git a/sandbox/.gitignore b/sandbox/.gitignore
@@ -0,0 +1,2 @@
+msys_server
+server
diff --git a/go/Dockerfile → src/Dockerfile b/go/Dockerfile → src/Dockerfile
diff --git a/go/go.mod → src/go.mod b/go/go.mod → src/go.mod
diff --git a/go/go.sum → src/go.sum b/go/go.sum → src/go.sum
diff --git a/go/main.go → src/main.go b/go/main.go → src/main.go
diff --git a/go/oauthdemo.go → src/oauthdemo.go b/go/oauthdemo.go → src/oauthdemo.go
diff --git a/go/server_metrics.go → src/server_metrics.go b/go/server_metrics.go → src/server_metrics.go