Skip to content

Commit 746f041

Browse files
committed
Merge branch 'develop'
2 parents 7a803d7 + 9c9a13f commit 746f041

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

.circleci/config.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
docker logs db > ${BUILD_PATH}/log_output-DEV_MySQL.txt
4949
5050
- run:
51-
name: Kill running ${CONTAINER_NAME} containers
51+
name: Kill running DEV Containers
5252
command: |
5353
make stop
5454
@@ -74,15 +74,6 @@ jobs:
7474
docker logs ${CONTAINER_NAME}-db-1 > ${BUILD_PATH}/log_output-LIVE_MySQL.txt
7575
7676
- run:
77-
name: Kill running ${CONTAINER_NAME} containers
77+
name: Kill running LIVE Containers
7878
command: |
7979
make stop
80-
81-
# Build Artifacts
82-
83-
- store_artifacts:
84-
path: ${BUILD_PATH}
85-
destination: raw-test-output
86-
87-
- store_test_results:
88-
path: ${BUILD_PATH}

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.8.7
11+
TAG = 1.9.0
1212
CONTAINER = apache
1313
IMAGE_REPO = htmlgraphic
1414
IMAGE_NAME = $(IMAGE_REPO)/$(CONTAINER)

0 commit comments

Comments
 (0)