Update Docierfile and entrypoint

Author: madharjan

.gitignore

@@ -0,0 +1 @@
+.DS_Store

Changelog.md

@@ -0,0 +1,7 @@
+## 9.5 
+
+### Changes
+
+* Based on [gliderlabs/alpine](https://github.com/gliderlabs/docker-alpine/)
+* Using PostgreSQL Client 9.5.13
+

Dockerfile

@@ -5,21 +5,18 @@ ARG VCS_REF
 ARG POSTGRESQL_VERSION
 ARG DEBUG=false
 
-LABEL description="Docker container with Postgresql Client" os_version="Alpine 3.4" \
+LABEL description="Docker container with PostgreSQL Client" os_version="Alpine 3.4" \
       org.label-schema.vcs-ref=${VCS_REF} org.label-schema.vcs-url="https://github.com/madharjan/docker-postgresql-client"
 
 ENV HOME /root
 ENV ALPINE_VERSION 3.4
 ENV POSTGRESQL_VERSION ${POSTGRESQL_VERSION}
 
-COPY ./psql.sh /
+RUN mkdir -p /build
+COPY . /build
 
-RUN apk update && \
-    apk add bash postgresql-client && \
-    rm -rf  /var/cache/apk/* \
-    rm -rf /tmp/* && \
-    chmod 755 /psql.sh
+RUN chmod 755 /build/scripts/*.sh && /build/scripts/install.sh && /build/scripts/cleanup.sh
 
 WORKDIR /root
 
-ENTRYPOINT ["/psql.sh"]
+ENTRYPOINT ["/docker-entrypoint.sh"]

Makefile

@@ -48,6 +48,7 @@ stop:
 
 clean: stop
 	docker rm postgresql_client 2> /dev/null || true
+	docker ps -a | grep "Exited" | awk '{print$$1}' | xargs docker rm 2> /dev/null || true
 	docker images | grep "<none>" | awk '{print$3 }' | xargs docker rmi 2> /dev/null || true
 
 publish: docker_login run test clean

README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.com/madharjan/docker-postgresql-client.svg?branch=master)](https://travis-ci.com/madharjan/docker-postgresql-client)
 [![Layers](https://images.microbadger.com/badges/image/madharjan/docker-postgresql-client.svg)](http://microbadger.com/images/madharjan/docker-postgresql-client)
 
-Docker container with PostgreSQL Client Server based on [gliderlabs/alpine](https://github.com/gliderlabs/docker-alpine/)
+Docker container with PostgreSQL Client based on [gliderlabs/alpine](https://github.com/gliderlabs/docker-alpine/)
 
 ## Features
 

scripts/cleanup.sh

@@ -0,0 +1,10 @@
+#!/bin/sh 
+set -e
+
+if [ "${DEBUG}" = true ]; then
+  set -x
+fi
+
+rm -rf  /var/cache/apk/* 
+rm -rf /tmp/*
+rm -rf /build

psql.sh renamed to scripts/docker-entrypoint.sh

@@ -0,0 +1,13 @@
+#!/bin/sh 
+set -e
+
+if [ "${DEBUG}" = true ]; then
+  set -x
+fi
+
+apk update
+apk add bash 
+apk add postgresql-client 
+
+cp /build/scripts/docker-entrypoint.sh /
+chmod 755 /docker-entrypoint.sh