Skip to content

Commit

Permalink
Adjust make procedures and py38 docker
Browse files Browse the repository at this point in the history
  • Loading branch information
mbeacom committed Jun 20, 2019
1 parent 75b162c commit 8b905b4
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
4 changes: 4 additions & 0 deletions Dockerfile-py38
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ RUN apt-get -qq update && \
RUN pip install --upgrade pip && \
pip install --upgrade wheel setuptools twine pipenv && \
pipenv install --dev --system --deploy

RUN apt-get clean autoclean && \
apt-get autoremove --yes && \
rm -rf /var/lib/{apt,dpkg,cache,log}/
23 changes: 22 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,34 @@

.PHONY: help

REPO_NAME := mbeacom/cloudendure-py
REPO_NAME := mbeacom/cloudendure-python
SHA1 := $$(git log -1 --pretty=%h)
CURRENT_BRANCH := $$(git symbolic-ref -q --short HEAD)

info: ## Show information about the current git state.
@echo "Github Project: https://github.com/${REPO_NAME}\nCurrent Branch: ${CURRENT_BRANCH}\nSHA1: ${SHA1}\n"

build: ## Build the Gitcoin Web image.
@docker build \
--stream \
--pull \
--build-arg BUILD_DATETIME=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
--build-arg "SHA1=${SHA1}" \
${VERSION:+--build-arg "VERSION=$VERSION"} \
-t "${GIT_TAG}" .
@docker tag "${GIT_TAG}" "${LATEST_TAG}"

login: ## Login to Docker Hub.
@docker log -u "${DOCKER_USER}" -p "${DOCKER_PASS}"

push: ## Push the Docker image to the Docker Hub repository.
@docker push "${REPO_NAME}"

docker: ## Build and publish Docker images.
@docker build -t cloudendure .
@docker tag cloudendure mbeacom/cloudendure-python
@docker push

update_prereqs: ## Update the local development pre-requisite packages.
@pip install --upgrade pipenv wheel setuptools pip

Expand Down

0 comments on commit 8b905b4

Please sign in to comment.