diff --git a/.gitea/workflows/build-image.yml b/.gitea/workflows/build-image.yml index 657e11a..e5d99cd 100644 --- a/.gitea/workflows/build-image.yml +++ b/.gitea/workflows/build-image.yml @@ -26,6 +26,10 @@ jobs: ng build - name: Build docker image run: | + set +e + docker rm $(docker stop $(docker ps -a -q --filter ancestor=accounting-frontend:latest --format="{{.ID}}")) + set -e + docker image rm -f accounting-frontend:latest docker build . -t accounting-frontend:latest \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 0745e9e..635ae02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,10 @@ FROM nginx:alpine -ADD nginx.conf /etc/nginx/nginx.conf +RUN rm /etc/nginx/conf.d/default.conf + +COPY nginx.conf /etc/nginx/conf.d/default.conf + ADD accounting-ng-nuttakit/dist/accounting-ng-nuttakit/browser /usr/share/nginx/html + +EXPOSE 80 +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file