feat: ajustes

jacksonveroneze · Apr 5, 2023 · a899e98 · a899e98
1 parent 68ff19f
commit a899e98
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/pipeline-create-release.yml b/.github/workflows/pipeline-create-release.yml
@@ -30,7 +30,7 @@ jobs:
 
       - name: Push base images
         run: |
-          docker push jacksonveroneze/aspnet:6.0-alpine
+          docker push jacksonveroneze/aspnet:7.0-alpine
           docker push jacksonveroneze/aspnet:7.0-ubuntu
 
       - name: Build xray images
@@ -39,5 +39,5 @@ jobs:
 
       - name: Push xray images
         run: |
-          docker push jacksonveroneze/aspnet:6.0-alpine-xray
+          docker push jacksonveroneze/aspnet:7.0-alpine-xray
           docker push jacksonveroneze/aspnet:7.0-ubuntu-xray
diff --git a/Aspnet/Alpine/Dockerfile-6-Alpine → Aspnet/Alpine/Dockerfile-7-Alpine b/Aspnet/Alpine/Dockerfile-6-Alpine → Aspnet/Alpine/Dockerfile-7-Alpine
@@ -1,13 +1,13 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine
+FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine
 
 # .NET envs
-ENV ASPNETCORE_URLS=http://+:5000
+ENV ASPNETCORE_URLS=http://+:8080
 ENV DOTNET_RUNNING_IN_CONTAINER=true
 ENV ASPNETCORE_ENVIRONMENT=Production
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
 
 # User envs
-ARG USERNAME=dotnet
+ARG USERNAME=app
 ARG USER_UID=1000
 ARG USER_GID=$USER_UID
 
@@ -21,9 +21,9 @@ ENV LC_ALL pt_BR.UTF-8
 ENV LANG pt_BR.UTF-8
 ENV LANGUAGE pt_BR.UTF-8
 
-ENV APP_DIR=/home/$USERNAME/app
+ENV APP_DIR=/home/$USERNAME/application
 
-EXPOSE 5000
+EXPOSE 8080
 
 USER $USERNAME
 

diff --git a/Aspnet/Alpine/Dockerfile-6-Alpine-xray → Aspnet/Alpine/Dockerfile-7-Alpine-xray b/Aspnet/Alpine/Dockerfile-6-Alpine-xray → Aspnet/Alpine/Dockerfile-7-Alpine-xray
@@ -1,4 +1,4 @@
-FROM jacksonveroneze/aspnet:6.0-alpine
+FROM jacksonveroneze/aspnet:7.0-alpine
 
 USER root
 
@@ -7,4 +7,4 @@ RUN sh -x /tmp/script-install-xray.sh && rm /tmp/script-install-xray.sh
 
 ENV AWS_XRAY_CONTEXT_MISSING=LOG_ERROR
 
-USER dotnet
+USER $USERNAME
diff --git a/Aspnet/Ubuntu/Dockerfile-7-Ubuntu b/Aspnet/Ubuntu/Dockerfile-7-Ubuntu
@@ -1,13 +1,13 @@
 FROM mcr.microsoft.com/dotnet/aspnet:7.0-jammy
 
 # .NET envs
-ENV ASPNETCORE_URLS=http://+:5000
+ENV ASPNETCORE_URLS=http://+:8080
 ENV DOTNET_RUNNING_IN_CONTAINER=true
 ENV ASPNETCORE_ENVIRONMENT=Production
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
 
 # User envs
-ARG USERNAME=dotnet
+ARG USERNAME=app
 ARG USER_UID=1000
 ARG USER_GID=$USER_UID
 
@@ -21,9 +21,9 @@ ENV LC_ALL pt_BR.UTF-8
 ENV LANG pt_BR.UTF-8
 ENV LANGUAGE pt_BR.UTF-8
 
-ENV APP_DIR=/home/$USERNAME/app
+ENV APP_DIR=/home/$USERNAME/application
 
-EXPOSE 5000
+EXPOSE 8080
 
 USER $USERNAME
 

diff --git a/Aspnet/Ubuntu/Dockerfile-7-Ubuntu-xray b/Aspnet/Ubuntu/Dockerfile-7-Ubuntu-xray
@@ -7,4 +7,4 @@ RUN sh -x /tmp/script-install-xray.sh && rm /tmp/script-install-xray.sh
 
 ENV AWS_XRAY_CONTEXT_MISSING=LOG_ERROR
 
-USER dotnet
+USER $USERNAME
diff --git a/Aspnet/build-base-images.sh b/Aspnet/build-base-images.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #Alpine
-docker build -f ./Alpine/Dockerfile-6-Alpine -t jacksonveroneze/aspnet:6.0-alpine ./Alpine/
+docker build -f ./Alpine/Dockerfile-6-Alpine -t jacksonveroneze/aspnet:7.0-alpine ./Alpine/
 
 #Ubuntu
 docker build -f ./Ubuntu/Dockerfile-7-Ubuntu -t jacksonveroneze/aspnet:7.0-ubuntu ./Ubuntu/
diff --git a/Aspnet/build-xray-images.sh b/Aspnet/build-xray-images.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #Alpine
-docker build -f ./Alpine/Dockerfile-6-Alpine-xray -t jacksonveroneze/aspnet:6.0-alpine-xray ./Alpine/
+docker build -f ./Alpine/Dockerfile-6-Alpine-xray -t jacksonveroneze/aspnet:7.0-alpine-xray ./Alpine/
 
 #Ubuntu
 docker build -f ./Ubuntu/Dockerfile-7-Ubuntu-xray -t jacksonveroneze/aspnet:7.0-ubuntu-xray ./Ubuntu/
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,4 @@ RUN sh -x /tmp/script-install-xray.sh && rm /tmp/script-install-xray.sh

		ENV AWS_XRAY_CONTEXT_MISSING=LOG_ERROR

		USER dotnet
		USER $USERNAME