Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v6.2.0 #140

Merged
merged 5 commits into from
Feb 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 27 additions & 6 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@ on:
tags-ignore: ['**']
workflow_dispatch:

env:
TEST_TAG: nginx-webdav:test

jobs:
test:
runs-on: ubuntu-latest
steps:
-
name: Checkout code
uses: actions/checkout@v4
build:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -41,6 +38,28 @@ jobs:
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build and export
id: docker_export
uses: docker/build-push-action@v5
with:
build-args: |
BF_IMAGE=${{ env.REPOSITORY_NAME }}
BF_VERSION=${{ steps.version.outputs.contents }}
load: true
tags: ${{ env.TEST_TAG }}
-
name: Run tests
id: docker_test
run: |
docker run --entrypoint "/usr/bin/env" ${{ env.TEST_TAG }} -i nu -c "use bf test ; test"
-
name: Build and push
id: docker_build
Expand All @@ -54,6 +73,8 @@ jobs:
tags: |
bfren/nginx-webdav:dev
bfren/nginx-webdav:${{ steps.version.outputs.contents }}-dev
ghcr.io/bfren/nginx-webdav:dev
ghcr.io/bfren/nginx-webdav:${{ steps.version.outputs.contents }}-dev
-
name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
11 changes: 11 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ jobs:
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build and push
id: docker_build
Expand All @@ -61,6 +68,10 @@ jobs:
bfren/nginx-webdav:${{ steps.version_major.outputs.contents }}
bfren/nginx-webdav:${{ steps.version_minor.outputs.contents }}
bfren/nginx-webdav:${{ steps.version.outputs.contents }}
ghcr.io/bfren/nginx-webdav:latest
ghcr.io/bfren/nginx-webdav:${{ steps.version_major.outputs.contents }}
ghcr.io/bfren/nginx-webdav:${{ steps.version_minor.outputs.contents }}
ghcr.io/bfren/nginx-webdav:${{ steps.version.outputs.contents }}
-
name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
FROM bfren/nginx:nginx1.24-alpine3.19-6.1.3
FROM bfren/nginx:nginx1.24-alpine3.19-6.2.0

LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-webdav"

ARG BF_IMAGE
ARG BF_PUBLISHING
ARG BF_VERSION

COPY ./overlay /
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.1.3
6.2.0
2 changes: 1 addition & 1 deletion VERSION_MINOR
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.1
6.2
Empty file.
2 changes: 1 addition & 1 deletion overlay/tmp/NGINX_BUILD
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.24.0-r14
1.24.0-r15
15 changes: 15 additions & 0 deletions test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/sh

IMAGE=nginx-webdav
VERSION=`cat VERSION`
TAG=${IMAGE}-test

docker buildx build \
--load \
--build-arg BF_IMAGE=${IMAGE} \
--build-arg BF_VERSION=${VERSION} \
-f Dockerfile \
-t ${TAG} \
. \
&& \
docker run --entrypoint "/usr/bin/env" ${TAG} -i nu -c "use bf test ; test"