From 15ef308cbd3f384a87c3289455bbe9f4ef69a7ea Mon Sep 17 00:00:00 2001 From: Jackson Veroneze Date: Mon, 14 Oct 2024 08:00:49 -0300 Subject: [PATCH] feat: ajustes --- .github/workflows/pipeline-create-release.yml | 2 +- {Aspnet/Base => aspnet}/Alpine/Dockerfile | 0 {Aspnet/Base => aspnet}/Debian/Dockerfile | 4 +--- {Aspnet/Base => aspnet}/build.sh | 0 {Aspnet/Base => aspnet}/create-tag.sh | 0 {Aspnet/Base => aspnet}/docker-entrypoint.sh | 2 +- {Aspnet/Base => aspnet}/push.sh | 0 net/docker-entrypoint.sh | 4 ++-- 8 files changed, 5 insertions(+), 7 deletions(-) rename {Aspnet/Base => aspnet}/Alpine/Dockerfile (100%) rename {Aspnet/Base => aspnet}/Debian/Dockerfile (93%) rename {Aspnet/Base => aspnet}/build.sh (100%) rename {Aspnet/Base => aspnet}/create-tag.sh (100%) rename {Aspnet/Base => aspnet}/docker-entrypoint.sh (98%) rename {Aspnet/Base => aspnet}/push.sh (100%) diff --git a/.github/workflows/pipeline-create-release.yml b/.github/workflows/pipeline-create-release.yml index e9ffcab..df8843e 100644 --- a/.github/workflows/pipeline-create-release.yml +++ b/.github/workflows/pipeline-create-release.yml @@ -35,7 +35,7 @@ jobs: - name: Build and Push (asp.net) run: | - cd Aspnet/Base + cd aspnet ./build.sh ./create-tag.sh ./push.sh diff --git a/Aspnet/Base/Alpine/Dockerfile b/aspnet/Alpine/Dockerfile similarity index 100% rename from Aspnet/Base/Alpine/Dockerfile rename to aspnet/Alpine/Dockerfile diff --git a/Aspnet/Base/Debian/Dockerfile b/aspnet/Debian/Dockerfile similarity index 93% rename from Aspnet/Base/Debian/Dockerfile rename to aspnet/Debian/Dockerfile index 8e0cf3c..ffa0300 100644 --- a/Aspnet/Base/Debian/Dockerfile +++ b/aspnet/Debian/Dockerfile @@ -5,7 +5,7 @@ ENV ASPNETCORE_ENVIRONMENT=Production ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false # TZ/LANG envs -ENV TZ=America/Sao_Paulo +ENV TZ America/Sao_Paulo ENV LANG pt_BR.UTF-8 ENV LANGUAGE pt_BR.UTF-8 ENV LC_ALL pt_BR.UTF-8 @@ -26,8 +26,6 @@ RUN echo "locales locales/locales_to_be_generated multiselect pt_BR.UTF-8 UTF-8" COPY docker-entrypoint.sh /home/app -EXPOSE $ASPNETCORE_HTTP_PORTS/tcp - USER app WORKDIR /home/app diff --git a/Aspnet/Base/build.sh b/aspnet/build.sh similarity index 100% rename from Aspnet/Base/build.sh rename to aspnet/build.sh diff --git a/Aspnet/Base/create-tag.sh b/aspnet/create-tag.sh similarity index 100% rename from Aspnet/Base/create-tag.sh rename to aspnet/create-tag.sh diff --git a/Aspnet/Base/docker-entrypoint.sh b/aspnet/docker-entrypoint.sh similarity index 98% rename from Aspnet/Base/docker-entrypoint.sh rename to aspnet/docker-entrypoint.sh index 0f0b437..faee32d 100755 --- a/Aspnet/Base/docker-entrypoint.sh +++ b/aspnet/docker-entrypoint.sh @@ -10,5 +10,5 @@ echo "- Environment: $ASPNETCORE_ENVIRONMENT" echo "- AspNetCorePorts: $ASPNETCORE_HTTP_PORTS" echo "" echo "- Run application: $APP_NAME" - +echo "" dotnet $APP_NAME \ No newline at end of file diff --git a/Aspnet/Base/push.sh b/aspnet/push.sh similarity index 100% rename from Aspnet/Base/push.sh rename to aspnet/push.sh diff --git a/net/docker-entrypoint.sh b/net/docker-entrypoint.sh index a2925f0..593ab85 100755 --- a/net/docker-entrypoint.sh +++ b/net/docker-entrypoint.sh @@ -6,8 +6,8 @@ APP_NAME=$(find . -type f -name "*deps.json" | xargs) APP_NAME=$(echo $APP_NAME | xargs | sed -e "s/.\///g;s/.deps.json/\.dll/g") echo "- SystemOperation: $OS" -echo "- Environment: $DOTNET_ENVIRONMENT" +echo "- Environment: $ASPNETCORE_ENVIRONMENT" echo "" echo "- Run application: $APP_NAME" - +echo "" dotnet $APP_NAME \ No newline at end of file