Skip to content

Commit

Permalink
Hotfix/docker build (#43)
Browse files Browse the repository at this point in the history
Stub out docker-related targets
  • Loading branch information
czyszCTDS authored May 20, 2021
1 parent da516e3 commit 8ab11f0
Showing 1 changed file with 9 additions and 22 deletions.
31 changes: 9 additions & 22 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,17 @@ print-pypi:
@echo ${PYPI_VERSION}

version-docker:
@python setup.py -q print_version --docker
@echo

version-docker-tag:
# Use this target to grab docker-friendly tag from built image
@docker run --rm --entrypoint="make" ${DOCKER_IMAGE_LATEST} "version-docker"
@echo

.PHONY: docker-login
docker-login:
docker login -u="${QUAY_USERNAME}" -p="${QUAY_PASSWORD}" quay.io


.PHONY: build build-* clean init init-* lint requirements run version
.PHONY: build build-* clean clean-* init init-* lint requirements run version
init: init-pip init-hooks

init-pip:
Expand Down Expand Up @@ -57,6 +56,9 @@ clean:
rm -rf ./.tox/
rm -rf ./htmlcov

clean-docker:
@echo

lint:
@echo
@echo -- Lint --
Expand All @@ -82,19 +84,7 @@ build: build-docker

build-docker:
@echo
@echo -- Building docker --
python3 setup.py build
mkdir -p dist
cp -r build/lib/* dist/
cp -r bin/ dist/
cp -f Makefile requirements.txt README.md setup.py dist/
docker build . \
--file ./Dockerfile \
--build-arg http_proxy=${PROXY} \
--build-arg https_proxy=${PROXY} \
-t "${DOCKER_IMAGE_COMMIT}" \
-t "${DOCKER_IMAGE}" \
-t "${DOCKER_IMAGE_LATEST}"
@echo -- Skipping docker build --

build-pypi:
@echo
Expand All @@ -116,18 +106,15 @@ test-unit:

test-docker:
@echo
@echo -- Running Docker Test --
docker run --rm ${DOCKER_IMAGE_LATEST} test
@echo -- Skipping Docker Test --

tox:
@echo
tox

.PHONY: publish-*
publish-docker:
docker tag ${DOCKER_IMAGE_LATEST} ${DOCKER_REPO}/${REPO}:${TAG}
docker push ${DOCKER_IMAGE_COMMIT}
docker push ${DOCKER_REPO}/${REPO}:${DOCKER_TAG}
@echo Skipping docker publish


publish-pypi:
Expand Down

0 comments on commit 8ab11f0

Please sign in to comment.