Build Docker image based on repository state (as opposed to PyPI pack…

…age)

.circleci/config.yml

@@ -120,7 +120,6 @@ jobs:
 
       - deploy:
           name: '[Dry run] Publish image to Docker Hub'
-          # Prerequisites: artifacts must be released to test PyPI first
           command: bash ci/docker/ci-deploy.sh --dry-run
 
       - deploy:
@@ -130,7 +129,6 @@ jobs:
 
       - deploy:
           name: '[Dry run] Build snap'
-          # Side effects: none
           command: bash ci/snap/ci-run-dry-run.sh
 
       - deploy:
@@ -154,7 +152,6 @@ jobs:
 
       - deploy:
           name: 'Publish image to Docker Hub'
-          # Prerequisites: artifacts must be released to PyPI first
           command: bash ci/docker/ci-deploy.sh
 
       - deploy:

.dockerignore

@@ -0,0 +1,12 @@
+*
+
+!git_machete/
+!git-machete
+!MANIFEST.in
+!README.md
+!requirements.txt
+!setup.py
+
+git_machete/tests/
+**/*.pyc
+**/__pycache__/

RELEASE_NOTES.md

@@ -1,5 +1,9 @@
 # Release notes
 
+## New in git-machete 3.7.1
+
+- fixed: build process of Docker images
+
 ## New in git-machete 3.7.0
 
 - added: extra options can be passed to the underlying `git rebase` via `GIT_MACHETE_REBASE_OPTS` env var (suggested by @kgadek)

ci/docker/Dockerfile

@@ -1,11 +1,15 @@
 FROM python:3-alpine
-RUN apk update
-RUN apk add git
+SHELL ["/bin/sh", "-e", "-o", "pipefail", "-u", "-x", "-c"]
+RUN apk add --no-cache git
 
-ARG pypi_host
-ARG version
-RUN pip install --index-url=https://$pypi_host/simple/ git-machete==$version
-RUN git machete --version
+COPY . /tmp/input/
+WORKDIR /tmp/input/
+RUN find . | sort
+RUN \
+  export PYTHONDONTWRITEBYTECODE=1; \
+  python setup.py install; \
+  git machete --version; \
+  rm -rf /tmp/input/
 
 WORKDIR /repo
 VOLUME /repo

ci/docker/ci-deploy.sh

@@ -4,20 +4,16 @@ set -e -o pipefail -u -x
 
 if [[ ${1-} == "--dry-run" || ${CIRCLE_BRANCH-} != "master" ]]; then
   do_push=false
-  pypi_host=test.pypi.org
 else
   do_push=true
-  pypi_host=pypi.org
 fi
 
 version=$(grep '__version__ = ' git_machete/__init__.py | cut -d\' -f2)
 
 docker build \
-  --build-arg pypi_host=$pypi_host \
-  --build-arg version=$version \
   -t gitmachete/git-machete:$version \
   -t gitmachete/git-machete:latest \
-  - < ci/docker/Dockerfile
+  -f ci/docker/Dockerfile .
 
 [[ $(docker run gitmachete/git-machete:latest --version) == "git machete version $version" ]]
 

git_machete/__init__.py

@@ -1 +1 @@
-__version__ = '3.7.0'
+__version__ = '3.7.1'