Compare commits

..

No commits in common. "447262feac8a65d82b23950895e64da736bd6d2c" and "93c0c0571c2f1440838eade23a27154f1090ec9e" have entirely different histories.

5 changed files with 7 additions and 20 deletions

View File

@ -11,7 +11,7 @@ jobs:
matrix:
arch:
- x86_64
- arm64
# arm64
name: Build Docker Image
runs-on: docker-${{ matrix.arch }}
@ -33,7 +33,8 @@ jobs:
( dockerd --host=tcp://0.0.0.0:2375 --tls=false & ) && sleep 3
## Some debugging info
# docker info && docker version
# env|sort
env|sort
echo "PRT: ${{ secrets.PKG_WRITE_TOKEN }}"
- name: Registry FQDN Setup
id: registry
@ -55,7 +56,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
file: docker/Dockerfile
file: ./Dockerfile
push: true
tags: "${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSIONARCH }}"
@ -93,6 +94,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 }}

View File

@ -15,5 +15,5 @@ http {
#gzip on;
include /etc/nginx/http.d/*.conf;
include /etc/nginx/conf.d/*.conf;
}

View File

@ -1,14 +0,0 @@
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;
}