diff --git a/docker-compose.yml b/docker-compose.yml index ca6416695fbfdc7c02271f1b3c3468d602d1d42b..596fbe0a09681a01fc0c800a14982e94d132324f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,18 +1,16 @@ -version: '3.7' +version: '3.2' services: nginx: image: registry.forge.grandlyon.com/web-et-numerique/llle_project/backoffice-client:dev restart: unless-stopped ports: - - 8088:8080 + - '8088:8080' depends_on: - backend networks: backoffice: volumes: - ./site.conf:/etc/nginx/conf.d/default.conf - - ./image-lib:/usr/share/nginx/html/lib - - ./dacc-preview:/usr/share/nginx/html/static-site database-agent: image: mysql:5 @@ -37,18 +35,16 @@ services: networks: backoffice: depends_on: - database-agent: - condition: service_healthy + - database-agent restart: unless-stopped volumes: - /etc/localtime:/etc/localtime:ro - ./configs:/app/configs - ./letsencrypt_cache:/app/letsencrypt_cache - - ./data:/app/data - ./${IMAGE_FOLDER}:/app/${IMAGE_FOLDER} ports: - - ${HTTPS_PORT}:${HTTPS_PORT} - - 8190:8090 + - '1443:1443' + - '8190:8090' environment: - HOSTNAME=${HOSTNAME} - HTTPS_PORT=${HTTPS_PORT} diff --git a/k8s/backend-claim0-persistentvolumeclaim.yaml b/k8s/backend-claim0-persistentvolumeclaim.yaml new file mode 100644 index 0000000000000000000000000000000000000000..03f4421da3ecf9cce43ba32566d119c455f5990a --- /dev/null +++ b/k8s/backend-claim0-persistentvolumeclaim.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + creationTimestamp: null + labels: + io.kompose.service: backend-claim0 + name: backend-claim0 +spec: + accessModes: + - ReadOnlyMany + resources: + requests: + storage: 100Mi +status: {} diff --git a/k8s/backend-claim1-persistentvolumeclaim.yaml b/k8s/backend-claim1-persistentvolumeclaim.yaml new file mode 100644 index 0000000000000000000000000000000000000000..3fd368f11b605dcefe73af17b46ca942d39e5269 --- /dev/null +++ b/k8s/backend-claim1-persistentvolumeclaim.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + creationTimestamp: null + labels: + io.kompose.service: backend-claim1 + name: backend-claim1 +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 100Mi +status: {} diff --git a/k8s/backend-claim2-persistentvolumeclaim.yaml b/k8s/backend-claim2-persistentvolumeclaim.yaml new file mode 100644 index 0000000000000000000000000000000000000000..d0ffc934fb2be0361ef95609e80c19e6da369eb0 --- /dev/null +++ b/k8s/backend-claim2-persistentvolumeclaim.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + creationTimestamp: null + labels: + io.kompose.service: backend-claim2 + name: backend-claim2 +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 100Mi +status: {} diff --git a/k8s/backend-claim3-persistentvolumeclaim.yaml b/k8s/backend-claim3-persistentvolumeclaim.yaml new file mode 100644 index 0000000000000000000000000000000000000000..2fb94a3715b809987cfd3c06a6b737063dfccf69 --- /dev/null +++ b/k8s/backend-claim3-persistentvolumeclaim.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + creationTimestamp: null + labels: + io.kompose.service: backend-claim3 + name: backend-claim3 +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 100Mi +status: {} diff --git a/k8s/backend-deployment.yaml b/k8s/backend-deployment.yaml new file mode 100644 index 0000000000000000000000000000000000000000..e1602f1cd56929642d20e43ff264aa7080a0b17e --- /dev/null +++ b/k8s/backend-deployment.yaml @@ -0,0 +1,71 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + annotations: + kompose.cmd: kompose convert + kompose.version: 1.16.0 (0c01309) + creationTimestamp: null + labels: + io.kompose.service: backend + name: backend +spec: + replicas: 1 + strategy: + type: Recreate + template: + metadata: + creationTimestamp: null + labels: + io.kompose.service: backend + spec: + containers: + - env: + - name: ADMIN_ROLE + - name: AUTH_URL + - name: CLIENT_ID + - name: CLIENT_SECRET + - name: DATABASE_HOST + value: database-agent + - name: DATABASE_NAME + - name: DATABASE_PASSWORD + - name: DATABASE_USER + - name: DEBUG_MODE + - name: HOSTNAME + - name: HTTPS_PORT + - name: IMAGE_FOLDER + - name: MOCK_OAUTH2 + - name: REDIRECT_URL + - name: TOKEN_URL + - name: USERINFO_URL + image: registry.forge.grandlyon.com/web-et-numerique/llle_project/backoffice-server:dev + name: backend + ports: + - containerPort: 1443 + - containerPort: 8090 + resources: {} + volumeMounts: + - mountPath: /etc/localtime + name: backend-claim0 + readOnly: true + - mountPath: /app/configs + name: backend-claim1 + - mountPath: /app/letsencrypt_cache + name: backend-claim2 + - mountPath: /app/ + name: backend-claim3 + restartPolicy: Always + volumes: + - name: backend-claim0 + persistentVolumeClaim: + claimName: backend-claim0 + readOnly: true + - name: backend-claim1 + persistentVolumeClaim: + claimName: backend-claim1 + - name: backend-claim2 + persistentVolumeClaim: + claimName: backend-claim2 + - name: backend-claim3 + persistentVolumeClaim: + claimName: backend-claim3 +status: {} diff --git a/k8s/backend-service.yaml b/k8s/backend-service.yaml new file mode 100644 index 0000000000000000000000000000000000000000..ce646682031b69da2d6af8a28dfc85b8a738ecc8 --- /dev/null +++ b/k8s/backend-service.yaml @@ -0,0 +1,22 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + kompose.cmd: kompose convert + kompose.version: 1.16.0 (0c01309) + creationTimestamp: null + labels: + io.kompose.service: backend + name: backend +spec: + ports: + - name: "1443" + port: 1443 + targetPort: 1443 + - name: "8190" + port: 8190 + targetPort: 8090 + selector: + io.kompose.service: backend +status: + loadBalancer: {} diff --git a/k8s/database-agent-claim0-persistentvolumeclaim.yaml b/k8s/database-agent-claim0-persistentvolumeclaim.yaml new file mode 100644 index 0000000000000000000000000000000000000000..3257dda5ed02a89947d447464a35f93ebb8a4942 --- /dev/null +++ b/k8s/database-agent-claim0-persistentvolumeclaim.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + creationTimestamp: null + labels: + io.kompose.service: database-agent-claim0 + name: database-agent-claim0 +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 100Mi +status: {} diff --git a/k8s/database-agent-deployment.yaml b/k8s/database-agent-deployment.yaml new file mode 100644 index 0000000000000000000000000000000000000000..33a549eab224f1f52d17f4dcd66096897f86cfcd --- /dev/null +++ b/k8s/database-agent-deployment.yaml @@ -0,0 +1,45 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + annotations: + kompose.cmd: kompose convert + kompose.version: 1.16.0 (0c01309) + creationTimestamp: null + labels: + io.kompose.service: database-agent + name: database-agent +spec: + replicas: 1 + strategy: + type: Recreate + template: + metadata: + creationTimestamp: null + labels: + io.kompose.service: database-agent + spec: + containers: + - env: + - name: MYSQL_DATABASE + - name: MYSQL_ROOT_PASSWORD + image: mysql:5 + livenessProbe: + exec: + command: + - mysqladmin ping -h 127.0.0.1 -u root --password=$MYSQL_ROOT_PASSWORD + failureThreshold: 60 + periodSeconds: 5 + timeoutSeconds: 10 + name: database-agent + ports: + - containerPort: 3306 + resources: {} + volumeMounts: + - mountPath: /dbinit + name: database-agent-claim0 + restartPolicy: Always + volumes: + - name: database-agent-claim0 + persistentVolumeClaim: + claimName: database-agent-claim0 +status: {} diff --git a/k8s/database-agent-service.yaml b/k8s/database-agent-service.yaml new file mode 100644 index 0000000000000000000000000000000000000000..b5f506b1176107f80b7b8ab08eeabdc24bb73bba --- /dev/null +++ b/k8s/database-agent-service.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + kompose.cmd: kompose convert + kompose.version: 1.16.0 (0c01309) + creationTimestamp: null + labels: + io.kompose.service: database-agent + name: database-agent +spec: + ports: + - name: "3306" + port: 3306 + targetPort: 3306 + selector: + io.kompose.service: database-agent +status: + loadBalancer: {} diff --git a/k8s/nginx-claim0-persistentvolumeclaim.yaml b/k8s/nginx-claim0-persistentvolumeclaim.yaml new file mode 100644 index 0000000000000000000000000000000000000000..aaca7d719d1b2d45640345c0e43624107aa5b720 --- /dev/null +++ b/k8s/nginx-claim0-persistentvolumeclaim.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + creationTimestamp: null + labels: + io.kompose.service: nginx-claim0 + name: nginx-claim0 +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 100Mi +status: {} diff --git a/k8s/nginx-deployment.yaml b/k8s/nginx-deployment.yaml new file mode 100644 index 0000000000000000000000000000000000000000..c74b2b3dc27cdcc4f76b9b4cf7df452cd631a766 --- /dev/null +++ b/k8s/nginx-deployment.yaml @@ -0,0 +1,35 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + annotations: + kompose.cmd: kompose convert + kompose.version: 1.16.0 (0c01309) + creationTimestamp: null + labels: + io.kompose.service: nginx + name: nginx +spec: + replicas: 1 + strategy: + type: Recreate + template: + metadata: + creationTimestamp: null + labels: + io.kompose.service: nginx + spec: + containers: + - image: registry.forge.grandlyon.com/web-et-numerique/llle_project/backoffice-client:dev + name: nginx + ports: + - containerPort: 8080 + resources: {} + volumeMounts: + - mountPath: /etc/nginx/conf.d/default.conf + name: nginx-claim0 + restartPolicy: Always + volumes: + - name: nginx-claim0 + persistentVolumeClaim: + claimName: nginx-claim0 +status: {} diff --git a/k8s/nginx-service.yaml b/k8s/nginx-service.yaml new file mode 100644 index 0000000000000000000000000000000000000000..60225807904d09e8a93b8ebd1e372c13e5b4c582 --- /dev/null +++ b/k8s/nginx-service.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + kompose.cmd: kompose convert + kompose.version: 1.16.0 (0c01309) + creationTimestamp: null + labels: + io.kompose.service: nginx + name: nginx +spec: + ports: + - name: "8088" + port: 8088 + targetPort: 8080 + selector: + io.kompose.service: nginx +status: + loadBalancer: {}