Skip to content

Commit 1b3c4c8

Browse files
authored
Merge pull request #26 from movabletype/feature-update-docker-image
Introduce UPDATE_DOCKER_IMAGE environment variable.
2 parents 6ced65a + d6a8137 commit 1b3c4c8

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
### Added
10+
11+
* Introduce UPDATE_DOCKER_IMAGE environment variable.
12+
* Setting this environment variable to "no" will skip updating the Docker image during `make up`.
13+
914
## [2.2.0] - 2023-02-15
1015

1116
### Added

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export DOCKER_COMPOSE_YAML_MIDDLEWARES:=-f ./mt/mysql.yml -f ./mt/memcached.yml
77
export UP_ARGS:=-d
88
export MT_HOME_PATH:=${MAKEFILE_DIR}/../movabletype
99
export UPDATE_BRANCH:=yes
10+
export UPDATE_DOCKER_IMAGE:=yes
1011
export CREATE_DATABASE_IF_NOT_EXISTS:=yes
1112
export DOCKER_MT_CPANFILES:=t/cpanfile
1213

@@ -146,8 +147,10 @@ up-common-invoke-docker-compose: setup-mysql-volume
146147
@echo DOCKER_MT_IMAGE=${DOCKER_MT_IMAGE}
147148
@echo DOCKER_HTTPD_IMAGE=${DOCKER_HTTPD_IMAGE}
148149
@echo DOCKER_MYSQL_IMAGE=${DOCKER_MYSQL_IMAGE}
150+
ifeq (${UPDATE_DOCKER_IMAGE},yes)
149151
${_DC} pull
150152
${_DC} build --pull
153+
endif
151154
ifeq (${CREATE_DATABASE_IF_NOT_EXISTS},yes)
152155
${_DC} up -d db
153156
@while ! ${MAKE} exec-mysql MYSQL_COMMAND_ARGS="-e 'SELECT 1'" >/dev/null 2>&1; do \

0 commit comments

Comments
 (0)