Skip to content

Commit f58dd81

Browse files
Remove space
1 parent 23e75dc commit f58dd81

File tree

7 files changed

+17
-14
lines changed

7 files changed

+17
-14
lines changed

angular/Dockerfile

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
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
81
FROM nginx
9-
COPY --from=node /app/dist /usr/share/nginx/html
10-
COPY fast-nginx-default.conf /etc/nginx/conf.d/default.conf
2+
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ server {
1717
location / {
1818
try_files $uri $uri/ /index.html =404;
1919
}
20-
}
20+
}

aspnet-core/.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
**/secrets.dev.yaml
2323
**/values.dev.yaml
2424
LICENSE
25-
README.md
25+
README.md

aspnet-core/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ FROM mcr.microsoft.com/dotnet/aspnet:5.0
2222
EXPOSE 44311
2323
WORKDIR /app
2424
COPY --from=build /publish .
25-
ENTRYPOINT ["dotnet", "AbpCompanyName.AbpProjectName.Web.Host.dll"]
25+
ENTRYPOINT ["dotnet", "AbpCompanyName.AbpProjectName.Web.Host.dll"]

aspnet-core/build/build-with-ng.sh renamed to aspnet-core/build/build-with-ng-updated.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ sudo echo ""
2222
cd ..
2323
cd angular/
2424
sudo echo " Building docker image $ABP_NG..."
25-
sudo docker build -t $ABP_NG .
25+
sudo docker build -t $ABP_NG -f Dockerfile-updated .
2626
sudo echo " Done. -- Building docker image $ABP_NG..."
2727
sudo echo ""
2828
sudo echo ""

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ services:
1919
abp_ng:
2020
image: abp/ng
2121
ports:
22-
- "4200:80"
22+
- "4200:80"

0 commit comments

Comments
 (0)