Merge branch 'master' into 'develop'

# Conflicts:
#   Dockerfile

Dockerfile

@@ -8,24 +8,15 @@ RUN npm update
 COPY . .
 COPY src/assets/index.template.html src/index.html
 #RUN npm run build --prod
-RUN ./node_modules/.bin/ng build --prod --base-href /pretoxtm.kh.svc/
-
+RUN ./node_modules/.bin/ng build --prod --base-href /pretox/
 ### STAGE 2: Run ###
-FROM nginx:1.21.6-alpine
+FROM nginx:1.17.1-alpine
 #fix refresh 
 #https://makinhs.medium.com/for-some-folks-who-will-get-in-trouble-with-refresh-the-angular-page-and-get-a-404-2cf394b5dac6
 RUN rm -rf /usr/share/nginx/html/* && rm -rf /etc/nginx/nginx.conf
 COPY ./nginx.conf /etc/nginx/nginx.conf
 
-COPY --from=build /usr/src/app/dist/my-app /usr/share/nginx/html
-
-COPY src/manage /usr/share/nginx/html/manage
-RUN apk add util-linux
-RUN cp /usr/share/nginx/html/manage/v1/api.template /usr/share/nginx/html/manage/v1/api
-RUN sed -i "s/{RELEASE_DATE}/$(date +%F)/g" /usr/share/nginx/html/manage/v1/api 
-RUN sed  -i "s/{APP_VERSION}/2.0/g" /usr/share/nginx/html/manage/v1/api
-RUN sed  -i "s/{UUID}/$(uuidgen)/g" /usr/share/nginx/html/manage/v1/api
-RUN rm /usr/share/nginx/html/manage/v1/api.template
+COPY --from=build /usr/src/app/dist/my-app /usr/share/nginx/html/pretox
 
 
 CMD ["/bin/sh",  "-c",  "envsubst < /usr/share/nginx/html/assets/env.template.js > /usr/share/nginx/html/assets/env.js && envsubst < /usr/share/nginx/html/index.html > /usr/share/nginx/html/index.html_2 && cp /usr/share/nginx/html/index.html_2 /usr/share/nginx/html/index.html && exec nginx-debug -g 'daemon off;'"]

[Ghost User]

Writing_Persuasive_Essay_3.pdf