Merge pull request #3 from nxtlytics/ubuntu-2004

Updating to ubuntu 2004 and adding python 3.9
nxtlytics · Dec 29, 2020 · 605b97a · 605b97a
2 parents 19d40b6 + 36c0dbf
commit 605b97a
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -75,6 +75,20 @@ workflows:
                 - /.*/
             tags:
               only: /^v.*/
+      - ivy-circleci-orb/build_docker:
+          name: python39
+          requires:
+            - base
+          working_directory: python39/
+          container_name: python39
+          simple_docker_tag: true
+          context: ivy
+          filters:
+            branches:
+              ignore:
+                - /.*/
+            tags:
+              only: /^v.*/
       - ivy-circleci-orb/build_docker:
           name: apache-airflow
           requires:

diff --git a/apache-airflow/Dockerfile b/apache-airflow/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/python37:v0.0.1
+FROM nxtlytics/python37:v0.0.2
 
 # Never prompt the user for choices on installation/configuration of packages
 ENV DEBIAN_FRONTEND noninteractive

diff --git a/base/Dockerfile b/base/Dockerfile
@@ -4,7 +4,7 @@
 # - Base APT repos for Nexus
 # Ensure this image is built with --squash to reduce layer bloat!
 
-FROM ubuntu:bionic-20200630
+FROM ubuntu:focal-20201106
 
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8

diff --git a/datadog-agent/Dockerfile b/datadog-agent/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/base:v0.0.1
+FROM nxtlytics/base:v0.0.2
 
 ADD utils /opt/utils/
 RUN echo "===> Moving docker-entrypoint.sh to /usr/local/bin and making it exec" \

diff --git a/jupyterhub-singleuser-base/Dockerfile b/jupyterhub-singleuser-base/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/python38:v0.0.1
+FROM nxtlytics/python38:v0.0.2
 
 COPY docker-entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh \

diff --git a/node12/Dockerfile b/node12/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/base:v0.0.1
+FROM nxtlytics/base:v0.0.2
 
 # Install tools
 RUN curl -sL https://deb.nodesource.com/setup_12.x -o /tmp/nodesource_setup.sh && \

diff --git a/python37/Dockerfile b/python37/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/base:v0.0.1
+FROM nxtlytics/base:v0.0.2
 
 # Ensure system is up to date and install tools
 RUN echo 'deb http://archive.ubuntu.com/ubuntu/ bionic-proposed restricted main multiverse universe' > /etc/apt/sources.list.d/bionic-proposed.list && \
@@ -12,6 +12,7 @@ RUN echo 'deb http://archive.ubuntu.com/ubuntu/ bionic-proposed restricted main
     curl https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py && \
     python3.7 /tmp/get-pip.py && \
     hash -r && \
-    python3.7 -m pip install pipenv
+    python3.7 -m pip install pipenv && \
+    python3.7 -m pip install poetry
 
 ADD .VERSION /opt/ivy/meta/PYTHON37_VERSION
diff --git a/python38/Dockerfile b/python38/Dockerfile
@@ -1,4 +1,4 @@
-FROM nxtlytics/base:v0.0.1
+FROM nxtlytics/base:v0.0.2
 
 # Ensure system is up to date and install tools
 RUN echo 'deb http://archive.ubuntu.com/ubuntu/ bionic-proposed restricted main multiverse universe' > /etc/apt/sources.list.d/bionic-proposed.list && \
@@ -12,6 +12,7 @@ RUN echo 'deb http://archive.ubuntu.com/ubuntu/ bionic-proposed restricted main
     curl https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py && \
     python3.8 /tmp/get-pip.py && \
     hash -r && \
-    python3.8 -m pip install pipenv
+    python3.8 -m pip install pipenv && \
+    python3.8 -m pip install poetry
 
 ADD .VERSION /opt/ivy/meta/PYTHON38_VERSION
diff --git a/python39/Dockerfile b/python39/Dockerfile
@@ -0,0 +1,18 @@
+FROM nxtlytics/base:v0.0.2
+
+# Ensure system is up to date and install tools
+RUN echo 'deb http://archive.ubuntu.com/ubuntu/ bionic-proposed restricted main multiverse universe' > /etc/apt/sources.list.d/bionic-proposed.list && \
+    apt-get update && \
+    apt-get install -y \
+        git \
+        python3.9 \
+        python3.9-venv \
+        python3.9-dev \
+        python3-pip && \
+    curl https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py && \
+    python3.9 /tmp/get-pip.py && \
+    hash -r && \
+    python3.9 -m pip install pipenv && \
+    python3.9 -m pip install poetry
+
+ADD .VERSION /opt/ivy/meta/PYTHON39_VERSION
diff --git a/python39/README.md b/python39/README.md
@@ -0,0 +1,38 @@
+# docker-base-python39
+
+A ubuntu-based Python 3.9 base container
+
+[DockerHUB repository](https://hub.docker.com/r/nxtlytics/python39)
+
+## How do I use this?
+
+In your `dockerfile`:
+```
+FROM nxtlytics/python39:<pick a tag from hub.docker.com>
+
+# Add your source files
+ADD app/ /app
+
+# Install pipenv dependencies
+RUN pipenv install
+
+# Set command, make sure your main app is named `main.py`
+CMD pipenv run /app/main.py
+```
+
+## What *should* I use this for?
+
+Use this as a starting point for: 
+
+- Applications using Python 3.9 as their runtime
+
+## What should I not use this for?
+
+This is not the place for:
+
+- Large uncommon libraries (CUDA/ML)
+- Architecture-specific (ARM, etc) tooling or compilers
+
+## Found a bug? Got suggestions?
+
+Open an issue, or make a PR if you have suggested changes here.