Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
gegere committed Feb 16, 2024
2 parents 7a803d7 + 9c9a13f commit 746f041
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
13 changes: 2 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
docker logs db > ${BUILD_PATH}/log_output-DEV_MySQL.txt
- run:
name: Kill running ${CONTAINER_NAME} containers
name: Kill running DEV Containers
command: |
make stop
Expand All @@ -74,15 +74,6 @@ jobs:
docker logs ${CONTAINER_NAME}-db-1 > ${BUILD_PATH}/log_output-LIVE_MySQL.txt
- run:
name: Kill running ${CONTAINER_NAME} containers
name: Kill running LIVE Containers
command: |
make stop
# Build Artifacts

- store_artifacts:
path: ${BUILD_PATH}
destination: raw-test-output

- store_test_results:
path: ${BUILD_PATH}
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ normal=\033[00m

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

TAG = 1.8.7
TAG = 1.9.0
CONTAINER = apache
IMAGE_REPO = htmlgraphic
IMAGE_NAME = $(IMAGE_REPO)/$(CONTAINER)
Expand Down

0 comments on commit 746f041

Please sign in to comment.