Merge branch 'feature/restructuring' into develop

UlrichEckhardt · Mar 25, 2024 · e3e5efe · e3e5efe
2 parents 8536d10 + 5bd8307
commit e3e5efe
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 19 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -24,8 +24,8 @@ README.md
 # vendored Go packages
 vendor/
 
-# built executable
-api-broker-prototype
+# built executables
+cmd/broker/broker
 
 # local overrides for docker-compose.yml
 docker-compose.override.yml
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -20,18 +20,20 @@ jobs:
       run: |
         go get -v -t -d ./...
 
-    - name: Build
-      run: go build -v .
-
     - name: Format
-      run: go fmt ./... && git diff --quiet
+      run: |
+        go fmt ./...
+        git diff --quiet
 
     - name: Lint
       run: go vet ./...
 
     - name: Test
       run: go test -v ./...
 
+    - name: Build Broker
+      run: go build -C cmd/broker -v
+
 
   build-1_21:
     name: Build with Go 1.21
@@ -51,18 +53,20 @@ jobs:
       run: |
         go get -v -t -d ./...
 
-    - name: Build
-      run: go build -v .
-
     - name: Format
-      run: go fmt ./... && git diff --quiet
+      run: |
+        go fmt ./...
+        git diff --quiet
 
     - name: Lint
       run: go vet ./...
 
     - name: Test
       run: go test -v ./...
 
+    - name: Build Broker
+      run: go build -C cmd/broker -v
+
 
   build-1_22:
     name: Build with Go 1.22
@@ -82,9 +86,6 @@ jobs:
       run: |
         go get -v -t -d ./...
 
-    - name: Build
-      run: go build -v .
-
     - name: Format
       run: |
         go fmt ./...
@@ -95,3 +96,6 @@ jobs:
 
     - name: Test
       run: go test -v ./...
+
+    - name: Build Broker
+      run: go build -C cmd/broker -v
diff --git a/Dockerfile b/Dockerfile
@@ -14,12 +14,12 @@ RUN go mod download
 # copy remaining files and build executable
 COPY . .
 
-# build statically
-RUN CGO_ENABLED=0 go build
+# build executables statically
+RUN CGO_ENABLED=0 go build -C cmd/broker
 
 
-# start a new image, it will only contain the executable
-FROM scratch
+# start a new image, it will only contain the broker executable
+FROM scratch AS broker
 
-COPY --from=build /go/api-broker-prototype/api-broker-prototype /
-ENTRYPOINT ["/api-broker-prototype"]
+COPY --from=build /go/api-broker-prototype/cmd/broker/broker /
+ENTRYPOINT ["/broker"]
diff --git a/main.go → cmd/broker/main.go b/main.go → cmd/broker/main.go