performance workflows fix ipv6 listening to server

Project-Faster · Apr 21, 2024 · f9a3b7f · f9a3b7f
1 parent ca3e602
commit f9a3b7f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/.github/workflows/common-performance.yml b/.github/workflows/common-performance.yml
@@ -174,9 +174,6 @@ jobs:
       matrix:
         download_size: [ 10 ]
         connections_number: [ 1, 4 ]
-    env:
-      REMOTE_GATEWAY: ${{ inputs.server_public_address }}
-      LISTEN_ADDRESS: ${{ inputs.client_listen_address }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -292,8 +289,7 @@ jobs:
     runs-on: vm-server
     env:
       GO_VERSION: 1.20.14
-      REMOTE_GATEWAY: ${{ inputs.server_public_address }}
-      LISTEN_ADDRESS: ${{ inputs.client_listen_address }}
+      QPEP_ADDRESS: ${{ inputs.client_listen_address }}
       QPEP_REPO: https://github.com/${{github.repository}}.git
       QPEP_BRANCH: ${{ github.head_ref || github.ref_name }}
       QPEP_REV: HEAD
@@ -338,8 +334,7 @@ jobs:
     runs-on: vm-server
     needs: [ build-client, build-server ]
     env:
-      LISTEN_ADDRESS: 127.0.0.1
-      SERVER_ADDRESS: ${{ inputs.server_private_address }}
+      QPEP_ADDRESS: ${{ inputs.client_listen_address }}
       QPEP_BACKEND: ${{ inputs.backend }}
       QPEP_CCA: ${{ inputs.cca }}
       QPEP_SLOWSTART: ${{ inputs.slowstart }}

diff --git a/docker/server-env/docker-compose.yml b/docker/server-env/docker-compose.yml
@@ -1,15 +1,14 @@
 # Performance server
 
 # set environment variables before running:
-# SERVER_ADDRESS
 # QPEP_BACKEND
 # QPEP_CCA
-
-# set these env variables before building:
 # GO_VERSION
 # QPEP_REPO
 # QPEP_BRANCH
 # QPEP_REV
+# QPEP_ADDRESS
+# QPEP_GATEWAY
 
 version: "1.0"
 services:
@@ -19,6 +18,8 @@ services:
       - QPEP_BACKEND=${QPEP_BACKEND}
       - QPEP_CCA=${QPEP_CCA}
       - QPEP_SLOWSTART=${QPEP_SLOWSTART}
+      - QPEP_ADDRESS:${QPEP_ADDRESS}
+      - QPEP_GATEWAY:127.0.0.1
     build:
       context: server/
       args:
@@ -28,8 +29,6 @@ services:
         - QPEP_REV=${QPEP_REV}
     extra_hosts:
       - "MQTT:${SERVER_ADDRESS}"
-      - "QPEP_GATEWAY:127.0.0.1"
-      - "QPEP_ADDRESS:${SERVER_ADDRESS}"
     ports:
       - target: 1443
         published: 1443

diff --git a/docker/server-env/server/config/qpep.yml.tpl b/docker/server-env/server/config/qpep.yml.tpl
@@ -1,9 +1,9 @@
 
 # server
-gateway: QPEP_GATEWAY
+gateway: ${QPEP_GATEWAY}
 port: 443
 apiport: 444
-listenaddress: QPEP_ADDRESS # added via extra_hosts
+listenaddress: ${QPEP_ADDRESS}
 listenport: 1443
 
 # backend