slight modifications/dusting off
This commit is contained in:
14
Dockerfile
14
Dockerfile
@@ -1,13 +1,13 @@
|
|||||||
FROM alpine:latest as build_stage
|
FROM alpine:latest AS build_stage
|
||||||
WORKDIR /opt
|
WORKDIR /opt
|
||||||
RUN apk add git hugo
|
RUN apk add git hugo
|
||||||
# Adding this so the repo isn't cached
|
ADD hugo-content /opt/hugo-content
|
||||||
ADD https://api.github.com/repos/scottyah/scottyah-blog/git/refs/heads/main version.json
|
WORKDIR /opt/hugo-content
|
||||||
RUN git clone https://github.com/scottyah/scottyah-blog.git
|
|
||||||
WORKDIR /opt/scottyah-blog/hugo-content
|
|
||||||
RUN hugo
|
RUN hugo
|
||||||
|
ENTRYPOINT ["/bin/ash"]
|
||||||
|
|
||||||
FROM nginx:latest as server_stage
|
|
||||||
COPY --from=build_stage /opt/scottyah-blog/hugo-content/public/ /usr/share/nginx/html
|
FROM nginx:latest AS server_stage
|
||||||
|
COPY --from=build_stage /opt/hugo-content/public/ /usr/share/nginx/html
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
CMD ["nginx", "-g", "daemon off;"]
|
CMD ["nginx", "-g", "daemon off;"]
|
||||||
@@ -52,7 +52,7 @@ weight = 5
|
|||||||
|
|
||||||
colortheme = "white" # dark, light, white, or classic
|
colortheme = "white" # dark, light, white, or classic
|
||||||
rss = true # generate rss feed. default value is false
|
rss = true # generate rss feed. default value is false
|
||||||
googleAnalyticsAsync = true # use asynchronous tracking. Synchronous tracking by default
|
googleAnalyticsAsync = false # use asynchronous tracking. Synchronous tracking by default
|
||||||
showAllPostsArchive = false
|
showAllPostsArchive = false
|
||||||
|
|
||||||
# Home page settings
|
# Home page settings
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
|||||||
|
{"Target":"css/styles.94f653e9e151e28067a7c5dbbc4600cbd5a3c721e79faaf971e523c40f3b249b8e4f20bb57810dfffa8d559ca5c140fd56eb4cd9c0853113ad08e66afdb08bdd.css","MediaType":"text/css","Data":{"Integrity":"sha512-lPZT6eFR4oBnp8XbvEYAy9WjxyHnn6r5ceUjxA87JJuOTyC7V4EN//qNVZylwUD9VutM2cCFMROtCOZq/bCL3Q=="}}
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
{{ $colortheme := .Scratch.Get "colortheme" }}
|
{{ $colortheme := .Scratch.Get "colortheme" }}
|
||||||
|
|
||||||
{{- $options := (dict "targetPath" "css/styles.css" "outputStyle" "compressed" "enableSourceMap" "true") -}}
|
{{- $options := (dict "targetPath" "css/styles.css" "outputStyle" "compressed" "enableSourceMap" "true") -}}
|
||||||
{{- $styles := resources.Get "scss/style.scss" | resources.ExecuteAsTemplate "scss/style.scss" . | resources.ToCSS $options | resources.Fingerprint "sha512" }}
|
{{- $styles := resources.Get "scss/style.scss" | resources.ExecuteAsTemplate "scss/style.scss" . | css.Sass $options | resources.Fingerprint "sha512" }}
|
||||||
<link rel="stylesheet" href="{{ $styles.Permalink }}" integrity="{{ $styles.Data.Integrity }}">
|
<link rel="stylesheet" href="{{ $styles.Permalink }}" integrity="{{ $styles.Data.Integrity }}">
|
||||||
|
|
||||||
<!-- Custom CSS -->
|
<!-- Custom CSS -->
|
||||||
@@ -40,11 +40,4 @@
|
|||||||
{{ printf `<link href="%s" rel="%s" type="%s" title="%s" />` .Permalink .Rel .MediaType.Type $.Site.Title | safeHTML }}
|
{{ printf `<link href="%s" rel="%s" type="%s" title="%s" />` .Permalink .Rel .MediaType.Type $.Site.Title | safeHTML }}
|
||||||
{{ end }}
|
{{ end }}
|
||||||
{{ end }}
|
{{ end }}
|
||||||
{{ if .Site.GoogleAnalytics }}
|
|
||||||
{{ if .Site.Params.googleAnalyticsAsync }}
|
|
||||||
{{ template "_internal/google_analytics_async.html" . }}
|
|
||||||
{{ else }}
|
|
||||||
{{ template "_internal/google_analytics.html" . }}
|
|
||||||
{{ end }}
|
|
||||||
{{ end }}
|
|
||||||
</head>
|
</head>
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
cd ..
|
cd ..
|
||||||
git pull
|
|
||||||
docker build -t scottyah/blog:latest .
|
docker build -t scottyah/blog:latest .
|
||||||
docker push scottyah/blog:latest
|
docker push scottyah/blog:latest
|
||||||
sudo kubectl rollout restart deployment blog-dep
|
kubectl rollout restart deployment blog-dep -n blog
|
||||||
Reference in New Issue
Block a user