Compare commits

..

No commits in common. "5b7fad82a94de997b5d491228998097315bf6229" and "0b1aa05579075f7b55a009c7bb30ad0ef3528bc6" have entirely different histories.

4 changed files with 15 additions and 14 deletions

View File

@ -2,10 +2,10 @@
name: Build and publish container images name: Build and publish container images
on: on:
# - workflow_dispatch - workflow_dispatch
push: # push:
branches: # branches:
- master # - master
jobs: jobs:
build-and-publish: build-and-publish:
@ -47,4 +47,4 @@ jobs:
# linux/arm/v6 # linux/arm/v6
build-args: | build-args: |
DOC_UTILS_VERSION=0.2 DOC_UTILS_VERSION=0.2
NGINX_VERSION=1.25-alpine-slim NGINX_VERSION=1.25

View File

@ -38,4 +38,4 @@ jobs:
# linux/arm/v6 # linux/arm/v6
build-args: | build-args: |
DOC_UTILS_VERSION=0.2 DOC_UTILS_VERSION=0.2
NGINX_VERSION=1.25-alpine-slim NGINX_VERSION=1.25

View File

@ -2,10 +2,10 @@
name: Deploy latest to staging environment name: Deploy latest to staging environment
on: on:
- workflow_dispatch # - workflow_dispatch
# push: push:
# branches: branches:
# - master - master
jobs: jobs:
tag-image: tag-image:

View File

@ -16,9 +16,10 @@ FROM nginx:${NGINX_VERSION} AS deploy_stage
EXPOSE 80 EXPOSE 80
# copy actual web content built above # copy actual web content built above
COPY --from=build_stage --chown=nginx:nginx /workspace/www/ /usr/share/nginx/html COPY --from=build_stage /workspace/www/ /usr/share/nginx/html
RUN chmod -R +rX /usr/share/nginx/html
# nginx config files # nginx config files
COPY --chown=nginx:nginx conf/nginx.conf /etc/nginx/nginx.conf COPY conf/nginx.conf /etc/nginx/nginx.conf
COPY --chown=nginx:nginx conf/default.conf /etc/nginx/conf.d/default.conf COPY conf/default.conf /etc/nginx/conf.d/default.conf
COPY --chown=nginx:nginx conf/mime.types /etc/nginx/mime.types COPY conf/mime.types /etc/nginx/mime.types