Change FROM container to Ubuntu, correct needed apt-get packages, correct build process on shippable, improve make file labels

Author: gegere

Dockerfile

@@ -1,4 +1,4 @@
-FROM htmlgraphic/ssh:latest
+FROM ubuntu:16.04
 MAINTAINER Jason Gegere <jason@htmlgraphic.com>
 
 # Install packages then remove cache package list information
@@ -7,6 +7,11 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install -yq --no-install-recommends python-software-properties software-properties-common \
 	apache2 \
 	php7.0 \
+	cron \
+	curl \
+	ghostscript \
+	mailutils \
+	iputils-ping \
 	libapache2-mod-php7.0 \
 	mysql-client \
 	php-apcu \
@@ -21,13 +26,14 @@ RUN apt-get update && apt-get install -yq --no-install-recommends python-softwar
 	php7.0-mbstring \
 	php7.0-opcache \
 	php7.0-xml \
-	ghostscript \
 	libgs-dev \
 	imagemagick \
 	libmagickwand-dev \
+	language-pack-en \
 	supervisor \
-	cron \
 	rsyslog \
+	vim \
+	wget \
 	postfix && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # POSTFIX

Makefile

@@ -1,11 +1,10 @@
 # Build a container via the command "make build"
 # By Jason Gegere <jason@htmlgraphic.com>
 
-VERSION 	= 1.7.1
-NAME 		= apache
+TAG 		= 1.7.1
+CONTAINER 	= apache
 IMAGE_REPO 	= htmlgraphic
-IMAGE_NAME 	= $(IMAGE_REPO)/$(NAME)
-DOMAIN 		= htmlgraphic.com
+IMAGE_NAME 	= $(IMAGE_REPO)/$(CONTAINER)
 include .env # .env file needs to created for this to work properly
 
 
@@ -14,17 +13,16 @@ all:: help
 
 help:
 	@echo ""
-	@echo "-- Help Menu"
+	@echo "-- Help Menu for $(IMAGE_NAME):$(TAG)"
 	@echo ""
-	@echo "     make build		- Build image $(IMAGE_NAME):$(VERSION)"
-	@echo "     make push		- Push $(IMAGE_NAME):$(VERSION) to public docker repo"
+	@echo "     make build		- Build Image"
+	@echo "     make push		- Push $(IMAGE_NAME):$(TAG) to public Docker repo"
 	@echo "     make run		- Run docker-compose and create local development environment"
-	@echo "     make start		- Start the EXISTING $(NAME) container"
-	@echo "     make stop		- Stop local environment build"
-	@echo "     make restart	- Stop and start $(NAME) container"
-	@echo "     make rm		- Stop and remove $(NAME) container"
-	@echo "     make state		- View state $(NAME) container"
-	@echo "     make logs		- View logs in real time"
+	@echo "     make start		- Start the EXISTING $(CONTAINER) container"
+	@echo "     make stop		- Stop running containers"
+	@echo "     make rm		- Stop and remove $(CONTAINER) container"
+	@echo "     make state		- View state $(CONTAINER) container"
+	@echo "     make logs		- View logs"
 
 
 env:
@@ -39,11 +37,11 @@ build:
 	docker build \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-		--rm -t $(IMAGE_NAME):$(VERSION) -t $(IMAGE_NAME):envoyer .
+		--rm -t $(IMAGE_NAME):$(TAG) -t $(IMAGE_NAME):latest .
 
 push:
 	@echo "note: If the repository is set as an automatted build you will NOT be able to push"
-	docker push $(IMAGE_NAME):$(VERSION)
+	docker push $(IMAGE_NAME):$(TAG)
 
 run:
 	@echo 'Checking... initial run structure'
@@ -65,17 +63,15 @@ stop:
 	@echo "Stopping local environment setup"
 	docker-compose stop
 
-restart:	stop start
-
 rm:
 	@echo "On remove, containers are specifally referenced, as to not destroy ANY persistent data"
-	@echo "Removing $(NAME) and $(NAME)_db"
-	docker rm -f $(NAME)
-	docker rm -f $(NAME)_db
+	@echo "Removing $(CONTAINER) and $(CONTAINER)_db"
+	docker rm -f $(CONTAINER)
+	docker rm -f $(CONTAINER)_db
 
 state:
-	docker ps -a | grep $(NAME)
+	docker ps -a | grep $(CONTAINER)
 
 logs:
-	@echo "Build $(NAME)..."
-	docker logs -f $(NAME)
+	@echo "Build $(CONTAINER)..."
+	docker logs -f $(CONTAINER)

shippable.yml

@@ -13,7 +13,7 @@ build:
     - make build
   pre_ci_boot:
     image_name: htmlgraphic/apache
-    image_tag: $BRANCH
+    image_tag: latest
     pull: false
   ci:
     - "bash app/run.sh &"