Compare commits
1
Commits
main
..
8bcbbca357
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8bcbbca357 |
No files matched your search
@@ -18,30 +18,16 @@ jobs:
|
|||||||
- name: Build and push
|
- name: Build and push
|
||||||
run: unset GITEA_TOKEN && build && push
|
run: unset GITEA_TOKEN && build && push
|
||||||
|
|
||||||
deploy-prod-frostmoln:
|
deploy-prod:
|
||||||
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_FROSTMOLN_PRODUCTION }}
|
BUILDTOOLS_CONTENT: ${{ secrets.BUILDTOOLS_CONTENT }}
|
||||||
GITEA_REPOSITORY: ${{ gitea.repository }}
|
GITEA_REPOSITORY: ${{ gitea.repository }}
|
||||||
FM_TENANT: 9ae61342-0f76-476f-8176-e46f6b0b0c32
|
|
||||||
environment: prod
|
environment: prod
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v7
|
- uses: actions/checkout@v7
|
||||||
- uses: buildtool/setup-buildtools-action@v1
|
- uses: buildtool/setup-buildtools-action@v1
|
||||||
- name: Install fm
|
- name: Deploy
|
||||||
run: |
|
run: deploy prod
|
||||||
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 dancefinder
|
|
||||||
+1
-1
@@ -12,7 +12,7 @@ COPY . /build
|
|||||||
RUN npm run postinstall && npm run generate && npm run lint
|
RUN npm run postinstall && npm run generate && npm run lint
|
||||||
#RUN yarn start:ci & yarn wait && yarn test:cypress
|
#RUN yarn start:ci & yarn wait && yarn test:cypress
|
||||||
|
|
||||||
FROM nginxinc/nginx-unprivileged:1.31.7@sha256:94193d5c4c5df716f412bb08eb97956d98fe6b59886f0bc57d6d3a3402a88a02
|
FROM amd64/nginx:1.31.3@sha256:1f1cd3af9bef5157e6f3956669aa67b4699ee21e7c6f4d7e749b86a01647ad96
|
||||||
MAINTAINER Joakim Olsson <joakim@unbound.se>
|
MAINTAINER Joakim Olsson <joakim@unbound.se>
|
||||||
|
|
||||||
COPY --from=builder /build/.output/public/ /usr/share/nginx/html/
|
COPY --from=builder /build/.output/public/ /usr/share/nginx/html/
|
||||||
|
|||||||
File renamed without changes.
+5
-15
@@ -22,13 +22,6 @@ spec:
|
|||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: dancefinder-app
|
app.kubernetes.io/name: dancefinder-app
|
||||||
spec:
|
spec:
|
||||||
imagePullSecrets:
|
|
||||||
- name: oci-registry
|
|
||||||
securityContext:
|
|
||||||
runAsNonRoot: true
|
|
||||||
runAsUser: 101
|
|
||||||
seccompProfile:
|
|
||||||
type: RuntimeDefault
|
|
||||||
affinity:
|
affinity:
|
||||||
podAntiAffinity:
|
podAntiAffinity:
|
||||||
preferredDuringSchedulingIgnoredDuringExecution:
|
preferredDuringSchedulingIgnoredDuringExecution:
|
||||||
@@ -43,21 +36,17 @@ spec:
|
|||||||
topologyKey: kubernetes.io/hostname
|
topologyKey: kubernetes.io/hostname
|
||||||
containers:
|
containers:
|
||||||
- name: dancefinder-app
|
- name: dancefinder-app
|
||||||
securityContext:
|
|
||||||
allowPrivilegeEscalation: false
|
|
||||||
capabilities:
|
|
||||||
drop: ["ALL"]
|
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /health
|
path: /health
|
||||||
port: 8080
|
port: 80
|
||||||
initialDelaySeconds: 5
|
initialDelaySeconds: 5
|
||||||
periodSeconds: 5
|
periodSeconds: 5
|
||||||
timeoutSeconds: 5
|
timeoutSeconds: 5
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
image: ${IMAGE}
|
image: oci.unbound.se/dancefinder/dancefinder-app:${COMMIT}
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8080
|
- containerPort: 80
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: 10m
|
cpu: 10m
|
||||||
@@ -75,8 +64,9 @@ metadata:
|
|||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: dancefinder-app
|
app.kubernetes.io/name: dancefinder-app
|
||||||
spec:
|
spec:
|
||||||
|
type: NodePort
|
||||||
selector:
|
selector:
|
||||||
app.kubernetes.io/name: dancefinder-app
|
app.kubernetes.io/name: dancefinder-app
|
||||||
ports:
|
ports:
|
||||||
- port: 80
|
- port: 80
|
||||||
targetPort: 8080
|
targetPort: 80
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
apiVersion: networking.k8s.io/v1
|
|
||||||
kind: Ingress
|
|
||||||
metadata:
|
|
||||||
name: dancefinder-app
|
|
||||||
annotations:
|
|
||||||
traefik.ingress.kubernetes.io/router.entrypoints: websecure
|
|
||||||
traefik.ingress.kubernetes.io/router.tls.certresolver: letsencrypt
|
|
||||||
spec:
|
|
||||||
ingressClassName: traefik
|
|
||||||
rules:
|
|
||||||
- host: "dancefinder.unbound.se"
|
|
||||||
http:
|
|
||||||
paths:
|
|
||||||
- path: /
|
|
||||||
pathType: Prefix
|
|
||||||
backend:
|
|
||||||
service:
|
|
||||||
name: dancefinder-app
|
|
||||||
port:
|
|
||||||
number: 80
|
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
apiVersion: networking.k8s.io/v1
|
||||||
|
kind: Ingress
|
||||||
|
metadata:
|
||||||
|
name: dancefinder-app-ingress
|
||||||
|
annotations:
|
||||||
|
alb.ingress.kubernetes.io/group.name: "default"
|
||||||
|
alb.ingress.kubernetes.io/group.order: "101"
|
||||||
|
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"
|
||||||
|
alb.ingress.kubernetes.io/healthcheck-path: "/health"
|
||||||
|
alb.ingress.kubernetes.io/healthcheck-interval-seconds: "30"
|
||||||
|
alb.ingress.kubernetes.io/healthcheck-timeout-seconds: "5"
|
||||||
|
alb.ingress.kubernetes.io/healthy-threshold-count: "2"
|
||||||
|
alb.ingress.kubernetes.io/unhealthy-threshold-count: "2"
|
||||||
|
spec:
|
||||||
|
ingressClassName: "alb"
|
||||||
|
rules:
|
||||||
|
- host: "dancefinder.unbound.se"
|
||||||
|
http:
|
||||||
|
paths:
|
||||||
|
- path: /*
|
||||||
|
pathType: ImplementationSpecific
|
||||||
|
backend:
|
||||||
|
service:
|
||||||
|
name: dancefinder-app
|
||||||
|
port:
|
||||||
|
number: 80
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
apiVersion: policy/v1
|
|
||||||
kind: PodDisruptionBudget
|
|
||||||
metadata:
|
|
||||||
name: dancefinder-app
|
|
||||||
spec:
|
|
||||||
minAvailable: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app.kubernetes.io/name: dancefinder-app
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
server {
|
server {
|
||||||
listen 8080;
|
listen 80;
|
||||||
server_name localhost;
|
server_name localhost;
|
||||||
sendfile off;
|
sendfile off;
|
||||||
charset utf-8;
|
charset utf-8;
|
||||||
|
|||||||
Generated
+4609
-4048
File diff suppressed because it is too large.
Load diff
+26
-26
@@ -16,48 +16,48 @@
|
|||||||
"codegen": "graphql-codegen && eslint graphql/generated/operations.ts --fix"
|
"codegen": "graphql-codegen && eslint graphql/generated/operations.ts --fix"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@commitlint/cli": "21.2.3",
|
"@commitlint/cli": "21.2.1",
|
||||||
"@commitlint/config-conventional": "21.2.3",
|
"@commitlint/config-conventional": "21.2.0",
|
||||||
"@graphql-codegen/cli": "7.4.6",
|
"@graphql-codegen/cli": "7.2.0",
|
||||||
"@graphql-codegen/fragment-matcher": "7.1.0",
|
"@graphql-codegen/fragment-matcher": "7.1.0",
|
||||||
"@graphql-codegen/typescript": "6.1.2",
|
"@graphql-codegen/typescript": "6.1.0",
|
||||||
"@graphql-codegen/typescript-operations": "6.1.10",
|
"@graphql-codegen/typescript-operations": "6.1.2",
|
||||||
"@graphql-codegen/typescript-vue-apollo": "5.0.1",
|
"@graphql-codegen/typescript-vue-apollo": "5.0.1",
|
||||||
"@nuxt/devtools": "3.4.2",
|
"@nuxt/devtools": "3.4.0",
|
||||||
"@nuxt/eslint": "1.17.0",
|
"@nuxt/eslint": "1.16.0",
|
||||||
"@nuxtjs/i18n": "10.6.0",
|
"@nuxtjs/i18n": "10.6.0",
|
||||||
"@stylistic/eslint-plugin": "5.10.0",
|
"@stylistic/eslint-plugin": "5.10.0",
|
||||||
"@vue/test-utils": "2.5.1",
|
"@vue/test-utils": "2.4.11",
|
||||||
"esbuild": "0.28.2",
|
"esbuild": "0.28.1",
|
||||||
"eslint": "10.12.0",
|
"eslint": "10.8.0",
|
||||||
"eslint-plugin-simple-import-sort": "14.0.0",
|
"eslint-plugin-simple-import-sort": "14.0.0",
|
||||||
"eslint-plugin-vue": "10.11.1",
|
"eslint-plugin-vue": "10.10.0",
|
||||||
"nuxt": "4.6.1",
|
"nuxt": "4.5.1",
|
||||||
"postcss-html": "2.0.0",
|
"postcss-html": "1.8.1",
|
||||||
"sass": "1.105.1",
|
"sass": "1.102.0",
|
||||||
"stylelint": "17.16.0",
|
"stylelint": "17.14.1",
|
||||||
"stylelint-config-recommended-vue": "2.0.0",
|
"stylelint-config-recommended-vue": "1.6.1",
|
||||||
"stylelint-config-standard": "40.0.0",
|
"stylelint-config-standard": "40.0.0",
|
||||||
"typescript": "6.0.3",
|
"typescript": "6.0.3",
|
||||||
"typescript-eslint": "8.71.2",
|
"typescript-eslint": "8.65.0",
|
||||||
"vite-plugin-vuetify": "2.1.3",
|
"vite-plugin-vuetify": "2.1.3",
|
||||||
"vue": "3.5.44",
|
"vue": "3.5.40",
|
||||||
"vue-eslint-parser": "10.4.1",
|
"vue-eslint-parser": "10.4.1",
|
||||||
"vue-router": "5.4.0",
|
"vue-router": "5.2.0",
|
||||||
"vuetify": "4.2.5"
|
"vuetify": "4.1.6"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@apollo/client": "3.14.1",
|
"@apollo/client": "4.2.9",
|
||||||
"@auth0/auth0-vue": "2.11.0",
|
"@auth0/auth0-vue": "2.9.0",
|
||||||
"@grafana/faro-web-sdk": "2.12.1",
|
"@grafana/faro-web-sdk": "2.9.0",
|
||||||
"@grafana/faro-web-tracing": "2.12.1",
|
"@grafana/faro-web-tracing": "2.9.0",
|
||||||
"@mdi/font": "7.4.47",
|
"@mdi/font": "7.4.47",
|
||||||
"@pinia/nuxt": "1.0.2",
|
"@pinia/nuxt": "0.11.3",
|
||||||
"@vue/apollo-composable": "4.2.2",
|
"@vue/apollo-composable": "4.2.2",
|
||||||
"date-fns": "4.4.0",
|
"date-fns": "4.4.0",
|
||||||
"graphql": "16.14.2",
|
"graphql": "16.14.2",
|
||||||
"graphql-tag": "2.12.7",
|
"graphql-tag": "2.12.7",
|
||||||
"pinia": "4.0.3",
|
"pinia": "3.0.4",
|
||||||
"pinia-plugin-persistedstate": "4.7.1"
|
"pinia-plugin-persistedstate": "4.7.1"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
|
|||||||
@@ -10,14 +10,6 @@
|
|||||||
"@grafana/faro-**"
|
"@grafana/faro-**"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"groupName": "pinia",
|
|
||||||
"matchPackageNames": [
|
|
||||||
"pinia",
|
|
||||||
"@pinia/nuxt",
|
|
||||||
"pinia-plugin-persistedstate"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"groupName": "stylelint",
|
"groupName": "stylelint",
|
||||||
"matchPackageNames": [
|
"matchPackageNames": [
|
||||||
|
|||||||
Reference in new issue
Block a user