docker/nginx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: docker:93c0c0571c2f1440838eade23a27154f1090ec9e
Branches Tags
docker:master
...
compare: docker:447262feac8a65d82b23950895e64da736bd6d2c
Branches Tags
docker:master

2 Commits
93c0c0571c ... 447262feac

Author SHA1 Message Date
Deon George
447262feac Change to gitea workflow
Some checks failed
Create Docker Image / Final Docker Image Manifest (push) Blocked by required conditions
Details
Create Docker Image / Build Docker Image (x86_64) (push) Failing after 52s
Details
Create Docker Image / Build Docker Image (arm64) (push) Has been cancelled
Details
2024-10-12 22:23:15 +11:00
Deon George
1e5e02d104 Add stream configuration 2024-10-12 22:22:27 +11:00
5 changed files with 20 additions and 7 deletions
Show Stats Expand all files Collapse all files

11
.gitea/workflows/build_docker.yml
View File

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

0
Dockerfile → docker/Dockerfile
View File

0
init-docker → docker/init-docker
View File

2
etc/nginx/include.d/http.conf
View File

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

14
etc/nginx/include.d/stream.conf Normal file
View 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;
}