Skip to content

Commit

Permalink
v3.1.1 (#52)
Browse files Browse the repository at this point in the history
Minor updates
* Using latest base images
* Making output consistent

Documentation updates
* Moving documentation to GitBook
  • Loading branch information
bfren authored Dec 9, 2021
1 parent a41547f commit ce080a0
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 53 deletions.
2 changes: 1 addition & 1 deletion 3.1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG BUILDPLATFORM

RUN echo "Build: $BUILDPLATFORM, target: $TARGETPLATFORM" > /log

FROM bfren/alpine-s6:alpine3.14-3.1.1
FROM bfren/alpine-s6:alpine3.14-3.1.3
COPY --from=build /log /log

ARG TARGETPLATFORM
Expand Down
2 changes: 1 addition & 1 deletion 5.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG BUILDPLATFORM

RUN echo "Build: $BUILDPLATFORM, target: $TARGETPLATFORM" > /log

FROM bfren/alpine-s6:alpine3.14-3.1.1
FROM bfren/alpine-s6:alpine3.14-3.1.3
COPY --from=build /log /log

ARG TARGETPLATFORM
Expand Down
2 changes: 1 addition & 1 deletion 6.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG BUILDPLATFORM

RUN echo "Build: $BUILDPLATFORM, target: $TARGETPLATFORM" > /log

FROM bfren/alpine-s6:alpine3.14-3.1.1
FROM bfren/alpine-s6:alpine3.14-3.1.3
COPY --from=build /log /log

ARG TARGETPLATFORM
Expand Down
35 changes: 1 addition & 34 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,40 +5,7 @@

[Docker Repository](https://hub.docker.com/r/bfren/aspnet) - [bfren ecosystem](https://github.com/bfren/docker)

Comes pre-installed with the ASP.NET runtime and all dependencies.

## Contents

* [Ports](#ports)
* [Volumes](#volumes)
* [Environment Variables](#environment-variables)
* [Helper Functions](#helper-functions)
* [Licence / Copyright](#licence)

## Ports

* 5000

## Volumes

| Volume | Purpose |
| ----------- | ---------------------------------------- |
| `/app/live` | Publish your source code to this folder. |

## Environment Variables

| Variable | Values | Description | Default |
| --------------------------------------- | ------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------- |
| `ASPNET_ASSEMBLY` | string | The filename of the assembly to execute. | *None* - **required** |
| `ASPNETCORE_URLS` | string | Default value binds web server to port 5000 - should not normally need to be changed. | "http://+:5000" |
| `DOTNET_RUNNING_IN_CONTAINER` | true or false | This should always be set to true - it tells dotnet that it is running in a container environment. | true |
| `DOTNET_SYSTEM_GLOBALIZATION_INVARIANT` | true or false | See [here](https://github.com/dotnet/runtime/blob/master/docs/design/features/globalization-invariant-mode.md) and [here](https://github.com/dotnet/announcements/issues/20). | true |

## Helper Functions

| Function | Arguments | Description |
| ------------ | --------- | --------------------------------------------------------------------------------------- |
| `dotnet-run` | *None* | Checks that the `DOTNET_RUN_ASSEMBLY` environment variable is set and then executes it. |
[Documentation and Usage Guide](https://docs.bfren.dev/docker/base-images/asp.net)

## Licence

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.0
3.1.1
2 changes: 1 addition & 1 deletion overlay/usr/lib/bf/aspnet/restart
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ export BF_E=`basename ${0}`
# Restart the aspnet service.
#======================================================================================================================

bf-debug "Restarting application."
bf-echo "Restarting application."
bf-svc restart aspnet
14 changes: 0 additions & 14 deletions overlay/usr/lib/bf/aspnet/switch
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@ export BF_E=`basename ${0}`
[[ -z "$(ls -A ${ASPNET_APP_PUBLISH})" ]] && bf-error "Please publish source files first."


#======================================================================================================================
# Set permissions of published code.
#======================================================================================================================

#bf-ch -o www:www -m 0400 -t f ${ASPNET_APP_PUBLISH}
#bf-ch -o www:www -m 0500 -t d ${ASPNET_APP_PUBLISH}


#======================================================================================================================
# Disable application (so it won't try to restart before we're ready).
#======================================================================================================================
Expand All @@ -45,12 +37,6 @@ mv ${ASPNET_APP_PUBLISH}/* ${ASPNET_APP_LIVE}
if [ "$(ls -A ${TEMP})" ] ; then
bf-debug " .. moving live files to ${ASPNET_APP_PUBLISH}"
mv ${TEMP}/* ${ASPNET_APP_PUBLISH}

#bf-ch -m 0500 -t d ${ASPNET_APP_LIVE}

#bf-ch -m 0600 -t f ${ASPNET_APP_PUBLISH}
#bf-ch -m 0700 -t d ${ASPNET_APP_PUBLISH}

fi

bf-done

0 comments on commit ce080a0

Please sign in to comment.