v5.0.0

.gitattributes

@@ -0,0 +1,2 @@
+# Always use LF endings.
+* text eol=lf

.github/workflows/auto-pr.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
     -
       name: Checkout Branch ${{ github.ref_name }}
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     -
       name: Create Pull Request
       uses: bfren/pull-request@v2

.github/workflows/dev.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       -
         name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
   build:
     strategy:
       fail-fast: false
@@ -22,7 +22,7 @@ jobs:
     steps:
       -
         name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         name: Get repository name
         run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
@@ -35,31 +35,31 @@ jobs:
         id: version
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       -
         name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./${{ matrix.dotnet }}/Dockerfile
           build-args: |
             BF_IMAGE=${{ env.REPOSITORY_NAME }}
             BF_VERSION=${{ steps.version.outputs.contents }}
           push: ${{ startsWith(github.ref, 'refs/heads/') }}
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
           tags: |
             bfren/aspnet:net${{ matrix.dotnet }}-dev
-            bfren/aspnet:net${{ matrix.dotnet }}-${{ steps.version.outputs.contents }}-beta
+            bfren/aspnet:net${{ matrix.dotnet }}-${{ steps.version.outputs.contents }}-dev
       -
         name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/publish.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       -
         name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         name: Get repository name
         run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
@@ -46,28 +46,28 @@ jobs:
         id: version
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       -
         name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./${{ matrix.dotnet }}/Dockerfile
           build-args: |
             BF_IMAGE=${{ env.REPOSITORY_NAME }}
             BF_VERSION=${{ steps.version.outputs.contents }}
           push: true
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
           tags: |
             bfren/aspnet:net${{ matrix.dotnet }}
             bfren/aspnet:net${{ matrix.dotnet }}-${{ steps.version_major.outputs.contents }}

.github/workflows/update-readme.yml

@@ -15,10 +15,10 @@ jobs:
         shell: bash
       -
         name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

6/Dockerfile

@@ -1,39 +1,29 @@
-FROM --platform=$BUILDPLATFORM golang:alpine AS build
-
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-
-RUN echo "Build: $BUILDPLATFORM, target: $TARGETPLATFORM" > /log
-
-FROM bfren/alpine-s6:alpine3.18-4.5.9
-COPY --from=build /log /log
+FROM bfren/alpine-s6:alpine3.18-5.0.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-aspnet"
 
-ARG TARGETPLATFORM
-
 ARG BF_IMAGE
 ARG BF_VERSION
 
 EXPOSE 5000
 
+COPY ./overlay /
+COPY ./6/overlay /
+
 ENV \
     # The ASP.NET version - used to assist in calculating checksums
     ASPNET_VERSION=6 \
-    # Must be defined so the service can run the application
-    ASPNET_ASSEMBLY= \
     # Configure web servers to bind to port 5000
     ASPNETCORE_URLS="http://+:5000" \
+    # Must be defined so the service can run the application
+    BF_ASPNET_ASSEMBLY= \
     # Otherwise it is set incorrectly to the S6 service directory
     DOTNET_CONTENTROOT="/app/live" \
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true \
     # Set the invariant mode to false so CultureInfo can be used
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
 
-COPY ./overlay /
-COPY ./6/overlay /
-
 RUN bf-install
 
 VOLUME [ "/app/live", "/app/publish" ]

6/overlay/tmp/DOTNET_REVISION

@@ -1 +1 @@
-6.0.23
+6.0.25

7/Dockerfile

@@ -1,39 +1,29 @@
-FROM --platform=$BUILDPLATFORM golang:alpine AS build
-
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-
-RUN echo "Build: $BUILDPLATFORM, target: $TARGETPLATFORM" > /log
-
-FROM bfren/alpine-s6:alpine3.18-4.5.9
-COPY --from=build /log /log
+FROM bfren/alpine-s6:alpine3.18-5.0.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-aspnet"
 
-ARG TARGETPLATFORM
-
 ARG BF_IMAGE
 ARG BF_VERSION
 
 EXPOSE 5000
 
+COPY ./overlay /
+COPY ./7/overlay /
+
 ENV \
     # The ASP.NET version - used to assist in calculating checksums
     ASPNET_VERSION=7 \
-    # Must be defined so the service can run the application
-    ASPNET_ASSEMBLY= \
     # Configure web servers to bind to port 5000
     ASPNETCORE_URLS="http://+:5000" \
+    # Must be defined so the service can run the application
+    BF_ASPNET_ASSEMBLY= \
     # Otherwise it is set incorrectly to the S6 service directory
     DOTNET_CONTENTROOT="/app/live" \
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true \
     # Set the invariant mode to false so CultureInfo can be used
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
 
-COPY ./overlay /
-COPY ./7/overlay /
-
 RUN bf-install
 
 VOLUME [ "/app/live", "/app/publish" ]

7/overlay/tmp/DOTNET_REVISION

@@ -1 +1 @@
-7.0.12
+7.0.14

8/Dockerfile

@@ -1,39 +1,29 @@
-FROM --platform=$BUILDPLATFORM golang:alpine AS build
-
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-
-RUN echo "Build: $BUILDPLATFORM, target: $TARGETPLATFORM" > /log
-
-FROM bfren/alpine-s6:alpine3.18-4.5.9
-COPY --from=build /log /log
+FROM bfren/alpine-s6:alpine3.18-5.0.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-aspnet"
 
-ARG TARGETPLATFORM
-
 ARG BF_IMAGE
 ARG BF_VERSION
 
 EXPOSE 5000
 
+COPY ./overlay /
+COPY ./8/overlay /
+
 ENV \
     # The ASP.NET version - used to assist in calculating checksums
     ASPNET_VERSION=8 \
-    # Must be defined so the service can run the application
-    ASPNET_ASSEMBLY= \
     # Configure web servers to bind to port 5000
     ASPNETCORE_URLS="http://+:5000" \
+    # Must be defined so the service can run the application
+    BF_ASPNET_ASSEMBLY= \
     # Otherwise it is set incorrectly to the S6 service directory
     DOTNET_CONTENTROOT="/app/live" \
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true \
     # Set the invariant mode to false so CultureInfo can be used
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
 
-COPY ./overlay /
-COPY ./8/overlay /
-
 RUN bf-install
 
 VOLUME [ "/app/live", "/app/publish" ]

8/overlay/tmp/DOTNET_REVISION

@@ -1 +1 @@
-8.0.0-rc.2
+8.0.0

Dockerfile.esh

@@ -1,39 +1,29 @@
-FROM --platform=$BUILDPLATFORM golang:alpine AS build
-
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-
-RUN echo "Build: $BUILDPLATFORM, target: $TARGETPLATFORM" > /log
-
-FROM bfren/alpine-s6:alpine<%= ${ALPINE_MINOR} %>-<%= ${BASE_REVISION} %>
-COPY --from=build /log /log
+FROM bfren/alpine-s6:alpine<%= ${ALPINE_MINOR} %>-<%= ${BASE_VERSION} %>
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-aspnet"
 
-ARG TARGETPLATFORM
-
 ARG BF_IMAGE
 ARG BF_VERSION
 
 EXPOSE 5000
 
+COPY ./overlay /
+COPY ./<%= ${ASPNET_VERSION} %>/overlay /
+
 ENV \
     # The ASP.NET version - used to assist in calculating checksums
     ASPNET_VERSION=<%= ${ASPNET_VERSION} %> \
-    # Must be defined so the service can run the application
-    ASPNET_ASSEMBLY= \
     # Configure web servers to bind to port 5000
     ASPNETCORE_URLS="http://+:5000" \
+    # Must be defined so the service can run the application
+    BF_ASPNET_ASSEMBLY= \
     # Otherwise it is set incorrectly to the S6 service directory
     DOTNET_CONTENTROOT="/app/live" \
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true \
     # Set the invariant mode to false so CultureInfo can be used
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
 
-COPY ./overlay /
-COPY ./<%= ${ASPNET_VERSION} %>/overlay /
-
 RUN bf-install
 
 VOLUME [ "/app/live", "/app/publish" ]

VERSION

@@ -1 +1 @@
-4.5.32
+5.0.0

VERSION_MAJOR

@@ -1 +1 @@
-4
+5

VERSION_MINOR

@@ -1 +1 @@
-4.5
+5.0

generate-dockerfiles.sh

@@ -4,8 +4,8 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_REVISION="4.5.9"
-echo "Base: ${BASE_REVISION}"
+BASE_VERSION="5.0.0"
+echo "Base: ${BASE_VERSION}"
 
 ASPNET_VERSIONS="6 7 8"
 for V in ${ASPNET_VERSIONS} ; do
@@ -18,7 +18,7 @@ for V in ${ASPNET_VERSIONS} ; do
         -e BF_DEBUG=0 \
         bfren/alpine esh \
         "/ws/Dockerfile.esh" \
-        BASE_REVISION=${BASE_REVISION} \
+        BASE_VERSION=${BASE_VERSION} \
         ALPINE_MINOR=${ALPINE_MINOR} \
         ASPNET_VERSION=${V}
     )

overlay/etc/bf/ch.d/10-aspnet

@@ -1,2 +1,2 @@
 /app/live www:www 0400 0500
-/app/publish www:www 0660 0770
+/app/publish www:www 0600 0700

overlay/etc/bf/init.d/10-env.nu

@@ -0,0 +1,10 @@
+use bf
+bf env load
+
+# Set environment variables
+def main [] {
+    let app = "/app"
+    bf env set ASPNET_APP $app
+    bf env set ASPNET_APP_LIVE $"($app)/live"
+    bf env set ASPNET_APP_PUBLISH $"($app)/publish"
+}