diff options
| author | Takuya Yoshida <hawaiianphoto@geekhost.net> | 2022-05-15 22:22:06 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-15 22:22:06 +0900 |
| commit | a8e779a68cc048d6d82b160e8e899cfab84db309 (patch) | |
| tree | 9e16e82bc8b4639436bc8effa8372eecfe33c36d | |
| parent | Refactor emoji-edit-dialog to use Composition API (#8657) (diff) | |
| download | sharkey-a8e779a68cc048d6d82b160e8e899cfab84db309.tar.gz sharkey-a8e779a68cc048d6d82b160e8e899cfab84db309.tar.bz2 sharkey-a8e779a68cc048d6d82b160e8e899cfab84db309.zip | |
Power up (#8684)
| -rw-r--r-- | Dockerfile | 3 | ||||
| -rw-r--r-- | chart/Chart.yml (renamed from chart/Chart.yaml) | 0 | ||||
| -rw-r--r-- | chart/files/default.yml | 11 | ||||
| -rw-r--r-- | chart/templates/ConfigMap.yml | 5 | ||||
| -rw-r--r-- | chart/templates/Deployment.yml | 11 | ||||
| -rw-r--r-- | chart/values.yml | 3 | ||||
| -rw-r--r-- | okteto-pipeline.yml | 3 | ||||
| -rw-r--r-- | okteto.yml | 6 |
8 files changed, 26 insertions, 16 deletions
diff --git a/Dockerfile b/Dockerfile index 174e2e9bc7..33d5faad12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM node:18.0.0-alpine3.15 AS base -ENV NODE_ENV=production +ARG NODE_ENV=production WORKDIR /misskey @@ -31,5 +31,6 @@ COPY --from=builder /misskey/packages/backend/built ./packages/backend/built COPY --from=builder /misskey/packages/client/node_modules ./packages/client/node_modules COPY . ./ +ENV NODE_ENV=production CMD ["npm", "run", "migrateandstart"] diff --git a/chart/Chart.yaml b/chart/Chart.yml index 8f31cf7fb4..8f31cf7fb4 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yml diff --git a/chart/files/default.yml b/chart/files/default.yml index 276e9f8915..a9ef22f424 100644 --- a/chart/files/default.yml +++ b/chart/files/default.yml @@ -6,7 +6,7 @@ #───┘ URL └───────────────────────────────────────────────────── # Final accessible URL seen by a user. -url: https://example.tld/ +# url: https://example.tld/ # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE # URL SETTINGS AFTER THAT! @@ -41,7 +41,7 @@ url: https://example.tld/ # You need to set Certificate in 'https' section. # To use option 1, uncomment below line. -port: 3000 # A port that your Misskey server should listen. +port: 3000 # A port that your Misskey server should listen. # To use option 2, uncomment below lines. #port: 443 @@ -89,8 +89,8 @@ redis: # host: localhost # port: 9200 # ssl: false -# user: -# pass: +# user: +# pass: # ┌───────────────┐ #───┘ ID generation └─────────────────────────────────────────── @@ -108,8 +108,7 @@ redis: # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE # ID SETTINGS AFTER THAT! -id: 'aid' - +id: "aid" # ┌─────────────────────┐ #───┘ Other configuration └───────────────────────────────────── diff --git a/chart/templates/ConfigMap.yml b/chart/templates/ConfigMap.yml index 51a9c256ce..37c25e0864 100644 --- a/chart/templates/ConfigMap.yml +++ b/chart/templates/ConfigMap.yml @@ -1,7 +1,8 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "misskey.fullname" . }}-config-file + name: {{ include "misskey.fullname" . }}-configuration data: default.yml: |- -{{ .Files.Get "files/default.yml"|indent 4 }} + {{ .Files.Get "files/default.yml"|nindent 4 }} + url: {{ .Values.url }} diff --git a/chart/templates/Deployment.yml b/chart/templates/Deployment.yml index 8ead4d7a9c..d16aece915 100644 --- a/chart/templates/Deployment.yml +++ b/chart/templates/Deployment.yml @@ -16,9 +16,12 @@ spec: spec: containers: - name: misskey - image: okteto.dev/misskey:latest + image: {{ .Values.image }} + env: + - name: NODE_ENV + value: {{ .Values.environment }} volumeMounts: - - name: config-file + - name: {{ include "misskey.fullname" . }}-configuration mountPath: /misskey/.config readOnly: true ports: @@ -39,6 +42,6 @@ spec: ports: - containerPort: 6379 volumes: - - name: config-file + - name: {{ include "misskey.fullname" . }}-configuration configMap: - name: {{ include "misskey.fullname" . }}-config-file + name: {{ include "misskey.fullname" . }}-configuration diff --git a/chart/values.yml b/chart/values.yml new file mode 100644 index 0000000000..a7031538a9 --- /dev/null +++ b/chart/values.yml @@ -0,0 +1,3 @@ +url: https://example.tld/ +image: okteto.dev/misskey +environment: production diff --git a/okteto-pipeline.yml b/okteto-pipeline.yml deleted file mode 100644 index 0dc8059034..0000000000 --- a/okteto-pipeline.yml +++ /dev/null @@ -1,3 +0,0 @@ -deploy: - - okteto build -t okteto.dev/misskey:latest - - helm upgrade --install misskey chart diff --git a/okteto.yml b/okteto.yml new file mode 100644 index 0000000000..e2996fbbc9 --- /dev/null +++ b/okteto.yml @@ -0,0 +1,6 @@ +build: + misskey: + args: + - NODE_ENV=development +deploy: + - helm upgrade --install misskey chart --set image=${OKTETO_BUILD_MISSKEY_IMAGE} --set url="https://misskey-$(kubectl config view --minify -o jsonpath='{..namespace}').cloud.okteto.net" --set environment=development |