Docker: base image improvements, package deployment codegen (#88)

Author: droserasprout

.dockerignore

@@ -1,14 +1,13 @@
-dist/
-docs/
-examples/
-assets/
-.pytest_cache
-.ipynb_checkpoints
-*.egg-info
-scripts
-tests
-*.ipynb
-*.json
-*.zip
-docker-compose.yml
-Dockerfile
+*
+
+!Makefile
+!pyproject.toml
+!poetry.lock
+!README.md
+!src/**
+!inject_pyproject.sh
+
+__pycache__
+*.pyc
+*.pyo
+*.pyd

Dockerfile

@@ -1,27 +1,33 @@
 FROM python:3.8-slim-buster
 
+ARG PLUGINS
+
+SHELL ["/bin/bash", "-x", "-v", "-c"]
 RUN apt update && \
-    apt install -y make git && \
+    apt install -y make git sudo `if [[ $PLUGINS =~ "pytezos" ]]; then echo build-essential pkg-config libsodium-dev libsecp256k1-dev libgmp-dev; fi` && \
     rm -rf /var/lib/apt/lists/*
 RUN pip install poetry
 RUN useradd -ms /bin/bash dipdup
 
 RUN mkdir /home/dipdup/source
-COPY Makefile pyproject.toml poetry.lock README.md /home/dipdup/source/
+COPY --chown=dipdup Makefile pyproject.toml poetry.lock README.md /home/dipdup/source/
 # We want to copy our code at the last layer but not to break poetry's "packages" section
 RUN mkdir -p /home/dipdup/source/src/dipdup && \
     touch /home/dipdup/source/src/dipdup/__init__.py
 
 WORKDIR /home/dipdup/source
 RUN poetry config virtualenvs.create false
-RUN make install DEV=0
+RUN make install DEV=0 PLUGINS="${PLUGINS}"
+
+COPY --chown=dipdup inject_pyproject.sh /home/dipdup/inject_pyproject
+RUN chmod +x /home/dipdup/inject_pyproject
+RUN echo 'dipdup ALL = NOPASSWD: /home/dipdup/inject_pyproject' >> /etc/sudoers
 
-COPY . /home/dipdup/source/
-RUN chown -R dipdup /home/dipdup/
+COPY --chown=dipdup src /home/dipdup/source/src
 
 USER dipdup
+RUN poetry config virtualenvs.create false
 
 WORKDIR /home/dipdup/
-EXPOSE 8888
-ENTRYPOINT ["python", "-m", "dipdup"]
-CMD ["-c", "dipdup.yml", "run"]
+ENTRYPOINT ["dipdup"]
+CMD ["run"]

Dockerfile.pytezos

@@ -0,0 +1,34 @@
+# Temporary copy for dockerhub
+FROM python:3.8-slim-buster
+
+ARG PLUGINS=pytezos
+
+SHELL ["/bin/bash", "-x", "-v", "-c"]
+RUN apt update && \
+    apt install -y make git sudo `if [[ $PLUGINS =~ "pytezos" ]]; then echo build-essential pkg-config libsodium-dev libsecp256k1-dev libgmp-dev; fi` && \
+    rm -rf /var/lib/apt/lists/*
+RUN pip install poetry
+RUN useradd -ms /bin/bash dipdup
+
+RUN mkdir /home/dipdup/source
+COPY --chown=dipdup Makefile pyproject.toml poetry.lock README.md /home/dipdup/source/
+# We want to copy our code at the last layer but not to break poetry's "packages" section
+RUN mkdir -p /home/dipdup/source/src/dipdup && \
+    touch /home/dipdup/source/src/dipdup/__init__.py
+
+WORKDIR /home/dipdup/source
+RUN poetry config virtualenvs.create false
+RUN make install DEV=0 PLUGINS="${PLUGINS}"
+
+COPY --chown=dipdup inject_pyproject.sh /home/dipdup/inject_pyproject
+RUN chmod +x /home/dipdup/inject_pyproject
+RUN echo 'dipdup ALL = NOPASSWD: /home/dipdup/inject_pyproject' >> /etc/sudoers
+
+COPY --chown=dipdup src /home/dipdup/source/src
+
+USER dipdup
+RUN poetry config virtualenvs.create false
+
+WORKDIR /home/dipdup/
+ENTRYPOINT ["dipdup"]
+CMD ["run"]

Makefile

@@ -2,7 +2,9 @@
 .PHONY: docs
 .DEFAULT_GOAL: all
 
-DEV ?= 1
+DEV=1
+PLUGINS=""
+TAG=latest
 
 all: install lint test cover
 lint: isort black flake mypy
@@ -11,7 +13,9 @@ debug:
 	pip install . --force --no-deps
 
 install:
-	poetry install `if [ "${DEV}" = "0" ]; then echo "--no-dev"; fi`
+	poetry install \
+	`if [ -n "${PLUGINS}" ]; then for i in ${PLUGINS}; do echo "-E $$i "; done; fi` \
+	`if [ "${DEV}" = "0" ]; then echo "--no-dev"; fi`
 
 isort:
 	poetry run isort src tests
@@ -35,7 +39,8 @@ build:
 	poetry build
 
 image:
-	docker build . -t dipdup
+	docker build . -t dipdup:${TAG}
+	docker build . -t dipdup:${TAG}-pytezos --build-arg PLUGINS=pytezos
 
 release-patch:
 	bumpversion patch

docker-compose.yml

@@ -0,0 +1,6 @@
+#$/bin/bash
+if test -f "/home/dipdup/pyproject.toml"; then
+    cd /home/dipdup/
+    sed -i  -e 's/dipdup = .*/dipdup = {path = "\/home\/dipdup\/source", develop = true}/' pyproject.toml
+    poetry install --no-dev
+fi