Updated docker image to use Alpine (reduces in image size). Cleaned up s6-overlay config.
This commit is contained in:
parent
b7a6920517
commit
caabc769e4
10 changed files with 21 additions and 19 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -6,3 +6,4 @@ node_modules/
|
|||
RealDebridClient.zip
|
||||
server/RdtClient.Web/appsettings.Development.json
|
||||
data
|
||||
Dockerfile.dev
|
||||
16
Dockerfile
16
Dockerfile
|
|
@ -65,22 +65,16 @@ ENV RDTCLIENT_BRANCH="main"
|
|||
RUN \
|
||||
mkdir -p /data/downloads /data/db || true && \
|
||||
echo "**** Updating package information ****" && \
|
||||
apt-get update -y -qq && \
|
||||
apk update && \
|
||||
echo "**** Install pre-reqs ****" && \
|
||||
apt-get install -y -qq wget dos2unix && \
|
||||
apt-get install -y libc6 libgcc1 libgssapi-krb5-2 libssl1.1 libstdc++6 zlib1g libicu60 && \
|
||||
apk add bash icu-libs krb5-libs libgcc libintl libssl1.1 libstdc++ zlib && \
|
||||
echo "**** Installing dotnet ****" && \
|
||||
wget -q https://dot.net/v1/dotnet-install.sh && \
|
||||
chmod +x ./dotnet-install.sh && \
|
||||
bash ./dotnet-install.sh -c LTS -v latest --runtime dotnet --install-dir /usr/share/dotnet && \
|
||||
bash ./dotnet-install.sh -c LTS -v latest --runtime aspnetcore --install-dir /usr/share/dotnet && \
|
||||
echo "**** Cleaning image ****" && \
|
||||
apt-get -y -qq -o Dpkg::Use-Pty=0 clean && apt-get -y -qq -o Dpkg::Use-Pty=0 purge && \
|
||||
apk add aspnetcore6-runtime && \
|
||||
echo "**** Setting permissions ****" && \
|
||||
chown -R abc:abc /data && \
|
||||
rm -rf \
|
||||
/tmp/* \
|
||||
/var/lib/apt/lists/* \
|
||||
/var/cache/apk/* \
|
||||
/var/tmp/* || true
|
||||
|
||||
ENV PATH "$PATH:/usr/share/dotnet"
|
||||
|
|
@ -93,7 +87,7 @@ COPY --from=node-build-env /appclient/root/ /
|
|||
|
||||
# ports and volumes
|
||||
EXPOSE 6500
|
||||
VOLUME ["/config", "/data" ]
|
||||
VOLUME [ "/data" ]
|
||||
|
||||
# Check Status
|
||||
HEALTHCHECK --interval=30s --timeout=30s --start-period=30s --retries=3 CMD curl --fail http://localhost:6500 || exit
|
||||
|
|
@ -2,8 +2,9 @@
|
|||
|
||||
param(
|
||||
[string]$TempPath="c:/Temp/RtdClient",
|
||||
[string]$Dockerfile="Dockerfile",
|
||||
[switch]$AutoAttach,
|
||||
[switch]$IgnoreBuildCache,
|
||||
[switch]$SkipCache,
|
||||
[string]$BuildProgress="auto"
|
||||
)
|
||||
|
||||
|
|
@ -17,8 +18,8 @@ Write-Host "removing Container (if exists)"
|
|||
docker rm rdtclientdev
|
||||
|
||||
Write-Host "Building Container"
|
||||
$dockerArgs = @( "build", "--force-rm", "--network host", "--tag", "rdtclientdev", "--progress=$BuildProgress", "." )
|
||||
if ($IgnoreBuildCache.IsPresent) { $dockerArgs += @("--no-cace" ) }
|
||||
$dockerArgs = @( "build", "--force-rm", "--tag", "rdtclientdev", "--progress=$BuildProgress", "--file", $Dockerfile, "." )
|
||||
if ($SkipCache.IsPresent) { $dockerArgs += @("--no-cache" ) }
|
||||
& docker $dockerArgs
|
||||
|
||||
Write-Host "Starting Container"
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ param(
|
|||
[string]$Version = "",
|
||||
[string]$DockerAccount = "rogerfar",
|
||||
[string]$Platforms = "linux/arm/v7,linux/arm64/v8,linux/amd64",
|
||||
[string]$Dockerfile = "Dockerfile",
|
||||
[switch]$SkipPush,
|
||||
[switch]$SkipCache,
|
||||
[switch]$OutputToDocker
|
||||
|
|
@ -42,7 +43,7 @@ param(
|
|||
|
||||
$imageName = "$($DockerAccount)/rdtclient"
|
||||
|
||||
$dockerArgs = @( "buildx", "build", "--network=default", "--platform", $Platforms, "--tag", "$($imageName):latest", "." )
|
||||
$dockerArgs = @( "buildx", "build", "--network=default", "--platform", $Platforms, "--tag", "$($imageName):latest", "--file", $Dockerfile, "." )
|
||||
|
||||
if (-Not $SkipPush.IsPresent) {
|
||||
$dockerArgs += @("--push")
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@
|
|||
# permissions
|
||||
echo "Setting permissions"
|
||||
chown -R abc:abc \
|
||||
/app /data /config
|
||||
/app /data
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
etc/s6-overlay/s6-rc.d/init-rdt-client/run
|
||||
/etc/s6-overlay/s6-rc.d/init-rdt-client/run
|
||||
|
|
@ -5,6 +5,11 @@ if [ -n "${UMASK_SET}" ] && [ -z "${UMASK}" ]; then
|
|||
umask ${UMASK_SET}
|
||||
fi
|
||||
|
||||
# permissions
|
||||
echo "Setting permissions"
|
||||
chown -R abc:abc \
|
||||
/app /data
|
||||
|
||||
echo "Changing to /app folder"
|
||||
cd /app || exit
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue