Skip to content

Commit

Permalink
build: update build files
Browse files Browse the repository at this point in the history
  • Loading branch information
SenexCrenshaw committed Feb 11, 2024
1 parent 475a600 commit 497b721
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
2 changes: 2 additions & 0 deletions Dockerfile.base
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base

WORKDIR /app

RUN apt-get update -yq \
&& apt-get upgrade -yq \
&& apt-get install -yq --no-install-recommends ffmpeg gosu postgresql postgresql-common curl gnupg lsb-release \
Expand Down
7 changes: 5 additions & 2 deletions Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ LABEL org.opencontainers.image.url="https://hub.docker.com/r/SenexCrenshaw/strea
org.opencontainers.image.description="Dockerized Stream Master by SenexCrenshaw" \
org.opencontainers.image.authors="SenexCrenshaw"

WORKDIR /app

RUN mkdir /config

ENV PUID=0
ENV PGID=0

COPY --from=sm /app/publish /
COPY --from=sm /app/publish .

COPY docker-entrypoint.sh docker-ensure-initdb.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/docker-entrypoint.sh /usr/local/bin/docker-ensure-initdb.sh
Expand All @@ -21,8 +23,9 @@ COPY entrypoint.sh /entrypoint.sh
COPY env.sh /env.sh
RUN chmod +x /entrypoint.sh /env.sh /usr/local/bin/backup.sh

EXPOSE 7095
EXPOSE 5432

ENTRYPOINT ["/entrypoint.sh", "dotnet", "StreamMaster.API.dll"]

STOPSIGNAL SIGINT
STOPSIGNAL SIGINT
2 changes: 1 addition & 1 deletion build_docker.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ function Main {
Write-StringToFile -Path "buildver" -Content $processedAssemblyInfo.BranchNameRevision
}

if ($BuildSM -or $BuildBuild -or $BuildAll) {
if ($BuildSM -or $BuildAll) {
$dockerFile = "Dockerfile.sm"
$global:tags = @("$("${buildName}:"+$processedAssemblyInfo.BranchNameRevision)-sm")

Expand Down
2 changes: 1 addition & 1 deletion release.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module.exports = {
{ type: "docs", scope: "README", release: "patch" },
{ type: "refactor", release: "minor" },
{ type: "style", release: "patch" },
{ type: "build", release: "patch" },
{ type: "build", release: "false" },
{ type: "update", release: "patch" }
],
parserOpts: {
Expand Down

0 comments on commit 497b721

Please sign in to comment.