diff --git a/etc-gogs-conf/app.ini b/etc-gogs-conf/app.ini index 1b70fce..02adccb 100644 --- a/etc-gogs-conf/app.ini +++ b/etc-gogs-conf/app.ini @@ -148,7 +148,7 @@ DB_TYPE = postgres HOST = gogs-postgresql:5432 NAME = gogs USER = gogs -PASSWD = gogs +PASSWD = gogs ; For "postgres" only, either "disable", "require" or "verify-full" SSL_MODE = disable ; For "sqlite3" and "tidb", use absolute path when you start as service @@ -191,7 +191,7 @@ QUEUE_LENGTH = 1000 ; Deliver timeout in seconds DELIVER_TIMEOUT = 5 ; Allow insecure certification -SKIP_TLS_VERIFY = false +SKIP_TLS_VERIFY = true ; Number of history information in each page PAGING_NUM = 10 diff --git a/openshift-template.yaml b/openshift-template.yaml index 08a5f59..78114d3 100644 --- a/openshift-template.yaml +++ b/openshift-template.yaml @@ -13,9 +13,6 @@ objects: - kind: ServiceAccount apiVersion: v1 metadata: - creationTimestamp: null - labels: - app: ${APPLICATION_NAME} name: ${APPLICATION_NAME} - kind: Service apiVersion: v1 @@ -69,7 +66,7 @@ objects: tcpSocket: port: 5432 timeoutSeconds: 1 - name: postgresql + name: gogs-postgresql ports: - containerPort: 5432 readinessProbe: @@ -95,10 +92,10 @@ objects: - imageChangeParams: automatic: true containerNames: - - postgresql + - gogs-postgresql from: kind: ImageStreamTag - name: postgresql:9.4 + name: postgresql:9.5 namespace: openshift type: ImageChange - type: ConfigChange @@ -108,8 +105,6 @@ objects: annotations: description: The Gogs server's http port service.alpha.openshift.io/dependencies: '[{"name":"gogs-postgresql","namespace":"","kind":"Service"}]' - labels: - app: ${APPLICATION_NAME} name: ${APPLICATION_NAME} spec: ports: @@ -118,7 +113,6 @@ objects: protocol: TCP targetPort: 3000 selector: - app: ${APPLICATION_NAME} deploymentconfig: ${APPLICATION_NAME} sessionAffinity: None type: ClusterIP @@ -130,8 +124,6 @@ objects: metadata: annotations: description: Route for application's http service. - labels: - app: ${APPLICATION_NAME} name: ${APPLICATION_NAME} spec: host: ${HOSTNAME_HTTP} @@ -140,13 +132,10 @@ objects: - kind: DeploymentConfig apiVersion: v1 metadata: - labels: - app: ${APPLICATION_NAME} name: ${APPLICATION_NAME} spec: replicas: 1 selector: - app: ${APPLICATION_NAME} deploymentconfig: ${APPLICATION_NAME} strategy: resources: {} @@ -161,7 +150,6 @@ objects: metadata: creationTimestamp: null labels: - app: ${APPLICATION_NAME} deploymentconfig: ${APPLICATION_NAME} spec: serviceAccountName: ${APPLICATION_NAME} @@ -222,8 +210,6 @@ objects: - kind: ImageStream apiVersion: v1 metadata: - labels: - app: ${APPLICATION_NAME} name: ${APPLICATION_NAME} spec: tags: