Skip to content

Commit 4cc9b69

Browse files
committed
Merge branch 'develop'
2 parents 7e037a4 + e9e0ac8 commit 4cc9b69

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM ubuntu:22.04
22

33
# Metadata as defined at http://label-schema.org
44
LABEL org.label-schema.name="Apache Docker" \
5-
org.label-schema.description="Docker container running Apache on Ubuntu with Composer, Laravel, TDD via Shippable & CircleCI" \
5+
org.label-schema.description="Docker container running Apache on Ubuntu with Composer, Laravel, TDD via CircleCI" \
66
org.label-schema.url="https://htmlgraphic.com" \
77
org.label-schema.vcs-url="https://github.com/htmlgraphic/Apache" \
88
org.label-schema.vendor="HTMLgraphic, LLC" \

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ normal=\033[00m
88

99
include .env # .env file needs to created for this to work properly
1010

11-
TAG = 1.9.0
11+
TAG = 2.0.0
1212
CONTAINER = apache
1313
IMAGE_REPO = htmlgraphic
1414
IMAGE_NAME = $(IMAGE_REPO)/$(CONTAINER)

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11

22
## Apache Docker
33

4-
[![Circle CI](https://circleci.com/gh/htmlgraphic/Apache/tree/master.svg?style=svg)](https://circleci.com/gh/htmlgraphic/Apache/tree/master)
5-
[![](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")
4+
![Circle CI](https://circleci.com/gh/htmlgraphic/Apache/tree/develop.svg?style=svg)
65

76
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.
87

0 commit comments

Comments
 (0)