start on both networks

NordicPlayground · Apr 3, 2024 · 6abcbef · 6abcbef
1 parent 3ab275e
commit 6abcbef
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 56 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -9,37 +9,7 @@ env:
   REPO_IMAGE_LATEST: ${{ vars.REGISTRY_LOGIN_SERVER }}/coap:latest
 
 jobs:
-  image:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: 1.22.1
-
-      - name: Build server
-        working-directory: server
-        run: go build
-
-      - name: Build image
-        run: |
-          docker build -t ${{ env.IMAGE_TAGGED }} .
-
-      - name: Log in to the infrastructure container registry
-        run: |
-          docker login -u ${{ vars.REGISTRY_USERNAME }} -p ${{ secrets.REGISTRY_PASSWORD }} ${{ vars.REGISTRY_LOGIN_SERVER }}
-
-      - name: Push image to the infrastructure container registry
-        run: |
-          docker tag ${{ env.IMAGE_TAGGED }} ${{ env.REPO_IMAGE_TAGGED }}
-          docker push ${{ env.REPO_IMAGE_TAGGED }}
-
   tests:
-    needs: [image]
-
     runs-on: ubuntu-latest
 
     steps:
@@ -54,13 +24,13 @@ jobs:
         working-directory: client
         run: go build
 
-      - name: Log in to infrastructure container registry
-        run: |
-          docker login -u ${{ vars.REGISTRY_USERNAME }} -p ${{ secrets.REGISTRY_PASSWORD }} ${{ vars.REGISTRY_LOGIN_SERVER }}
+      - name: Build server
+        working-directory: server
+        run: go build
 
-      - name: Pull image from the infrastructure container registry
+      - name: Build image
         run: |
-          docker pull ${{ env.REPO_IMAGE_TAGGED }}
+          docker build -t ${{ env.IMAGE_TAGGED }} .
 
       - name: Run image
         env:
@@ -87,23 +57,9 @@ jobs:
           docker ps
           docker container logs `docker ps | grep ${{ env.IMAGE_TAGGED }} | awk '{ print $1; }'`
 
-  publish:
-    if: github.ref == 'refs/heads/saga'
-
-    needs: [tests]
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Log in to infrastructure container registry
-        run: |
-          docker login -u ${{ vars.REGISTRY_USERNAME }} -p ${{ secrets.REGISTRY_PASSWORD }} ${{ vars.REGISTRY_LOGIN_SERVER }}
-
-      - name: Pull image from the infrastructure container registry
-        run: |
-          docker pull ${{ env.REPO_IMAGE_TAGGED }}
-
       - name: Push image to the infrastructure container registry as latest
+        if: github.ref == 'refs/heads/saga'
         run: |
+          docker login -u ${{ vars.REGISTRY_USERNAME }} -p ${{ secrets.REGISTRY_PASSWORD }} ${{ vars.REGISTRY_LOGIN_SERVER }}
           docker tag ${{ env.REPO_IMAGE_TAGGED }} ${{ env.REPO_IMAGE_LATEST }}
           docker push ${{ env.REPO_IMAGE_LATEST }}
diff --git a/server/server.go b/server/server.go
@@ -26,6 +26,8 @@ func main() {
 	password := flag.String("password", "connect:anything",
 		"The password to use for the PSK in dTLS.")
 	dtls := flag.Bool("dTLS", false, "Start a dTLS server")
+	network := flag.String("network", "udp4",
+		"The network to use, `udp4` or `udp6`.")
 	flag.Parse()
 
 	storageConnectionString, ok := os.LookupEnv("STORAGE_CONNECTION_STRING")
@@ -48,12 +50,11 @@ func main() {
 	dTLSPort := 5689
 	udpAddr := fmt.Sprintf("%s:%d", *address, udpPort)
 	dtlsAddr := fmt.Sprintf("%s:%d", *address, dTLSPort)
-	network := "udp"
 
 	if *dtls {
 		log.Printf("dTLS UDP Server listening on: %s\n", dtlsAddr)
 		log.Printf("dTLS PSK: %s\n", *password)
-		log.Fatal(coap.ListenAndServeDTLS(network, dtlsAddr, &piondtls.Config{
+		log.Fatal(coap.ListenAndServeDTLS(*network, dtlsAddr, &piondtls.Config{
 			PSK: func(hint []byte) ([]byte, error) {
 				log.Printf("Client's hint: %s \n", hint)
 				return []byte(*password), nil
@@ -63,6 +64,6 @@ func main() {
 		}, r))
 	} else {
 		log.Printf("UDP Server listening on: %s\n", udpAddr)
-		log.Fatal(coap.ListenAndServe(network, udpAddr, r))
+		log.Fatal(coap.ListenAndServe(*network, udpAddr, r))
 	}
 }
diff --git a/server/start.sh b/server/start.sh
@@ -5,8 +5,10 @@ if [ -f $FILE ]; then
     export STORAGE_CONNECTION_STRING=$(cat /run/secrets/STORAGE_CONNECTION_STRING)
 fi 
 
-nohup /home/coap/coap-server -password "connect:anything" -dTLS &
-nohup /home/coap/coap-server &
+nohup /home/coap/coap-server -network udp4 -password "connect:anything" -dTLS &
+nohup /home/coap/coap-server -network udp4 &
+nohup /home/coap/coap-server -network udp6 -password "connect:anything" -dTLS &
+nohup /home/coap/coap-server -network udp6 &
 
 sleep 1