crichardson/docker-xubuntu
1
0
Fork 0
Code Issues Pull Requests Actions 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 19:21:11 +02:00
parent c8cda18ee3
commit 76ee8f6cc9
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@@ -29,7 +29,7 @@ build:images:native:
before_script: before_script:
- *cmd_install_build_packages - *cmd_install_build_packages
script: script:
- 'make build-native-image save-native-image' - 'make IMAGE_BUILD_OPTS="--pull" build-native-image save-native-image'
artifacts: artifacts:
expire_in: '1 day' expire_in: '1 day'
paths: paths:
@@ -42,7 +42,7 @@ build:images:native:
- *cmd_install_build_packages - *cmd_install_build_packages
script: script:
- 'make binfmt-register' - 'make binfmt-register'
- 'make "build-${ARCH:?}-image" "save-${ARCH:?}-image"' - 'make IMAGE_BUILD_OPTS="--pull" "build-${ARCH:?}-image" "save-${ARCH:?}-image"'
artifacts: artifacts:
expire_in: '1 week' expire_in: '1 week'
paths: paths:

10
Makefile
View File

@@ -21,6 +21,8 @@ ifneq ($(wildcard $(VERSION_FILE)),)
IMAGE_VERSION := $(shell cat '$(VERSION_FILE)') IMAGE_VERSION := $(shell cat '$(VERSION_FILE)')
endif endif
IMAGE_BUILD_OPTS :=
IMAGE_NATIVE_DOCKERFILE := $(DISTDIR)/Dockerfile IMAGE_NATIVE_DOCKERFILE := $(DISTDIR)/Dockerfile
IMAGE_NATIVE_TARBALL := $(DISTDIR)/$(IMAGE_PROJECT).txz IMAGE_NATIVE_TARBALL := $(DISTDIR)/$(IMAGE_PROJECT).txz
@@ -53,7 +55,7 @@ $(IMAGE_NATIVE_DOCKERFILE): $(DOCKERFILE_TEMPLATE)
--prefix-builtins \ --prefix-builtins \
-D ENABLE_32BIT=1 \ -D ENABLE_32BIT=1 \
'$(DOCKERFILE_TEMPLATE)' | cat --squeeze-blank > '$@' '$(DOCKERFILE_TEMPLATE)' | cat --squeeze-blank > '$@'
'$(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 '$@' ./ --file '$@' ./
@@ -72,7 +74,7 @@ $(IMAGE_AMD64_DOCKERFILE): $(DOCKERFILE_TEMPLATE)
-D CROSS_QEMU=/usr/bin/qemu-x86_64-static \ -D CROSS_QEMU=/usr/bin/qemu-x86_64-static \
-D ENABLE_32BIT=1 \ -D ENABLE_32BIT=1 \
'$(DOCKERFILE_TEMPLATE)' | cat --squeeze-blank > '$@' '$(DOCKERFILE_TEMPLATE)' | cat --squeeze-blank > '$@'
'$(DOCKER)' build \ '$(DOCKER)' build $(IMAGE_BUILD_OPTS) \
--tag '$(IMAGE_NAME):$(IMAGE_VERSION)-amd64' \ --tag '$(IMAGE_NAME):$(IMAGE_VERSION)-amd64' \
--tag '$(IMAGE_NAME):latest-amd64' \ --tag '$(IMAGE_NAME):latest-amd64' \
--file '$@' ./ --file '$@' ./
@@ -87,7 +89,7 @@ $(IMAGE_ARM64V8_DOCKERFILE): $(DOCKERFILE_TEMPLATE)
-D CROSS_ARCH=arm64v8 \ -D CROSS_ARCH=arm64v8 \
-D CROSS_QEMU=/usr/bin/qemu-aarch64-static \ -D CROSS_QEMU=/usr/bin/qemu-aarch64-static \
'$(DOCKERFILE_TEMPLATE)' | cat --squeeze-blank > '$@' '$(DOCKERFILE_TEMPLATE)' | cat --squeeze-blank > '$@'
'$(DOCKER)' build \ '$(DOCKER)' build $(IMAGE_BUILD_OPTS) \
--tag '$(IMAGE_NAME):$(IMAGE_VERSION)-arm64v8' \ --tag '$(IMAGE_NAME):$(IMAGE_VERSION)-arm64v8' \
--tag '$(IMAGE_NAME):latest-arm64v8' \ --tag '$(IMAGE_NAME):latest-arm64v8' \
--file '$@' ./ --file '$@' ./
@@ -102,7 +104,7 @@ $(IMAGE_ARM32V7_DOCKERFILE): $(DOCKERFILE_TEMPLATE)
-D CROSS_ARCH=arm32v7 \ -D CROSS_ARCH=arm32v7 \
-D CROSS_QEMU=/usr/bin/qemu-arm-static \ -D CROSS_QEMU=/usr/bin/qemu-arm-static \
'$(DOCKERFILE_TEMPLATE)' | cat --squeeze-blank > '$@' '$(DOCKERFILE_TEMPLATE)' | cat --squeeze-blank > '$@'
'$(DOCKER)' build \ '$(DOCKER)' build $(IMAGE_BUILD_OPTS) \
--tag '$(IMAGE_NAME):$(IMAGE_VERSION)-arm32v7' \ --tag '$(IMAGE_NAME):$(IMAGE_VERSION)-arm32v7' \
--tag '$(IMAGE_NAME):latest-arm32v7' \ --tag '$(IMAGE_NAME):latest-arm32v7' \
--file '$@' ./ --file '$@' ./