Skip to content
This repository was archived by the owner on Apr 25, 2025. It is now read-only.

Commit 63f1c2b

Browse files
troyrondatroyronda
committed
[FABG-742] Add docker-compose pull to devstable
Change-Id: I600488d5ff876e3c2e4a853ae42076e5c79e48b3 Signed-off-by: Troy Ronda <troy@troyronda.com>
1 parent 0cd9893 commit 63f1c2b

File tree

1 file changed

+23
-15
lines changed

1 file changed

+23
-15
lines changed

‎Makefile‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,10 @@ export CORE_VM_ENDPOINT=http://chaincoded.example.com:9375
202202
else
203203
BASE_DOCKER_COMPOSE_FILES := -f ./docker-compose-std.yaml $(BASE_DOCKER_COMPOSE_FILES)
204204
endif
205+
DOCKER_COMPOSE_UP_FLAGS := --remove-orphans --force-recreate
206+
DOCKER_COMPOSE_UP_TEST_FLAGS := $(DOCKER_COMPOSE_UP_FLAGS) --abort-on-container-exit
207+
DOCKER_COMPOSE_UP_STANDALONE_FLAGS := $(DOCKER_COMPOSE_UP_FLAGS) -d
208+
DOCKER_COMPOSE_PULL_FLAGS :=
205209

206210
# Global environment exported for scripts
207211
export GO_CMD
@@ -287,7 +291,7 @@ integration-tests-stable: clean-tests depend-noforce populate-noforce
287291
cd $(FIXTURE_DOCKERENV_PATH) && \
288292
TEST_CHANGED_ONLY=true FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) \
289293
GO_TESTFLAGS="$(GO_TESTFLAGS_INTEGRATION)" \
290-
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) -f docker-compose-nopkcs11-test.yaml up --force-recreate --abort-on-container-exit
294+
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) -f docker-compose-nopkcs11-test.yaml up $(DOCKER_COMPOSE_UP_TEST_FLAGS)
291295
@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) $(FIXTURE_SCRIPTS_PATH)/check_status.sh "$(BASE_DOCKER_COMPOSE_FILES) -f ./docker-compose-nopkcs11-test.yaml"
292296

293297
.PHONY: integration-tests-prev
@@ -297,7 +301,7 @@ integration-tests-prev: clean-tests depend-noforce populate-noforce populate-fix
297301
cd $(FIXTURE_DOCKERENV_PATH) && \
298302
TEST_CHANGED_ONLY=true E2E_ONLY="true" FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_PREV_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_PREV_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) \
299303
GO_TESTFLAGS="$(GO_TESTFLAGS_INTEGRATION)" \
300-
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) -f docker-compose-nopkcs11-test.yaml up --force-recreate --abort-on-container-exit
304+
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) -f docker-compose-nopkcs11-test.yaml up $(DOCKER_COMPOSE_UP_TEST_FLAGS)
301305
@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) $(FIXTURE_SCRIPTS_PATH)/check_status.sh "$(BASE_DOCKER_COMPOSE_FILES) -f ./docker-compose-nopkcs11-test.yaml"
302306

303307
.PHONY: integration-tests-prerelease
@@ -307,7 +311,7 @@ integration-tests-prerelease: clean-tests depend-noforce populate-noforce popula
307311
cd $(FIXTURE_DOCKERENV_PATH) && \
308312
TEST_CHANGED_ONLY=true FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_PRERELEASE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_PRERELEASE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) \
309313
GO_TESTFLAGS="$(GO_TESTFLAGS_INTEGRATION)" \
310-
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) -f docker-compose-nopkcs11-test.yaml up --force-recreate --abort-on-container-exit
314+
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) -f docker-compose-nopkcs11-test.yaml up $(DOCKER_COMPOSE_UP_TEST_FLAGS)
311315
@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) $(FIXTURE_SCRIPTS_PATH)/check_status.sh "$(BASE_DOCKER_COMPOSE_FILES) -f ./docker-compose-nopkcs11-test.yaml"
312316

313317
.PHONY: integration-tests-devstable
@@ -316,9 +320,10 @@ integration-tests-devstable: clean-tests depend-noforce populate-noforce populat
316320
. $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
317321
$(FABRIC_DEV_REGISTRY_PRE_CMD) && \
318322
cd $(FIXTURE_DOCKERENV_PATH) && \
323+
FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) pull $(DOCKER_COMPOSE_PULL_FLAGS) && \
319324
TEST_CHANGED_ONLY=true FABRIC_FIXTURE_VERSION=v$(FABRIC_DEVSTABLE_VERSION_MINOR) FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_DEVSTABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_DEVSTABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) \
320325
GO_TESTFLAGS="$(GO_TESTFLAGS_INTEGRATION)" \
321-
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) -f docker-compose-nopkcs11-test.yaml up --force-recreate --abort-on-container-exit
326+
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) -f docker-compose-nopkcs11-test.yaml up $(DOCKER_COMPOSE_UP_TEST_FLAGS)
322327
@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(FIXTURE_SCRIPTS_PATH)/check_status.sh "$(BASE_DOCKER_COMPOSE_FILES) -f ./docker-compose-nopkcs11-test.yaml"
323328

324329
.PHONY: integration-tests-stable-negative
@@ -327,7 +332,7 @@ integration-tests-stable-negative: clean-tests depend-noforce populate-noforce
327332
cd $(FIXTURE_DOCKERENV_PATH) && \
328333
TEST_CHANGED_ONLY=true FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) \
329334
GO_TESTFLAGS="$(GO_TESTFLAGS_INTEGRATION)" \
330-
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) -f docker-compose-negative.yaml up --force-recreate --abort-on-container-exit
335+
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) -f docker-compose-negative.yaml up $(DOCKER_COMPOSE_UP_TEST_FLAGS)
331336
@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) $(FIXTURE_SCRIPTS_PATH)/check_status.sh "$(BASE_DOCKER_COMPOSE_FILES) -f ./docker-compose-negative.yaml"
332337

333338
.PHONY: integration-tests-stable-pkcs11
@@ -337,7 +342,7 @@ integration-tests-stable-pkcs11: clean-tests depend-noforce populate-noforce
337342
cd $(FIXTURE_DOCKERENV_PATH) && \
338343
TEST_CHANGED_ONLY=true FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) \
339344
GO_TESTFLAGS="$(GO_TESTFLAGS_INTEGRATION)" \
340-
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) -f docker-compose-pkcs11-test.yaml up --force-recreate --abort-on-container-exit
345+
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) -f docker-compose-pkcs11-test.yaml up $(DOCKER_COMPOSE_UP_TEST_FLAGS)
341346
@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) $(FIXTURE_SCRIPTS_PATH)/check_status.sh "$(BASE_DOCKER_COMPOSE_FILES) -f ./docker-compose-pkcs11-test.yaml"
342347

343348
# Additional test cases that aren't currently run by the CI
@@ -348,9 +353,10 @@ integration-tests-devstable-nomutualtls: clean-tests depend-noforce populate-nof
348353
. $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
349354
$(FABRIC_DEV_REGISTRY_PRE_CMD) && \
350355
cd $(FIXTURE_DOCKERENV_PATH) && \
356+
FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) pull $(DOCKER_COMPOSE_PULL_FLAGS) && \
351357
TEST_CHANGED_ONLY=true FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_DEVSTABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_DEVSTABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) \
352358
GO_TESTFLAGS="$(GO_TESTFLAGS_INTEGRATION)" \
353-
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) -f docker-compose-nopkcs11-test.yaml up --force-recreate --abort-on-container-exit
359+
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) -f docker-compose-nopkcs11-test.yaml up $(DOCKER_COMPOSE_UP_TEST_FLAGS)
354360
@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(FIXTURE_SCRIPTS_PATH)/check_status.sh "$(BASE_DOCKER_COMPOSE_FILES) -f ./docker-compose-nopkcs11-test.yaml"
355361

356362
.PHONY: integration-tests
@@ -403,7 +409,7 @@ integration-tests-stable-local: clean-tests-temp depend-noforce populate-noforce
403409
cd $(FIXTURE_DOCKERENV_PATH) && \
404410
FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) \
405411
GO_TESTFLAGS="$(GO_TESTFLAGS_INTEGRATION)" \
406-
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) up -d --force-recreate
412+
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) up $(DOCKER_COMPOSE_UP_STANDALONE_FLAGS)
407413
FABRIC_CRYPTOCONFIG_VERSION=$(FABRIC_CRYPTOCONFIG_VER) FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_CODELEVEL_TAG) TEST_LOCAL=true $(TEST_SCRIPTS_PATH)/integration.sh
408414
@cd $(FIXTURE_DOCKERENV_PATH) && $(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) down
409415

@@ -413,9 +419,10 @@ integration-tests-devstable-local: clean-tests-temp depend-noforce populate-nofo
413419
. $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
414420
$(FABRIC_DEV_REGISTRY_PRE_CMD) && \
415421
cd $(FIXTURE_DOCKERENV_PATH) && \
422+
FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) pull $(DOCKER_COMPOSE_PULL_FLAGS) && \
416423
FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_DEVSTABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_DEVSTABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) \
417424
GO_TESTFLAGS="$(GO_TESTFLAGS_INTEGRATION)" \
418-
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) up -d --force-recreate
425+
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) up $(DOCKER_COMPOSE_UP_STANDALONE_FLAGS)
419426
FABRIC_FIXTURE_VERSION=v$(FABRIC_DEVSTABLE_VERSION_MINOR) FABRIC_CRYPTOCONFIG_VERSION=$(FABRIC_CRYPTOCONFIG_VER) FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_DEVSTABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_DEVSTABLE_CODELEVEL_TAG) TEST_LOCAL=true $(TEST_SCRIPTS_PATH)/integration.sh
420427
@cd $(FIXTURE_DOCKERENV_PATH) && $(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) down
421428

@@ -426,31 +433,32 @@ dockerenv-prev-up: clean-tests populate-fixtures-prev-noforce
426433
cd $(FIXTURE_DOCKERENV_PATH) && \
427434
FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_PREV_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_PREV_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) \
428435
GO_TESTFLAGS="$(GO_TESTFLAGS_INTEGRATION)" \
429-
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) up --force-recreate
436+
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) up $(DOCKER_COMPOSE_UP_STANDALONE_FLAGS)
430437

431438
.PHONY: dockerenv-stable-up
432439
dockerenv-stable-up: clean-tests populate-fixtures-stable-noforce
433440
@. $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
434441
cd $(FIXTURE_DOCKERENV_PATH) && \
435442
FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) \
436-
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) up --force-recreate
443+
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) up $(DOCKER_COMPOSE_UP_STANDALONE_FLAGS)
437444

438445
.PHONY: dockerenv-prerelease-up
439446
dockerenv-prerelease-up: clean-tests populate-fixtures-prerelease-noforce
440447
@. $(FIXTURE_DOCKERENV_PATH)/prerelease-env.sh && \
441448
$(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
442449
cd $(FIXTURE_DOCKERENV_PATH) && \
443450
FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_PRERELEASE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_PRERELEASE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) \
444-
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) up --force-recreate
451+
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) up $(DOCKER_COMPOSE_UP_STANDALONE_FLAGS)
445452

446453
.PHONY: dockerenv-devstable-up
447454
dockerenv-devstable-up: clean-tests populate-fixtures-devstable-noforce
448455
@. $(FIXTURE_DOCKERENV_PATH)/devstable-env.sh && \
449456
. $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
450457
$(FABRIC_DEV_REGISTRY_PRE_CMD) && \
451458
cd $(FIXTURE_DOCKERENV_PATH) && \
452-
FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_DEVSTABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_DEVSTABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) \
453-
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) up --force-recreate
459+
FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) pull $(DOCKER_COMPOSE_PULL_FLAGS) && \
460+
FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_DEVSTABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_DEVSTABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) \
461+
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) up $(DOCKER_COMPOSE_UP_STANDALONE_FLAGS)
454462

455463
.PHONY: dockerenv-latest-up
456464
dockerenv-latest-up: clean-tests populate-fixtures-devstable-noforce
@@ -459,7 +467,7 @@ dockerenv-latest-up: clean-tests populate-fixtures-devstable-noforce
459467
. $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
460468
cd $(FIXTURE_DOCKERENV_PATH) && \
461469
FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_DEVSTABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_DEVSTABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY="" \
462-
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) up --force-recreate
470+
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) up $(DOCKER_COMPOSE_UP_STANDALONE_FLAGS)
463471

464472
.PHONY: mock-gen
465473
mock-gen:

0 commit comments

Comments
 (0)