Merge pull request #5 from shara-inc/master

Multiple Changes

directus/helm/Chart.yaml

@@ -0,0 +1,8 @@
+name: ./helm
+description: A generated Helm Chart for ./helm from Skippbox Kompose
+version: 0.0.1
+apiVersion: v1
+keywords:
+  - ./helm
+sources:
+home:

directus/helm/README.md

@@ -0,0 +1 @@
+This chart was created by Kompose

directus/helm/templates/cache-deployment.yaml

@@ -0,0 +1,32 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -c -o ./helm
+    kompose.version: 1.26.1 (a9d05d509)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: cache
+  name: cache
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: cache
+  strategy: {}
+  template:
+    metadata:
+      annotations:
+        kompose.cmd: kompose convert -c -o ./helm
+        kompose.version: 1.26.1 (a9d05d509)
+      creationTimestamp: null
+      labels:
+        io.kompose.network/directus: "true"
+        io.kompose.service: cache
+    spec:
+      containers:
+        - image: redis:6
+          name: cache
+          resources: {}
+      restartPolicy: Always
+status: {}

directus/helm/templates/database-deployment.yaml

@@ -0,0 +1,44 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -c -o ./helm
+    kompose.version: 1.26.1 (a9d05d509)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: database
+  name: database
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: database
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      annotations:
+        kompose.cmd: kompose convert -c -o ./helm
+        kompose.version: 1.26.1 (a9d05d509)
+      creationTimestamp: null
+      labels:
+        io.kompose.network/directus: "true"
+        io.kompose.service: database
+    spec:
+      containers:
+        - env:
+            - name: POSTGRES_DB
+            - name: POSTGRES_PASSWORD
+            - name: POSTGRES_USER
+          image: postgis/postgis:13-master
+          name: database
+          resources: {}
+          volumeMounts:
+            - mountPath: /var/lib/postgresql/data
+              name: directus-data
+      restartPolicy: Always
+      volumes:
+        - name: directus-data
+          persistentVolumeClaim:
+            claimName: directus-data
+status: {}

directus/helm/templates/directus-claim0-persistentvolumeclaim.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: directus-claim0
+  name: directus-claim0
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}

directus/helm/templates/directus-claim1-persistentvolumeclaim.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: directus-claim1
+  name: directus-claim1
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}

directus/helm/templates/directus-data-persistentvolumeclaim.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: directus-data
+  name: directus-data
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}

directus/helm/templates/directus-deployment.yaml

@@ -0,0 +1,75 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -c -o ./helm
+    kompose.version: 1.26.1 (a9d05d509)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: directus
+  name: directus
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: directus
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      annotations:
+        kompose.cmd: kompose convert -c -o ./helm
+        kompose.version: 1.26.1 (a9d05d509)
+      creationTimestamp: null
+      labels:
+        io.kompose.network/directus: "true"
+        io.kompose.network/proxy: "true"
+        io.kompose.service: directus
+    spec:
+      containers:
+        - env:
+            - name: ADMIN_EMAIL
+            - name: ADMIN_PASSWORD
+            - name: CACHE_ENABLED
+            - name: CACHE_REDIS
+            - name: CACHE_STORE
+            - name: DB_CLIENT
+            - name: DB_DATABASE
+            - name: DB_HOST
+            - name: DB_PASSWORD
+            - name: DB_PORT
+            - name: DB_USER
+            - name: EMAIL_SMTP_HOST
+            - name: EMAIL_SMTP_IGNORE_TLS
+            - name: EMAIL_SMTP_NAME
+            - name: EMAIL_SMTP_PASSWORD
+            - name: EMAIL_SMTP_PORT
+            - name: EMAIL_SMTP_SECURE
+            - name: EMAIL_SMTP_USER
+            - name: EMAIL_TRANSPORT
+            - name: KEY
+            - name: LETSENCRYPT_EMAIL
+            - name: LETSENCRYPT_HOST
+            - name: PUBLIC_URL
+            - name: SECRET
+            - name: VIRTUAL_HOST
+            - name: VIRTUAL_PORT
+          image: directus/directus:latest
+          name: directus
+          ports:
+            - containerPort: 8055
+          resources: {}
+          volumeMounts:
+            - mountPath: /directus/uploads
+              name: directus-claim0
+            - mountPath: /directus/extensions
+              name: directus-claim1
+      restartPolicy: Always
+      volumes:
+        - name: directus-claim0
+          persistentVolumeClaim:
+            claimName: directus-claim0
+        - name: directus-claim1
+          persistentVolumeClaim:
+            claimName: directus-claim1
+status: {}

directus/helm/templates/directus-networkpolicy.yaml

@@ -0,0 +1,14 @@
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  creationTimestamp: null
+  name: directus
+spec:
+  ingress:
+    - from:
+        - podSelector:
+            matchLabels:
+              io.kompose.network/directus: "true"
+  podSelector:
+    matchLabels:
+      io.kompose.network/directus: "true"

directus/helm/templates/directus-service.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -c -o ./helm
+    kompose.version: 1.26.1 (a9d05d509)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: directus
+  name: directus
+spec:
+  ports:
+    - name: "8055"
+      port: 8055
+      targetPort: 8055
+  selector:
+    io.kompose.service: directus
+status:
+  loadBalancer: {}

directus/helm/templates/proxy-networkpolicy.yaml

@@ -0,0 +1,14 @@
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  creationTimestamp: null
+  name: proxy
+spec:
+  ingress:
+    - from:
+        - podSelector:
+            matchLabels:
+              io.kompose.network/proxy: "true"
+  podSelector:
+    matchLabels:
+      io.kompose.network/proxy: "true"

strapi/.env.example

@@ -1,5 +1,14 @@
+# Proxy
+VIRTUAL_PORT=host.example.com
+VIRTUAL_HOST=1337
+LETSENCRYPT_EMAIL=[email protected]
+
 # Strapi
-HOST_URL=host.example.com
+NODE_ENV=production
+JWT_SECRET=secret1
+ADMIN_JWT_SECRET=secret2
+APP_KEYS=secret3
+
 # DB
 DB_USER=strapi
 DB_PASS=strapi_cms_secret

strapi/.gitignore

@@ -1,4 +1,12 @@
+# JavaScript
 node_modules
+package.json
+yarn.lock
+
+# Strapi local folders
 app
 db
+src
+
+# Secrets
 .env

strapi/docker-compose.yml

@@ -2,7 +2,6 @@ version: '3'
 
 services:
   strapi:
-    container_name: strapi
     image: strapi/strapi
     environment:
       - DATABASE_CLIENT=postgres
@@ -11,25 +10,29 @@ services:
       - DATABASE_NAME=${DB_NAME}
       - DATABASE_USERNAME=${DB_USER}
       - DATABASE_PASSWORD=${DB_PASS}
-      - VIRTUAL_HOST=${HOST_URL}
-      - VIRTUAL_PORT=1337
-      - LETSENCRYPT_HOST=${HOST_URL}
+      - VIRTUAL_HOST=${VIRTUAL_HOST}
+      - VIRTUAL_PORT=${VIRTUAL_PORT}
+      - LETSENCRYPT_HOST=${VIRTUAL_HOST}
+      - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL}
     ports:
-      - 1337:1337
+      - "1337:1337"
     volumes:
       - ./app:/srv/app
+      - ./src:/src/arc
+      - ./package.json:opt/package-json
+      - ./yarn.lock:/opt/yarn.lock
+      - strapi_uploads:/opt/app/public/uploads
     depends_on:
       - db
     networks:
       - default
       - proxy
 
   db:
-    container_name: strapi_postgres
-    image: postgres
+    image: postgis/postgis:13-master
     restart: always
     volumes:
-      - pgdata:/var/lib/postgresql/data
+      - pg_data:/var/lib/postgresql/data
     environment:
       POSTGRES_USER: ${DB_USER}
       POSTGRES_PASSWORD: ${DB_PASS}
@@ -42,4 +45,4 @@ networks:
     external: true
 
 volumes:
-  pgdata:
+  pg_data:

strapi/helm/Chart.yaml

@@ -0,0 +1,8 @@
+name: ./helm
+description: A generated Helm Chart for ./helm from Skippbox Kompose
+version: 0.0.1
+apiVersion: v1
+keywords:
+  - ./helm
+sources:
+home:

strapi/helm/README.md

@@ -0,0 +1 @@
+This chart was created by Kompose

strapi/helm/templates/db-deployment.yaml

@@ -0,0 +1,44 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -c -o ./helm
+    kompose.version: 1.26.1 (a9d05d509)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: db
+  name: db
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: db
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      annotations:
+        kompose.cmd: kompose convert -c -o ./helm
+        kompose.version: 1.26.1 (a9d05d509)
+      creationTimestamp: null
+      labels:
+        io.kompose.network/default: "true"
+        io.kompose.service: db
+    spec:
+      containers:
+        - env:
+            - name: POSTGRES_DB
+            - name: POSTGRES_PASSWORD
+            - name: POSTGRES_USER
+          image: postgis/postgis:13-master
+          name: db
+          resources: {}
+          volumeMounts:
+            - mountPath: /var/lib/postgresql/data
+              name: pg-data
+      restartPolicy: Always
+      volumes:
+        - name: pg-data
+          persistentVolumeClaim:
+            claimName: pg-data
+status: {}