Merge branch 'develop'

Author: gegere

Dockerfile

@@ -2,7 +2,7 @@ FROM ubuntu:22.04
 
 # Metadata as defined at http://label-schema.org
 LABEL org.label-schema.name="Apache Docker" \
-      org.label-schema.description="Docker container running Apache on Ubuntu with Composer, Laravel, TDD via Shippable & CircleCI" \
+      org.label-schema.description="Docker container running Apache on Ubuntu with Composer, Laravel, TDD via CircleCI" \
       org.label-schema.url="https://htmlgraphic.com" \
       org.label-schema.vcs-url="https://github.com/htmlgraphic/Apache" \
       org.label-schema.vendor="HTMLgraphic, LLC" \

Makefile

@@ -8,7 +8,7 @@ normal=\033[00m
 
 include .env # .env file needs to created for this to work properly
 
-TAG 		= 1.9.0
+TAG 		= 2.0.0
 CONTAINER 	= apache
 IMAGE_REPO 	= htmlgraphic
 IMAGE_NAME 	= $(IMAGE_REPO)/$(CONTAINER)

README.md

@@ -1,8 +1,7 @@
 
 ## Apache Docker
 
-[![Circle CI](https://circleci.com/gh/htmlgraphic/Apache/tree/master.svg?style=svg)](https://circleci.com/gh/htmlgraphic/Apache/tree/master) 
-[![](https://images.microbadger.com/badges/image/htmlgraphic/apache:latest.svg)](https://microbadger.com/images/htmlgraphic/apache:latest "Get your own image badge on microbadger.com")
+![Circle CI](https://circleci.com/gh/htmlgraphic/Apache/tree/develop.svg?style=svg)
 
 This repo will give you a turn key Docker container build for use in **production** OR **dev**. The setup includes Apache/2.4.29 build, PHP 7.4+, PHP Composer, [MySQL 8.3.0](https://hub.docker.com/_/mysql) instance and a data container volume.