From eb66bb46a7fda0dac142b124ac1c5c3296deb28e Mon Sep 17 00:00:00 2001 From: Elias Kohout Date: Fri, 14 Mar 2025 17:47:32 +0100 Subject: [PATCH] add .gitignore, remove .DS_Store, change to busybox webserver --- .gitignore | 1 + Dockerfile | 20 +++++----- hugo/.DS_Store | Bin 6148 -> 0 bytes .hugo_build.lock => hugo/.hugo_build.lock | 0 hugo/assets/.DS_Store | Bin 6148 -> 0 bytes hugo/layouts/.DS_Store | Bin 6148 -> 0 bytes hugo/static/.DS_Store | Bin 6148 -> 0 bytes nginx/nginx.conf | 43 ---------------------- 8 files changed, 11 insertions(+), 53 deletions(-) create mode 100644 .gitignore delete mode 100644 hugo/.DS_Store rename .hugo_build.lock => hugo/.hugo_build.lock (100%) delete mode 100644 hugo/assets/.DS_Store delete mode 100644 hugo/layouts/.DS_Store delete mode 100644 hugo/static/.DS_Store delete mode 100644 nginx/nginx.conf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e43b0f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store diff --git a/Dockerfile b/Dockerfile index 7519f47..bbdbbd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ # Compile the hugo site -FROM ubuntu:latest AS builder - -RUN apt-get update && apt-get install -y hugo - -COPY ./hugo /app -RUN hugo -s /app +FROM klakegg/hugo:ext-alpine AS builder +WORKDIR /app +COPY ./hugo . +RUN hugo --minify --destination /output # Setup deployment -FROM nginx:alpine AS final - -COPY ./nginx/nginx.conf /etc/nginx/nginx.conf -COPY --from=0 /var/www/rezepte /var/www +FROM alpine:latest +WORKDIR /www +COPY --from=builder /output /www +RUN apk add --no-cache busybox-extras +EXPOSE 80 +CMD ["httpd", "-f", "-p", "80", "-h", "/www"] diff --git a/hugo/.DS_Store b/hugo/.DS_Store deleted file mode 100644 index 51821cc01605e17566a0845d6166fa0ef2b64a26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHLF;2rU6#a&(RPEBS1A<7Lps4Jj3XCk}0MIs~NDZlII&{m#0s}LbfeBV7HZIUp z@V;$QJHZkYs*rzWzr=pFUtSacrbHzAi*c8zO+*b8##$5A55fIhDzT+oIzS=kh$*8b z%_ydMh3y->1Kxp6bAX@SCSB4kjc9`Bws?N0SKYxVO=eo~%Ee34C>l=FA^IE7hrQ0~ z?)BKs9sim;o0#kK{zP@?oa4hP=eEAnr*glk>*Ku8WzCVKYdtQGtwY+e1FurLfr^-G zTgm z<2%ZrD5Gl{S?;v;p&Wurr(=1* fshIy)kb%B{4}hV@Tp?Nz{)d3H!B^gaKXu>>c)rrv diff --git a/.hugo_build.lock b/hugo/.hugo_build.lock similarity index 100% rename from .hugo_build.lock rename to hugo/.hugo_build.lock diff --git a/hugo/assets/.DS_Store b/hugo/assets/.DS_Store deleted file mode 100644 index ab2278669b6f8ce8ac7315fb880c123b0ffdd157..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKu}%Xq47INvPGafUF(1HEi4O?vv9aC4z<}CHAk@=Us@OB}X?zS{!LyyVcO_y( z2-#Bd96OHh-s$3mhHL+|zn@BU@DYD5@S^m>`CS{?1fT#pZ@TpH8$ z=S-KraUS`eF3x~6;0!ne&Ong?)NGOZ%Fugfz!`7`P7KKY5YPl;#$>2l2Rgk10H-jk zK-aS;Fo*#dGbTe=AZ(#P3*~&pU<-#m>3XAgMbp^oip$Y4156%**uc~ diff --git a/hugo/layouts/.DS_Store b/hugo/layouts/.DS_Store deleted file mode 100644 index 4594a11582d0cae6ea1c428dc87829fba0013bea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOHRWu5FM8wmCvGL)n!(d*b#{Xm@06A9spbjm@YPvS|%JNFrSG=aK6V|m)OG+qr%4R_J zZbRE{vW-{Qckx#0>)f-h@jGr)r)8ZQ>VP_+4s3G(XEsOwKu~*iKpjvAN(cD+5TY?! zkA z6yxrW{X<75V+FNW2h@S413Pj#;Pd}{d;Q-`(kpd99r#xcm>{0SV?2^STU!suXKjdf qg~q|WLavy#P diff --git a/hugo/static/.DS_Store b/hugo/static/.DS_Store deleted file mode 100644 index 7c294e95ae27399e27b333382ffe587bda90bc08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5Iwu5S_t6u|$(H<(>d31^p746XXI>h)9rP9En7tbj3k92^D9cq~;X7*%^{7 zu|$Uu%t*U$c0N1ylf3I8A|7w&BccHjl^B97N{5KK({*CO;^ef){c16qTsQT)W1HV; zl4n1q8*1o|Hk3bq|Gdh*byHQdRWpONjMIzZ`{T>y*NFKy5$ojvL;Yu@Q$e>>(<0-p zczxJ=4(mQGcXchVZuT{gy;;5DP3pNg1I~am;0*k425@JKlxK=QI|I&uGq7Vo&WC^@ z7!6y+baY@!Eda0wa}wy%OGr*IjE1cuJP_7Ypr*357_8~A2aAh_t)iwATl2wI`LlW9 zR2}<=6iyr!eRc+%ft-Otmjk)~ukguqHu-squbcsA;EyrDy=qd8@ltlT9=)F2wE<&_ sAtG_DC=lq`PXHEjjtrAi{XulZMZ;E6b`g6@2l|gdBE%