Skip to content

Commit 8020ecf

Browse files
kyteinskykyteinsky
committed
fast fix ci
- fix nextcloud docker container name - remove extra single quote Signed-off-by: Anupam Kumar <[email protected]>
1 parent d7b9ede commit 8020ecf

File tree

1 file changed

+31
-33
lines changed

1 file changed

+31
-33
lines changed

‎.github/workflows/tests-deploy.yml‎

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -42,28 +42,28 @@ jobs:
4242
--restart unless-stopped \
4343
-d ghcr.io/nextcloud/nextcloud-appapi-harp:latest
4444
docker run --net master_bridge --name nextcloud-docker --rm -d ${{ env.docker-image }}
45-
sed -i 's/127\.0\.0\.1:8080/nextcloud-docker/' tests/simple-nginx-NOT-FOR-PRODUCTION.conf'
46-
sed -i 's/127\.0\.0\.1:8780/appapi-harp:8780/' tests/simple-nginx-NOT-FOR-PRODUCTION.conf'
45+
sed -i 's/127\.0\.0\.1:8080/nextcloud-docker/' tests/simple-nginx-NOT-FOR-PRODUCTION.conf
46+
sed -i 's/127\.0\.0\.1:8780/appapi-harp:8780/' tests/simple-nginx-NOT-FOR-PRODUCTION.conf
4747
docker run --net master_bridge --name nextcloud --rm -d nginx \
4848
-v ./tests/simple-nginx-NOT-FOR-PRODUCTION.conf:/etc/nginx/conf.d/default.conf:ro \
49-
sleep 60s
5049
5150
- name: Install AppAPI
5251
run: |
53-
docker exec -w /var/www/html/apps nextcloud git clone https://github.com/nextcloud/${{ env.APP_NAME }}.git
54-
docker exec -w /var/www/html/apps/${{ env.APP_NAME }} nextcloud git fetch origin $GITHUB_REF
55-
docker exec -w /var/www/html/apps/${{ env.APP_NAME }} nextcloud git checkout FETCH_HEAD
56-
docker exec nextcloud sudo -u www-data php occ app:enable app_api
57-
docker exec nextcloud sudo -u www-data php occ app_api:daemon:register \
52+
sleep 60s
53+
docker exec -w /var/www/html/apps nextcloud-docker git clone https://github.com/nextcloud/${{ env.APP_NAME }}.git
54+
docker exec -w /var/www/html/apps/${{ env.APP_NAME }} nextcloud-docker git fetch origin $GITHUB_REF
55+
docker exec -w /var/www/html/apps/${{ env.APP_NAME }} nextcloud-docker git checkout FETCH_HEAD
56+
docker exec nextcloud-docker sudo -u www-data php occ app:enable app_api
57+
docker exec nextcloud-docker sudo -u www-data php occ app_api:daemon:register \
5858
harp_proxy "Harp Proxy with DSP" "docker-install" "http" "appapi-harp:8780" "http://nextcloud" \
5959
--harp --harp_frp_address "appapi-harp:8782" --harp_shared_key "some_very_secure_password" \
6060
--net=master_bridge --set-default
61-
docker exec nextcloud sudo -u www-data php occ app_api:daemon:list
62-
docker exec nextcloud ping -c 1 appapi-harp
61+
docker exec nextcloud-docker sudo -u www-data php occ app_api:daemon:list
62+
docker exec nextcloud-docker ping -c 1 appapi-harp
6363
6464
- name: Registering and enabling Skeleton ExApp
6565
run: |
66-
docker exec nextcloud sudo -u www-data php occ app_api:app:register app-skeleton-python harp_proxy \
66+
docker exec nextcloud-docker sudo -u www-data php occ app_api:app:register app-skeleton-python harp_proxy \
6767
--info-xml https://raw.githubusercontent.com/nextcloud/app-skeleton-python/main/appinfo/info.xml \
6868
--wait-finish
6969
@@ -73,11 +73,11 @@ jobs:
7373

7474
- name: Disable ExApp
7575
run: |
76-
docker exec nextcloud sudo -u www-data php occ app_api:app:disable app-skeleton-python
76+
docker exec nextcloud-docker sudo -u www-data php occ app_api:app:disable app-skeleton-python
7777
7878
- name: Copy NC log to host
7979
if: always()
80-
run: docker cp nextcloud:/var/www/html/data/nextcloud.log nextcloud.log
80+
run: docker cp nextcloud-docker:/var/www/html/data/nextcloud.log nextcloud.log
8181

8282
- name: Check logs
8383
run: |
@@ -94,8 +94,8 @@ jobs:
9494
9595
- name: Unregister Skeleton & Daemon
9696
run: |
97-
docker exec nextcloud sudo -u www-data php occ app_api:app:unregister app-skeleton-python
98-
docker exec nextcloud sudo -u www-data php occ app_api:daemon:unregister harp_proxy
97+
docker exec nextcloud-docker sudo -u www-data php occ app_api:app:unregister app-skeleton-python
98+
docker exec nextcloud-docker sudo -u www-data php occ app_api:daemon:unregister harp_proxy
9999
100100
- name: Upload Container info
101101
if: always()
@@ -152,8 +152,6 @@ jobs:
152152

153153
- name: Create containers
154154
run: |
155-
pwd
156-
ls -la *
157155
docker network create master_bridge
158156
docker run \
159157
-e HP_SHARED_KEY="some_very_secure_password" \
@@ -165,28 +163,28 @@ jobs:
165163
--restart unless-stopped \
166164
-d ghcr.io/nextcloud/nextcloud-appapi-harp:latest
167165
docker run --net master_bridge --name nextcloud-docker --rm -d ${{ env.docker-image }}
168-
sed -i 's/127\.0\.0\.1:8080/nextcloud-docker/' tests/simple-nginx-NOT-FOR-PRODUCTION.conf'
169-
sed -i 's/127\.0\.0\.1:8780/appapi-harp:8780/' tests/simple-nginx-NOT-FOR-PRODUCTION.conf'
166+
sed -i 's/127\.0\.0\.1:8080/nextcloud-docker/' tests/simple-nginx-NOT-FOR-PRODUCTION.conf
167+
sed -i 's/127\.0\.0\.1:8780/appapi-harp:8780/' tests/simple-nginx-NOT-FOR-PRODUCTION.conf
170168
docker run --net master_bridge --name nextcloud --rm -d nginx \
171169
-v tests/simple-nginx-NOT-FOR-PRODUCTION.conf:/etc/nginx/conf.d/default.conf:ro \
172-
sleep 60s
173170
174171
- name: Install AppAPI
175172
run: |
176-
docker exec -w /var/www/html/apps nextcloud git clone https://github.com/nextcloud/${{ env.APP_NAME }}.git
177-
docker exec -w /var/www/html/apps/${{ env.APP_NAME }} nextcloud git fetch origin $GITHUB_REF
178-
docker exec -w /var/www/html/apps/${{ env.APP_NAME }} nextcloud git checkout FETCH_HEAD
179-
docker exec nextcloud sudo -u www-data php occ app:enable app_api
180-
docker exec nextcloud sudo -u www-data php occ app_api:daemon:register \
173+
sleep 60s
174+
docker exec -w /var/www/html/apps nextcloud-docker git clone https://github.com/nextcloud/${{ env.APP_NAME }}.git
175+
docker exec -w /var/www/html/apps/${{ env.APP_NAME }} nextcloud-docker git fetch origin $GITHUB_REF
176+
docker exec -w /var/www/html/apps/${{ env.APP_NAME }} nextcloud-docker git checkout FETCH_HEAD
177+
docker exec nextcloud-docker sudo -u www-data php occ app:enable app_api
178+
docker exec nextcloud-docker sudo -u www-data php occ app_api:daemon:register \
181179
harp_proxy "Harp Proxy with DSP" "docker-install" "http" "appapi-harp:8780" "http://nextcloud" \
182180
--harp --harp_frp_address "appapi-harp:8782" --harp_shared_key "some_very_secure_password" \
183181
--net=master_bridge --set-default
184-
docker exec nextcloud sudo -u www-data php occ app_api:daemon:list
185-
docker exec nextcloud ping -c 1 appapi-harp
182+
docker exec nextcloud-docker sudo -u www-data php occ app_api:daemon:list
183+
docker exec nextcloud-docker ping -c 1 appapi-harp
186184
187185
- name: Registering and enabling Skeleton ExApp
188186
run: |
189-
docker exec nextcloud sudo -u www-data php occ app_api:app:register app-skeleton-python harp_proxy \
187+
docker exec nextcloud-docker sudo -u www-data php occ app_api:app:register app-skeleton-python harp_proxy \
190188
--info-xml https://raw.githubusercontent.com/nextcloud/app-skeleton-python/main/appinfo/info.xml \
191189
--wait-finish
192190
@@ -196,11 +194,11 @@ jobs:
196194

197195
- name: Disable ExApp
198196
run: |
199-
docker exec nextcloud sudo -u www-data php occ app_api:app:disable app-skeleton-python
197+
docker exec nextcloud-docker sudo -u www-data php occ app_api:app:disable app-skeleton-python
200198
201199
- name: Copy NC log to host
202200
if: always()
203-
run: docker cp nextcloud:/var/www/html/data/nextcloud.log nextcloud.log
201+
run: docker cp nextcloud-docker:/var/www/html/data/nextcloud.log nextcloud.log
204202

205203
- name: Check logs
206204
run: |
@@ -217,8 +215,8 @@ jobs:
217215
218216
- name: Unregister Skeleton & Daemon
219217
run: |
220-
docker exec nextcloud sudo -u www-data php occ app_api:app:unregister app-skeleton-python
221-
docker exec nextcloud sudo -u www-data php occ app_api:daemon:unregister harp_proxy
218+
docker exec nextcloud-docker sudo -u www-data php occ app_api:app:unregister app-skeleton-python
219+
docker exec nextcloud-docker sudo -u www-data php occ app_api:daemon:unregister harp_proxy
222220
223221
- name: Upload HaRP Container info
224222
if: always()
@@ -256,7 +254,7 @@ jobs:
256254
if: always()
257255
uses: actions/upload-artifact@v4
258256
with:
259-
name: harp_bridge_nextcloud.log
257+
name: harp_bridge_no_tls_nextcloud.log
260258
path: nextcloud.log
261259
if-no-files-found: warn
262260

0 commit comments

Comments
 (0)