Compare commits
58
Commits
be9c7e6d17
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0ea9865a72 | ||
|
|
a76475d2af | ||
|
|
cff967fdcf | ||
|
|
7528729715 | ||
|
|
5793288461 | ||
|
|
d65e0edc98 | ||
|
|
85613860c2 | ||
|
|
283852c438 | ||
|
|
b8b30a4fbe | ||
|
|
b8c7b0c6f7 | ||
|
|
2673630916 | ||
|
|
08f13af663 | ||
|
|
2f97b78392 | ||
|
|
06cf832eb1 | ||
|
|
18179c8de0 | ||
|
|
f3dcf73cf9 | ||
|
|
beddce6a07 | ||
|
|
f731d9146d | ||
|
|
7a7277f853 | ||
|
|
47be78df48 | ||
|
|
d6726b3099 | ||
|
|
1aaee5f575 | ||
|
|
c05452778b | ||
|
|
c7a93be4f2 | ||
|
|
be315b52d7 | ||
|
|
fa185f65c2 | ||
|
|
d4e3ab3a0b | ||
|
|
547aad899f | ||
|
|
65b155e26d | ||
|
|
d5eb9a7c04 | ||
|
|
01e99528ba | ||
|
|
5967e2d041 | ||
|
|
226b08aa53 | ||
|
|
c0b39580d9 | ||
|
|
2739744529 | ||
|
|
8eb0e3189d | ||
|
|
362bfa4996 | ||
|
|
2684a3d53d | ||
|
|
33b877b42e | ||
|
|
cf7c040dee | ||
|
|
c83b1c62f8 | ||
|
|
50551bec95 | ||
|
|
96e6a8ca02 | ||
|
|
f112b392fa | ||
|
|
9d122bac28 | ||
|
|
7bb0b34fbb | ||
|
|
9cb5a3e7a6 | ||
|
|
ec15e59428 | ||
|
|
e8d3b999d6 | ||
|
|
eb518de902 | ||
|
|
39246e5e6f | ||
|
|
4a386f3d49 | ||
|
|
2d4800c314 | ||
|
|
82e1619ec3 | ||
|
|
9268190f03 | ||
|
|
20e96e4cee | ||
|
|
e5a0a1d183
|
||
|
|
58c510e88e |
No files matched your search
@@ -13,21 +13,35 @@ jobs:
|
|||||||
BUILDTOOLS_CONTENT: ${{ secrets.BUILDTOOLS_CONTENT }}
|
BUILDTOOLS_CONTENT: ${{ secrets.BUILDTOOLS_CONTENT }}
|
||||||
GITEA_REPOSITORY: ${{ gitea.repository }}
|
GITEA_REPOSITORY: ${{ gitea.repository }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v7
|
||||||
- uses: buildtool/setup-buildtools-action@v1
|
- uses: buildtool/setup-buildtools-action@v1
|
||||||
- name: Build and push
|
- name: Build and push
|
||||||
run: unset GITEA_TOKEN && build && push
|
run: unset GITEA_TOKEN && build && push
|
||||||
|
|
||||||
deploy-prod:
|
deploy-prod-frostmoln:
|
||||||
needs: build
|
needs: build
|
||||||
if: gitea.ref == 'refs/heads/main'
|
if: gitea.ref == 'refs/heads/main'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
env:
|
env:
|
||||||
BUILDTOOLS_CONTENT: ${{ secrets.BUILDTOOLS_CONTENT }}
|
BUILDTOOLS_CONTENT: ${{ secrets.BUILDTOOLS_FROSTMOLN_PRODUCTION }}
|
||||||
GITEA_REPOSITORY: ${{ gitea.repository }}
|
GITEA_REPOSITORY: ${{ gitea.repository }}
|
||||||
|
FM_TENANT: 9ae61342-0f76-476f-8176-e46f6b0b0c32
|
||||||
environment: prod
|
environment: prod
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v7
|
||||||
- uses: buildtool/setup-buildtools-action@v1
|
- uses: buildtool/setup-buildtools-action@v1
|
||||||
- name: Deploy to production
|
- name: Install fm
|
||||||
run: deploy prod
|
run: |
|
||||||
|
sudo install -d -m 0755 /etc/apt/keyrings
|
||||||
|
sudo curl -fsSL -o /etc/apt/keyrings/frostmoln.gpg https://get.frostmoln.cloud/deb/frostmoln.gpg
|
||||||
|
sudo curl -fsSL -o /etc/apt/sources.list.d/frostmoln.sources https://get.frostmoln.cloud/deb/frostmoln.sources
|
||||||
|
sudo apt-get update && sudo apt-get install -y fm
|
||||||
|
- name: Deploy to Frostmoln production
|
||||||
|
env:
|
||||||
|
FROSTMOLN_API_KEY: ${{ secrets.FROSTMOLN_PRODUCTION_DEPLOY_KEY }}
|
||||||
|
# The cluster API is private: the kubeconfig's exec plugin opens an fm
|
||||||
|
# tunnel on demand. fm reads the key from its config file, not the env.
|
||||||
|
run: |
|
||||||
|
fm auth api-key set "$FROSTMOLN_API_KEY" > /dev/null
|
||||||
|
fm kubernetes cluster kubeconfig ${{ vars.FROSTMOLN_PRODUCTION_CLUSTER_ID }} --exec --file "$RUNNER_TEMP/kubeconfig"
|
||||||
|
KUBECONFIG_CONTENT="$(cat "$RUNNER_TEMP/kubeconfig")" deploy prod-frostmoln -n sites
|
||||||
+3
-2
@@ -1,4 +1,4 @@
|
|||||||
FROM amd64/nginx:1.29.5-alpine@sha256:251df7d28ed7958c0e810b3c4cc380d0382336fcc34e361bfb60fb73b2ec19dc as build
|
FROM amd64/nginx:1.31.8-alpine@sha256:74fe162437217d0f87b296bd786ff2c9bbe77e1edc15421da420ffa31a5016f1 as build
|
||||||
|
|
||||||
RUN apk add --update \
|
RUN apk add --update \
|
||||||
wget
|
wget
|
||||||
@@ -13,7 +13,8 @@ COPY ./ /site
|
|||||||
WORKDIR /site
|
WORKDIR /site
|
||||||
RUN hugo
|
RUN hugo
|
||||||
|
|
||||||
FROM amd64/nginx:1.29.5-alpine@sha256:251df7d28ed7958c0e810b3c4cc380d0382336fcc34e361bfb60fb73b2ec19dc
|
# Unprivileged (uid 101, port 8080): Frostmoln enforces restricted Pod Security.
|
||||||
|
FROM nginxinc/nginx-unprivileged:1.31.7-alpine@sha256:b5047b9b76845eac124358373c6852377c52e4b05834a47647e955dd91cb8f1e
|
||||||
ADD default.conf /etc/nginx/conf.d/default.conf
|
ADD default.conf /etc/nginx/conf.d/default.conf
|
||||||
COPY --from=build /site/public /usr/share/nginx/html
|
COPY --from=build /site/public /usr/share/nginx/html
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
server {
|
server {
|
||||||
listen 80;
|
listen 8080;
|
||||||
server_name localhost;
|
server_name localhost;
|
||||||
|
|
||||||
access_log /dev/stdout combined;
|
access_log /dev/stdout combined;
|
||||||
|
|||||||
+13
-6
@@ -22,6 +22,11 @@ spec:
|
|||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: unbound-site
|
app.kubernetes.io/name: unbound-site
|
||||||
spec:
|
spec:
|
||||||
|
securityContext:
|
||||||
|
runAsNonRoot: true
|
||||||
|
runAsUser: 101
|
||||||
|
seccompProfile:
|
||||||
|
type: RuntimeDefault
|
||||||
affinity:
|
affinity:
|
||||||
podAntiAffinity:
|
podAntiAffinity:
|
||||||
preferredDuringSchedulingIgnoredDuringExecution:
|
preferredDuringSchedulingIgnoredDuringExecution:
|
||||||
@@ -39,20 +44,23 @@ spec:
|
|||||||
readinessProbe:
|
readinessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /health
|
path: /health
|
||||||
port: 80
|
port: 8080
|
||||||
initialDelaySeconds: 5
|
initialDelaySeconds: 5
|
||||||
periodSeconds: 5
|
periodSeconds: 5
|
||||||
timeoutSeconds: 5
|
timeoutSeconds: 5
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
image: oci.unbound.se/unboundsoftware/unbound-site:${COMMIT}
|
image: ${IMAGE}
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 8080
|
||||||
|
securityContext:
|
||||||
|
allowPrivilegeEscalation: false
|
||||||
|
capabilities:
|
||||||
|
drop: ["ALL"]
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: 5m
|
cpu: 5m
|
||||||
memory: 5Mi
|
memory: 5Mi
|
||||||
limits:
|
limits:
|
||||||
cpu: 300m
|
|
||||||
memory: 300Mi
|
memory: 300Mi
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -64,9 +72,8 @@ metadata:
|
|||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: unbound-site
|
app.kubernetes.io/name: unbound-site
|
||||||
spec:
|
spec:
|
||||||
type: NodePort
|
|
||||||
selector:
|
selector:
|
||||||
app.kubernetes.io/name: unbound-site
|
app.kubernetes.io/name: unbound-site
|
||||||
ports:
|
ports:
|
||||||
- port: 80
|
- port: 80
|
||||||
targetPort: 80
|
targetPort: 8080
|
||||||
@@ -1,15 +1,12 @@
|
|||||||
apiVersion: networking.k8s.io/v1
|
apiVersion: networking.k8s.io/v1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
metadata:
|
metadata:
|
||||||
name: unbound-site-ingress
|
name: unbound-site
|
||||||
annotations:
|
annotations:
|
||||||
kubernetes.io/ingress.class: "alb"
|
traefik.ingress.kubernetes.io/router.entrypoints: websecure
|
||||||
alb.ingress.kubernetes.io/group.name: default
|
traefik.ingress.kubernetes.io/router.tls.certresolver: letsencrypt
|
||||||
alb.ingress.kubernetes.io/scheme: internet-facing
|
|
||||||
alb.ingress.kubernetes.io/target-type: instance
|
|
||||||
alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80},{"HTTPS": 443}]'
|
|
||||||
alb.ingress.kubernetes.io/ssl-redirect: "443"
|
|
||||||
spec:
|
spec:
|
||||||
|
ingressClassName: traefik
|
||||||
rules:
|
rules:
|
||||||
- host: "unbound.se"
|
- host: "unbound.se"
|
||||||
http:
|
http:
|
||||||
@@ -2,7 +2,7 @@ version: 2.1
|
|||||||
jobs:
|
jobs:
|
||||||
build-check:
|
build-check:
|
||||||
docker:
|
docker:
|
||||||
- image: cibuilds/hugo:0.156@sha256:729fd6dcc7ba3aee517e058baac2fd54a02e4143dbc176e2d2a324f6c5a29a9f
|
- image: cibuilds/hugo:0.168@sha256:4aed25bd442a26734b2af49a05a182fa63ee31324ccc2bf196dfe4709a048550
|
||||||
working_directory: ~/LoveIt
|
working_directory: ~/LoveIt
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
|
|||||||
Generated
+741
-913
File diff suppressed because it is too large.
Load diff
@@ -5,13 +5,13 @@
|
|||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {},
|
"dependencies": {},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/cli": "7.28.6",
|
"@babel/cli": "8.0.6",
|
||||||
"@babel/core": "7.29.0",
|
"@babel/core": "8.0.9",
|
||||||
"@babel/preset-env": "7.29.0",
|
"@babel/preset-env": "8.0.7",
|
||||||
"babel-preset-minify": "0.5.2",
|
"babel-preset-minify": "0.5.2",
|
||||||
"babelify": "10.0.0",
|
"babelify": "10.0.0",
|
||||||
"browserify": "17.0.1",
|
"browserify": "17.0.1",
|
||||||
"core-js": "3.48.0",
|
"core-js": "3.51.0",
|
||||||
"husky": "9.1.7",
|
"husky": "9.1.7",
|
||||||
"minimist": "1.2.8",
|
"minimist": "1.2.8",
|
||||||
"segmentit": "2.0.3"
|
"segmentit": "2.0.3"
|
||||||
|
|||||||
Reference in new issue
Block a user