From c162ea8d214d2d101944f8542392d06be36cd4ef Mon Sep 17 00:00:00 2001 From: Nathan Woodburn Date: Fri, 22 Dec 2023 17:46:45 +1100 Subject: [PATCH] fix: action to use new dir --- .gitea/workflows/build.yml | 3 +++ Dockerfile | 4 ---- website/Dockerfile | 4 ++++ 3 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 Dockerfile create mode 100644 website/Dockerfile diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 5d9cac6..6be6b03 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -29,6 +29,9 @@ jobs: else tag_num="${tag}-${tag_num}" fi + + cd website + echo "version: ${GITHUB_RUN_NUMBER}" > content/version.txt docker build -t hns_doh:$tag_num . docker tag hns_doh:$tag_num git.woodburn.au/nathanwoodburn/hns_doh:$tag_num diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 83e8441..0000000 --- a/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM nginx -RUN rm /etc/nginx/conf.d/default.conf -COPY website/nginx.conf /etc/nginx/conf.d/default.conf -COPY website/content /var/www/html \ No newline at end of file diff --git a/website/Dockerfile b/website/Dockerfile new file mode 100644 index 0000000..c5b22d1 --- /dev/null +++ b/website/Dockerfile @@ -0,0 +1,4 @@ +FROM nginx +RUN rm /etc/nginx/conf.d/default.conf +COPY nginx.conf /etc/nginx/conf.d/default.conf +COPY content /var/www/html \ No newline at end of file