Skip to content

Commit 5520693

Browse files
authored
Update docker.yml
Signed-off-by: Zoey <[email protected]>
1 parent f26ae6d commit 5520693

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

.github/workflows/docker.yml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,18 @@ jobs:
9191
run: |
9292
docker run -d --pull always --platform amd64 --name nginx-x86_64 ${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:${{ github.ref_name }}
9393
docker cp nginx-x86_64:/usr/local/nginx nginx
94-
docker cp nginx-x86_64:/usr/local/lib/* nginx/lib
95-
docker cp nginx-x86_64:/usr/lib/ossl-modules/oqsprovider.so nginx/lib/oqsprovider.so
94+
docker cp nginx-x86_64:/usr/local/lib lib
95+
docker cp nginx-x86_64:/usr/lib/ossl-modules/oqsprovider.so lib/oqsprovider.so
9696
docker cp nginx-x86_64:/usr/local/nginx/sbin/nginx nginx-x86_64
97-
tar -cJf nginx-x86_64.tar.xz nginx
98-
rm -r nginx
97+
tar -cJf nginx-x86_64.tar.xz nginx lib
98+
rm -vr nginx lib
9999
docker run -d --pull always --platform arm64 --name nginx-aarch64 ${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:${{ github.ref_name }}
100100
docker cp nginx-aarch64:/usr/local/nginx nginx
101-
docker cp nginx-aarch64:/usr/local/lib/* nginx/lib
102-
docker cp nginx-aarch64:/usr/lib/ossl-modules/oqsprovider.so nginx/lib/oqsprovider.so
101+
docker cp nginx-aarch64:/usr/local/lib lib
102+
docker cp nginx-aarch64:/usr/lib/ossl-modules/oqsprovider.so lib/oqsprovider.so
103103
docker cp nginx-aarch64:/usr/local/nginx/sbin/nginx nginx-aarch64
104-
tar -cJf nginx-aarch64.tar.xz nginx
105-
rm -r nginx
104+
tar -cJf nginx-aarch64.tar.xz nginx lib
105+
rm -vr nginx lib
106106
- uses: actions/upload-artifact@v4
107107
if: ${{ github.event_name != 'pull_request' }}
108108
with:
@@ -156,16 +156,18 @@ jobs:
156156
run: |
157157
docker run -d --pull always --platform amd64 --name nginx-x86_64 ghcr.io/${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:${{ steps.pr.outputs.pr }}
158158
docker cp nginx-x86_64:/usr/local/nginx nginx
159-
docker cp nginx-x86_64:/usr/local/lib nginx/lib
159+
docker cp nginx-x86_64:/usr/local/lib lib
160+
docker cp nginx-x86_64:/usr/lib/ossl-modules/oqsprovider.so lib/oqsprovider.so
160161
docker cp nginx-x86_64:/usr/local/nginx/sbin/nginx nginx-x86_64
161-
tar -cJf nginx-x86_64.tar.xz nginx
162-
rm -r nginx
162+
tar -cJf nginx-x86_64.tar.xz nginx lib
163+
rm -vr nginx lib
163164
docker run -d --pull always --platform arm64 --name nginx-aarch64 ghcr.io/${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:${{ steps.pr.outputs.pr }}
164165
docker cp nginx-aarch64:/usr/local/nginx nginx
165-
docker cp nginx-aarch64:/usr/local/lib nginx/lib
166+
docker cp nginx-aarch64:/usr/local/lib lib
167+
docker cp nginx-aarch64:/usr/lib/ossl-modules/oqsprovider.so lib/oqsprovider.so
166168
docker cp nginx-aarch64:/usr/local/nginx/sbin/nginx nginx-aarch64
167-
tar -cJf nginx-aarch64.tar.xz nginx
168-
rm -r nginx
169+
tar -cJf nginx-aarch64.tar.xz nginx lib
170+
rm -vr nginx lib
169171
- uses: actions/upload-artifact@v4
170172
if: ${{ github.event_name == 'pull_request' }}
171173
with:

0 commit comments

Comments
 (0)