technofab/bumpver
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/bumpver.git synced 2025-12-12 06:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

use py39 on docker ci

Browse source
This commit is contained in:
Manuel Barkhau 2021-05-13 20:03:07 +00:00
parent 9379984b93
commit 0219eaf557
3 changed files with 10 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Makefile.bootstrapit.make
View file

@ -67,9 +67,7 @@ BDIST_WHEEL_FILE_CMD = ls -1t dist/*.whl | head -n 1
DEV_ENV := $(ENV_PREFIX)/$(DEV_ENV_NAME)
DEV_ENV_PY := $(DEV_ENV)/bin/python
RSA_KEY_PATH := $(HOME)/.ssh/$(PKG_NAME)_gitlab_runner_id_rsa
DOCKER := $(shell which podman || which docker)
DOCKER := $(shell which docker)
DOCKER_BASE_IMAGE := registry.gitlab.com/mbarkhau/pycalver/base
@ -604,19 +602,10 @@ dist_publish: bump_version dist_build dist_upload
## 4. You're using WSL but didn't do export DOCKER_HOST="tcp://localhost:2375"
.PHONY: docker_build
docker_build:
@if [[ -f "$(RSA_KEY_PATH)" ]]; then \
$(DOCKER) build \
--build-arg SSH_PRIVATE_RSA_KEY="$$(cat '$(RSA_KEY_PATH)')" \
--file docker_base.Dockerfile \
--tag $(DOCKER_BASE_IMAGE):$(DOCKER_IMAGE_VERSION) \
--tag $(DOCKER_BASE_IMAGE) \
.; \
else \
$(DOCKER) build \
--file docker_base.Dockerfile \
--tag $(DOCKER_BASE_IMAGE):$(DOCKER_IMAGE_VERSION) \
--tag $(DOCKER_BASE_IMAGE) \
.; \
fi
$(DOCKER) build \
--file docker_base.Dockerfile \
--tag $(DOCKER_BASE_IMAGE):$(DOCKER_IMAGE_VERSION) \
--tag $(DOCKER_BASE_IMAGE) \
.;
# $(DOCKER) push $(DOCKER_BASE_IMAGE)
$(DOCKER) push $(DOCKER_BASE_IMAGE)