Compare commits
2 Commits
93c0c0571c
...
447262feac
Author | SHA1 | Date | |
---|---|---|---|
447262feac | |||
1e5e02d104 |
@ -11,7 +11,7 @@ jobs:
|
||||
matrix:
|
||||
arch:
|
||||
- x86_64
|
||||
# arm64
|
||||
- arm64
|
||||
|
||||
name: Build Docker Image
|
||||
runs-on: docker-${{ matrix.arch }}
|
||||
@ -33,8 +33,7 @@ jobs:
|
||||
( dockerd --host=tcp://0.0.0.0:2375 --tls=false & ) && sleep 3
|
||||
## Some debugging info
|
||||
# docker info && docker version
|
||||
env|sort
|
||||
echo "PRT: ${{ secrets.PKG_WRITE_TOKEN }}"
|
||||
# env|sort
|
||||
|
||||
- name: Registry FQDN Setup
|
||||
id: registry
|
||||
@ -56,7 +55,7 @@ jobs:
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
context: .
|
||||
file: ./Dockerfile
|
||||
file: docker/Dockerfile
|
||||
push: true
|
||||
tags: "${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSIONARCH }}"
|
||||
|
||||
@ -94,6 +93,6 @@ jobs:
|
||||
- name: Build Docker Manifest
|
||||
run: |
|
||||
docker manifest create ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }} \
|
||||
${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-x86_64
|
||||
#${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-arm64
|
||||
${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-x86_64 \
|
||||
${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-arm64
|
||||
docker manifest push --purge ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}
|
||||
|
@ -15,5 +15,5 @@ http {
|
||||
|
||||
#gzip on;
|
||||
|
||||
include /etc/nginx/conf.d/*.conf;
|
||||
include /etc/nginx/http.d/*.conf;
|
||||
}
|
||||
|
14
etc/nginx/include.d/stream.conf
Normal file
14
etc/nginx/include.d/stream.conf
Normal file
@ -0,0 +1,14 @@
|
||||
stream {
|
||||
log_format basic '$remote_addr [$time_local] '
|
||||
'$protocol $status $bytes_sent $bytes_received '
|
||||
'$session_time';
|
||||
|
||||
log_format proxy '$time_local: $remote_addr '
|
||||
'$protocol $status $bytes_sent $bytes_received '
|
||||
'$session_time "$upstream_addr" '
|
||||
'"$upstream_bytes_sent" "$upstream_bytes_received" "$upstream_connect_time"';
|
||||
|
||||
proxy_protocol on;
|
||||
|
||||
include /etc/nginx/stream.d/*.conf;
|
||||
}
|
Loading…
Reference in New Issue
Block a user