6543/docker-qemu-reactos
1
0
Fork 0
mirror of https://github.com/hectorm/docker-qemu-reactos synced 2025-01-09 10:36:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always pull images in CI

Browse Source
This commit is contained in:
Héctor Molinero Fernández 2020-05-22 18:52:24 +02:00
parent 27e8c8da4d
commit 7fa7bbe095
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -19,7 +19,7 @@ build:images:
before_script: before_script:
- 'apk add --no-cache coreutils git make xz' - 'apk add --no-cache coreutils git make xz'
script: script:
- 'make build-image save-image' - 'make IMAGE_BUILD_OPTS="--pull" build-image save-image'
artifacts: artifacts:
expire_in: '1 day' expire_in: '1 day'
paths: paths:

4
Makefile
View File

@ -20,6 +20,8 @@ ifneq ($(wildcard $(VERSION_FILE)),)
IMAGE_VERSION := $(shell cat '$(VERSION_FILE)') IMAGE_VERSION := $(shell cat '$(VERSION_FILE)')
endif endif


IMAGE_BUILD_OPTS :=

IMAGE_TARBALL := $(DISTDIR)/$(IMAGE_PROJECT).txz IMAGE_TARBALL := $(DISTDIR)/$(IMAGE_PROJECT).txz


################################################## ##################################################
@ -35,7 +37,7 @@ all: save-image


.PHONY: build-image .PHONY: build-image
build-image: build-image:
'$(DOCKER)' build \ '$(DOCKER)' build $(IMAGE_BUILD_OPTS) \
--tag '$(IMAGE_NAME):$(IMAGE_VERSION)' \ --tag '$(IMAGE_NAME):$(IMAGE_VERSION)' \
--tag '$(IMAGE_NAME):latest' \ --tag '$(IMAGE_NAME):latest' \
--file '$(DOCKERFILE)' ./ --file '$(DOCKERFILE)' ./