@@ -996,8 +996,6 @@ jobs:
996996
997997 - name : Checkout AppAPI
998998 uses : actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
999- with :
1000- path : apps/${{ env.APP_NAME }}
1001999
10021000 - name : Create containers
10031001 run : |
@@ -1011,10 +1009,10 @@ jobs:
10111009 --restart unless-stopped \
10121010 -d ghcr.io/nextcloud/nextcloud-appapi-harp:latest
10131011 docker run --net master_bridge --name nextcloud-docker --rm -d ${{ env.docker-image }}
1014- sed -i 's/127\.0\.0\.1:8080/nextcloud-docker/' apps/${{ env.APP_NAME }}/ tests/simple-nginx-NOT-FOR-PRODUCTION.conf'
1015- sed -i 's/127\.0\.0\.1:8780/appapi-harp:8780/' apps/${{ env.APP_NAME }}/ tests/simple-nginx-NOT-FOR-PRODUCTION.conf'
1012+ sed -i 's/127\.0\.0\.1:8080/nextcloud-docker/' tests/simple-nginx-NOT-FOR-PRODUCTION.conf'
1013+ sed -i 's/127\.0\.0\.1:8780/appapi-harp:8780/' tests/simple-nginx-NOT-FOR-PRODUCTION.conf'
10161014 docker run --net master_bridge --name nextcloud --rm -d nginx \
1017- -v apps/${{ env.APP_NAME }} /tests/simple-nginx-NOT-FOR-PRODUCTION.conf:/etc/nginx/conf.d/default.conf:ro \
1015+ -v . /tests/simple-nginx-NOT-FOR-PRODUCTION.conf:/etc/nginx/conf.d/default.conf:ro \
10181016 sleep 60s
10191017
10201018 - name : Install AppAPI
@@ -1118,11 +1116,11 @@ jobs:
11181116
11191117 - name : Checkout AppAPI
11201118 uses : actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
1121- with :
1122- path : apps/${{ env.APP_NAME }}
11231119
11241120 - name : Create containers
11251121 run : |
1122+ pwd
1123+ ls -la *
11261124 docker network create master_bridge
11271125 docker run \
11281126 -e HP_SHARED_KEY="some_very_secure_password" \
@@ -1134,10 +1132,10 @@ jobs:
11341132 --restart unless-stopped \
11351133 -d ghcr.io/nextcloud/nextcloud-appapi-harp:latest
11361134 docker run --net master_bridge --name nextcloud-docker --rm -d ${{ env.docker-image }}
1137- sed -i 's/127\.0\.0\.1:8080/nextcloud-docker/' apps/${{ env.APP_NAME }}/ tests/simple-nginx-NOT-FOR-PRODUCTION.conf'
1138- sed -i 's/127\.0\.0\.1:8780/appapi-harp:8780/' apps/${{ env.APP_NAME }}/ tests/simple-nginx-NOT-FOR-PRODUCTION.conf'
1135+ sed -i 's/127\.0\.0\.1:8080/nextcloud-docker/' tests/simple-nginx-NOT-FOR-PRODUCTION.conf'
1136+ sed -i 's/127\.0\.0\.1:8780/appapi-harp:8780/' tests/simple-nginx-NOT-FOR-PRODUCTION.conf'
11391137 docker run --net master_bridge --name nextcloud --rm -d nginx \
1140- -v apps/${{ env.APP_NAME }}/ tests/simple-nginx-NOT-FOR-PRODUCTION.conf:/etc/nginx/conf.d/default.conf:ro \
1138+ -v tests/simple-nginx-NOT-FOR-PRODUCTION.conf:/etc/nginx/conf.d/default.conf:ro \
11411139 sleep 60s
11421140
11431141 - name : Install AppAPI
@@ -1315,6 +1313,10 @@ jobs:
13151313 --harp --harp_frp_address "127.0.0.1:8782" --harp_shared_key "some_very_secure_password" \
13161314 --net host --set-default
13171315 ./occ app_api:daemon:list
1316+
1317+ # todo: monitor port binds
1318+ lsof -i -P -n | grep LISTEN 2>&1 | tee lsof.log
1319+
13181320 ./occ app_api:app:register app-skeleton-python harp_proxy \
13191321 --info-xml https://raw.githubusercontent.com/nextcloud/app-skeleton-python/main/appinfo/info.xml \
13201322 --wait-finish
@@ -1328,6 +1330,10 @@ jobs:
13281330 - name : Save app and HaRP container info & logs
13291331 if : always()
13301332 run : |
1333+ # todo
1334+ cat lsof.log
1335+ echo '---'
1336+
13311337 docker inspect appapi-harp | json_pp > harp_host_container.json
13321338 docker logs appapi-harp > harp_host_container.log 2>&1
13331339 docker inspect nc_app_app-skeleton-python | json_pp > app_host_container.json
0 commit comments