Merge pull request #4 from jarifibrahim/master

Use centos/postgresql as database image and clean up application.yaml

Author: jarifibrahim

.openshiftio/application.yaml

@@ -97,21 +97,6 @@ objects:
         spec:
           containers:
             - env:
-                - name: DB_USERNAME
-                  valueFrom:
-                    secretKeyRef:
-                      name: my-database-secret
-                      key: user
-                - name: DB_PASSWORD
-                  valueFrom:
-                    secretKeyRef:
-                      name: my-database-secret
-                      key: password
-                - name: DB_HOST
-                  valueFron:
-                    secretKeyRef:
-                      name: my-database-secret
-                      key: host
               readinessProbe:
                 httpGet:
                   path: /api/fruits
@@ -172,14 +157,3 @@ objects:
       labels:
         project: golang-http-crud
         version: '${RELEASE_VERSION}'
-  - apiVersion: v1
-    kind: Secret
-    metadata:
-      name: my-database-secret
-      labels:
-        app: golang-http-crud
-        version: '${RELEASE_VERSION}'
-    stringData:
-      user: postgres
-      password: mysecretpassword
-      host: my-database

.openshiftio/service.yaml

@@ -13,10 +13,10 @@ items:
   spec:
     tags:
     - annotations:
-        openshift.io/imported-from: postgresql/postgresql:9.6
+        openshift.io/imported-from: centos/postgresql-96-centos7
       from:
         kind: DockerImage
-        name: postgresql/postgresql:9.6
+        name: centos/postgresql-96-centos7
       generation: null
       importPolicy: {}
       name: latest
@@ -53,7 +53,7 @@ items:
         - env:
           - name: POSTGRESQL_ADMIN_PASSWORD
             value: mysecretpassword
-          image: postgresql/postgresql:9.6
+          image: centos/postgresql-96-centos7
           name: my-database
           ports:
           - containerPort: 5432

README.md

@@ -0,0 +1,19 @@
+Golang CRUD Booster
+
+#### Running Locally
+
+First, install the dependencies
+`go get`
+
+The web app requires Postgres DB. If you have docker installed, you can run the
+following command to start a new Postgres container
+
+`docker run -e POSTGRESQL_ADMIN_PASSWORD=mysecretpassword -d -p 5432:5432 centos/postgresql-96-centos7`
+
+In this example, the database user is `postgres`, the password is `mysecretpassword` and the database is `postgres`
+
+You can then start the application like this:
+
+`go build && ./golang-http-crud`
+
+Then go to http://localhost:8080

main.go

@@ -13,7 +13,7 @@ import (
 )
 
 func main() {
-	pgHost := getEnv("DB_HOST", "localhost")
+	pgHost := getEnv("MY_DATABASE_SERVICE_HOST", "localhost")
 	pgPort := getEnv("DB_PORT", "5432")
 	pgUser := getEnv("DB_USERNAME", "postgres")
 	pgDBname := getEnv("DB_DBNAME", "postgres")