Fixed execute permission on service run file. Added healthcheck to Dockerfile and docker-compose file. Updated scripts for addtional functionality

This commit is contained in:
Shawn Anderson 2023-03-15 15:16:26 -04:00
parent c4ff8acbc0
commit 311ba78b88
5 changed files with 32 additions and 7 deletions

View file

@ -85,6 +85,7 @@ RUN \
ENV PATH "$PATH:/usr/share/dotnet"
# Copy files for app
WORKDIR /app
COPY --from=dotnet-build-env /appserver/server/out .
COPY --from=node-build-env /appclient/client/out ./wwwroot
@ -93,3 +94,6 @@ COPY --from=node-build-env /appclient/root/ /
# ports and volumes
EXPOSE 6500
VOLUME ["/config", "/data" ]
# Check Status
HEALTHCHECK --interval=30s --timeout=30s --start-period=30s --retries=3 CMD curl --fail http://localhost:6500 || exit

View file

@ -17,7 +17,7 @@ Write-Host "removing Container (if exists)"
docker rm rdtclientdev
Write-Host "Building Container"
$dockerArgs = @( "build", "--force-rm", "--tag", "rdtclientdev", "--progress=$BuildProgress", "." )
$dockerArgs = @( "build", "--force-rm", "--network host", "--tag", "rdtclientdev", "--progress=$BuildProgress", "." )
if ($IgnoreBuildCache.IsPresent) { $dockerArgs += @("--no-cace" ) }
& docker $dockerArgs

View file

@ -4,9 +4,9 @@ services:
rdtclient:
image: rogerfar/rdtclient
container_name: rdtclient
build:
context: .
dockerfile: Dockerfile
# build:
# context: .
# dockerfile: Dockerfile
environment:
- PUID=1001
- PGID=1001
@ -20,3 +20,9 @@ services:
max-size: 10m
ports:
- '6500:6500'
healthcheck:
test: curl --fail http://localhost:6500 || exit 1
interval: 30s
retries: 3
start_period: 30s
timeout: 30s

View file

@ -1,4 +1,4 @@
#!/bin/pwsh
#!/usr/bin/env pwsh
<#
.SYNOPSIS
Helper script to execute docker buildx
@ -34,12 +34,27 @@
param(
[string]$Version = "",
[string]$DockerAccount = "rogerfar",
[string]$Platforms = "linux/arm/v7,linux/arm64/v8,linux/amd64"
[string]$Platforms = "linux/arm/v7,linux/arm64/v8,linux/amd64",
[switch]$SkipPush,
[switch]$SkipCache,
[switch]$OutputToDocker
)
$imageName = "$($DockerAccount)/rdtclient"
$dockerArgs = @( "buildx", "build", "--no-cache", "--push", "--platform", $Platforms, "--tag", "$($imageName):latest", "." )
$dockerArgs = @( "buildx", "build", "--network=default", "--platform", $Platforms, "--tag", "$($imageName):latest", "." )
if (-Not $SkipPush.IsPresent) {
$dockerArgs += @("--push")
}
if (-Not $SkipCache.IsPresent) {
$dockerArgs += @("--no-cache")
}
if ($OutputToDocker.IsPresent) {
$dockerArgs += @("--output=type=docker")
}
if ([string]::IsNullOrEmpty($Version)) {
$Version = (Get-Content "package.json" | ConvertFrom-Json).version

0
root/etc/s6-overlay/s6-rc.d/svc-rdt-client/run Normal file → Executable file
View file