Skip to content

Commit 308780d

Browse files
EduardoSantanaSeverinoEduardoSantanaSeverino
authored
Merge pull request #1 from EduardoSantanaSeverino/updated-docker-files
Adding new files
2 parents b804552 + 3b96923 commit 308780d

File tree

9 files changed

+152
-2
lines changed

9 files changed

+152
-2
lines changed

‎angular/.dockerignore‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
.env
2+
.git
3+
.gitignore
4+
.vs
5+
.vscode
6+
*/bin
7+
*/obj
8+
*/node_modules
9+
*/dist
10+
*/.git
11+
*/.idea
12+
*/.vs
13+
*/.vscode
14+
**/.toolstarget

‎angular/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
FROM nginx
22

3-
COPY . /usr/share/nginx/html
3+
COPY . /usr/share/nginx/html

‎angular/Dockerfile-updated‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# stage 1
2+
FROM node:14 as node
3+
WORKDIR /app
4+
COPY . .
5+
RUN yarn install
6+
RUN yarn run ng build --configuration production
7+
# stage 2
8+
FROM nginx
9+
COPY --from=node /app/dist /usr/share/nginx/html
10+
COPY fast-nginx-default.conf /etc/nginx/conf.d/default.conf

‎angular/fast-nginx-default.conf‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
server {
2+
listen 80;
3+
sendfile on;
4+
default_type application/octet-stream;
5+
6+
gzip on;
7+
gzip_http_version 1.1;
8+
gzip_disable "MSIE [1-6]\.";
9+
gzip_min_length 256;
10+
gzip_vary on;
11+
gzip_proxied expired no-cache no-store private auth;
12+
gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript;
13+
gzip_comp_level 9;
14+
15+
root /usr/share/nginx/html;
16+
17+
location / {
18+
try_files $uri $uri/ /index.html =404;
19+
}
20+
}

‎angular/src/assets/appconfig.production.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"remoteServiceBaseUrl": "https://localhost:44311",
2+
"remoteServiceBaseUrl": "http://localhost:9902",
33
"appBaseUrl": "http://localhost:4200",
44
"localeMappings": [
55
{

‎aspnet-core/.dockerignore‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
**/.classpath
2+
**/.dockerignore
3+
**/.env
4+
**/.git
5+
**/.gitignore
6+
**/.project
7+
**/.settings
8+
**/.toolstarget
9+
**/.vs
10+
**/.vscode
11+
**/*.*proj.user
12+
**/*.dbmdl
13+
**/*.jfm
14+
**/azds.yaml
15+
**/bin
16+
**/charts
17+
**/docker-compose*
18+
**/Dockerfile*
19+
**/node_modules
20+
**/npm-debug.log
21+
**/obj
22+
**/secrets.dev.yaml
23+
**/values.dev.yaml
24+
LICENSE
25+
README.md

‎aspnet-core/Dockerfile‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
2+
3+
WORKDIR /src
4+
COPY ["src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj", "src/AbpCompanyName.AbpProjectName.Web.Host/"]
5+
COPY ["src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj", "src/AbpCompanyName.AbpProjectName.Web.Core/"]
6+
COPY ["src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj", "src/AbpCompanyName.AbpProjectName.Application/"]
7+
COPY ["src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj", "src/AbpCompanyName.AbpProjectName.Core/"]
8+
COPY ["src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj", "src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/"]
9+
WORKDIR "/src/src/AbpCompanyName.AbpProjectName.Web.Host"
10+
RUN dotnet restore
11+
12+
WORKDIR /src
13+
COPY ["src/AbpCompanyName.AbpProjectName.Web.Host", "src/AbpCompanyName.AbpProjectName.Web.Host"]
14+
COPY ["src/AbpCompanyName.AbpProjectName.Web.Core", "src/AbpCompanyName.AbpProjectName.Web.Core"]
15+
COPY ["src/AbpCompanyName.AbpProjectName.Application", "src/AbpCompanyName.AbpProjectName.Application"]
16+
COPY ["src/AbpCompanyName.AbpProjectName.Core", "src/AbpCompanyName.AbpProjectName.Core"]
17+
COPY ["src/AbpCompanyName.AbpProjectName.EntityFrameworkCore", "src/AbpCompanyName.AbpProjectName.EntityFrameworkCore"]
18+
WORKDIR "/src/src/AbpCompanyName.AbpProjectName.Web.Host"
19+
RUN dotnet publish -c Release -o /publish --no-restore
20+
21+
FROM mcr.microsoft.com/dotnet/aspnet:5.0
22+
EXPOSE 44311
23+
WORKDIR /app
24+
COPY --from=build /publish .
25+
ENTRYPOINT ["dotnet", "AbpCompanyName.AbpProjectName.Web.Host.dll"]

‎aspnet-core/build/build-with-ng-updated.sh‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/bin/bash
2+
sudo echo " Welcome to docker build"
3+
sudo echo ""
4+
sudo echo ""
5+
6+
ABP_HOST="abp/host"
7+
ABP_NG="abp/ng"
8+
9+
cd ..
10+
sudo echo " Building docker image $ABP_HOST..."
11+
sudo docker build -t $ABP_HOST .
12+
sudo echo " Done. -- Building docker image $ABP_HOST..."
13+
sudo echo ""
14+
sudo echo ""
15+
16+
# sudo echo " Pushing docker image $ABP_HOST..."
17+
# sudo docker push $ABP_HOST
18+
# sudo echo " Done. -- Pushing docker image $ABP_HOST..."
19+
# sudo echo ""
20+
# sudo echo ""
21+
22+
cd ..
23+
cd angular/
24+
sudo echo " Building docker image $ABP_NG..."
25+
sudo docker build -t $ABP_NG -f Dockerfile-updated .
26+
sudo echo " Done. -- Building docker image $ABP_NG..."
27+
sudo echo ""
28+
sudo echo ""
29+
30+
# sudo echo " Pushing docker image $ABP_NG..."
31+
# sudo docker push $ABP_NG
32+
# sudo echo " Done. -- Pushing docker image $ABP_NG..."
33+
# sudo echo ""
34+
# sudo echo ""

‎aspnet-core/docker/ng/docker-compose-updated.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
version: '3'
2+
3+
services:
4+
5+
abp_host:
6+
image: abp/host
7+
environment:
8+
ASPNETCORE_ENVIRONMENT: "Staging"
9+
ConnectionStrings__Default: "Server=10.0.75.1; Database=AbpProjectNameDb; User=AbpProjectNameUser; Password=YourStrongPassword;"
10+
App__CorsOrigins: "http://localhost:4200"
11+
Kestrel__EndPoints__Http__Url: "http://*:44311"
12+
TZ: "America/Toronto"
13+
ports:
14+
- "9902:44311"
15+
volumes:
16+
- "./Host-Logs:/app/App_Data/Logs"
17+
restart: always
18+
19+
abp_ng:
20+
image: abp/ng
21+
ports:
22+
- "4200:80"

0 commit comments

Comments
 (0)