Commit 71bd10b4 authored by Robert Schmidt's avatar Robert Schmidt Committed by Laurent THOMAS

docker-compose: write correct container image to use for 4G and asan

parent cb7942d4
...@@ -214,7 +214,9 @@ def WriteEnvFile(ssh, services, wd, tag): ...@@ -214,7 +214,9 @@ def WriteEnvFile(ssh, services, wd, tag):
ret = ssh.run(f'docker image inspect {checkimg}', reportNonZero=False) ret = ssh.run(f'docker image inspect {checkimg}', reportNonZero=False)
if ret.returncode == 0: if ret.returncode == 0:
logging.info(f"detected pulled image {checkimg}") logging.info(f"detected pulled image {checkimg}")
if "oai-gnb" in image: envs["GNB_IMG"] = "oai-gnb-asan" if "oai-enb" in image: envs["ENB_IMG"] = "oai-enb-asan"
elif "oai-gnb" in image: envs["GNB_IMG"] = "oai-gnb-asan"
elif "oai-lte-ue" in image: envs["LTEUE_IMG"] = "oai-lte-ue-asan"
elif "oai-nr-ue" in image: envs["NRUE_IMG"] = "oai-nr-ue-asan" elif "oai-nr-ue" in image: envs["NRUE_IMG"] = "oai-nr-ue-asan"
elif "oai-nr-cuup" in image: envs["NRCUUP_IMG"] = "oai-nr-cuup-asan" elif "oai-nr-cuup" in image: envs["NRCUUP_IMG"] = "oai-nr-cuup-asan"
else: logging.warning("undetected image format {image}, cannot use asan") else: logging.warning("undetected image format {image}, cannot use asan")
......
...@@ -178,7 +178,7 @@ services: ...@@ -178,7 +178,7 @@ services:
retries: 5 retries: 5
oai_enb: oai_enb:
image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop} image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
privileged: true privileged: true
container_name: l2sim4g-oai-enb container_name: l2sim4g-oai-enb
network_mode: "host" network_mode: "host"
...@@ -210,7 +210,7 @@ services: ...@@ -210,7 +210,7 @@ services:
retries: 5 retries: 5
oai_ue1: oai_ue1:
image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop} image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
privileged: true privileged: true
container_name: l2sim4g-oai-lte-ue1 container_name: l2sim4g-oai-lte-ue1
network_mode: "host" network_mode: "host"
...@@ -229,7 +229,7 @@ services: ...@@ -229,7 +229,7 @@ services:
retries: 5 retries: 5
oai_ue2: oai_ue2:
image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop} image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
privileged: true privileged: true
container_name: l2sim4g-oai-lte-ue2 container_name: l2sim4g-oai-lte-ue2
network_mode: "host" network_mode: "host"
......
...@@ -178,7 +178,7 @@ services: ...@@ -178,7 +178,7 @@ services:
retries: 5 retries: 5
oai_enb0: oai_enb0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop} image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
privileged: true privileged: true
container_name: rfsim4g-oai-enb container_name: rfsim4g-oai-enb
networks: networks:
...@@ -196,7 +196,7 @@ services: ...@@ -196,7 +196,7 @@ services:
retries: 5 retries: 5
oai_ue0: oai_ue0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop} image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
privileged: true privileged: true
container_name: rfsim4g-oai-lte-ue0 container_name: rfsim4g-oai-lte-ue0
networks: networks:
......
services: services:
oai_enb0: oai_enb0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop} image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
privileged: true privileged: true
container_name: rfsim4g-oai-enb container_name: rfsim4g-oai-enb
networks: networks:
...@@ -18,7 +18,7 @@ services: ...@@ -18,7 +18,7 @@ services:
retries: 5 retries: 5
oai_ue0: oai_ue0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop} image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
privileged: true privileged: true
container_name: rfsim4g-oai-lte-ue0 container_name: rfsim4g-oai-lte-ue0
networks: networks:
......
...@@ -178,7 +178,7 @@ services: ...@@ -178,7 +178,7 @@ services:
retries: 5 retries: 5
oai_enb0: oai_enb0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop} image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
privileged: true privileged: true
container_name: rfsim4g-oai-enb container_name: rfsim4g-oai-enb
networks: networks:
...@@ -196,7 +196,7 @@ services: ...@@ -196,7 +196,7 @@ services:
retries: 5 retries: 5
oai_ue0: oai_ue0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop} image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
privileged: true privileged: true
container_name: rfsim4g-oai-lte-ue0 container_name: rfsim4g-oai-lte-ue0
networks: networks:
......
...@@ -178,7 +178,7 @@ services: ...@@ -178,7 +178,7 @@ services:
retries: 5 retries: 5
oai_enb0: oai_enb0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop} image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
privileged: true privileged: true
container_name: rfsim4g-oai-enb container_name: rfsim4g-oai-enb
networks: networks:
...@@ -196,7 +196,7 @@ services: ...@@ -196,7 +196,7 @@ services:
retries: 5 retries: 5
oai_ue0: oai_ue0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop} image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
privileged: true privileged: true
container_name: rfsim4g-oai-lte-ue0 container_name: rfsim4g-oai-lte-ue0
networks: networks:
......
services: services:
oai_enb0: oai_enb0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop} image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
privileged: true privileged: true
container_name: rfsim4g-oai-enb container_name: rfsim4g-oai-enb
networks: networks:
...@@ -18,7 +18,7 @@ services: ...@@ -18,7 +18,7 @@ services:
retries: 5 retries: 5
oai_ue0: oai_ue0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop} image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
privileged: true privileged: true
container_name: rfsim4g-oai-lte-ue0 container_name: rfsim4g-oai-lte-ue0
networks: networks:
......
services: services:
oai_enb0: oai_enb0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop} image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
privileged: true privileged: true
container_name: rfsim4g-oai-enb container_name: rfsim4g-oai-enb
networks: networks:
...@@ -18,7 +18,7 @@ services: ...@@ -18,7 +18,7 @@ services:
retries: 5 retries: 5
oai_ue0: oai_ue0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop} image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
privileged: true privileged: true
container_name: rfsim4g-oai-lte-ue0 container_name: rfsim4g-oai-lte-ue0
networks: networks:
......
...@@ -178,7 +178,7 @@ services: ...@@ -178,7 +178,7 @@ services:
retries: 5 retries: 5
oai_enb0: oai_enb0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-enb:${TAG:-develop} image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
privileged: true privileged: true
container_name: rfsim4g-oai-enb container_name: rfsim4g-oai-enb
networks: networks:
...@@ -196,7 +196,7 @@ services: ...@@ -196,7 +196,7 @@ services:
retries: 5 retries: 5
oai_ue0: oai_ue0:
image: ${REGISTRY:-oaisoftwarealliance}/oai-lte-ue:${TAG:-develop} image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
privileged: true privileged: true
container_name: rfsim4g-oai-lte-ue0 container_name: rfsim4g-oai-lte-ue0
networks: networks:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment