Skip to content

Commit

Permalink
Rationalize images and upgrade Python versions (#4)
Browse files Browse the repository at this point in the history
* Upgrade Python versions and remove obsolete builds

Update node version

* Update github workflow

* Fix readme
  • Loading branch information
cjao authored Sep 11, 2024
1 parent 012f480 commit 20f5011
Show file tree
Hide file tree
Showing 15 changed files with 44 additions and 415 deletions.
12 changes: 3 additions & 9 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,12 @@ jobs:
fail-fast: false
matrix:
image:
- debian10-py38
- debian10-py39
- debian10-py310
- debian11-py38
- debian11-py39
- debian11-py310
- debian11-py311
- ubuntu22-py38
- ubuntu22-py39
- ubuntu22-py310
- centos7-py38
- centos7-py39
- debian12-py39
- debian12-py310
- debian12-py311
steps:
- name: Check out master
uses: actions/checkout@v3
Expand Down
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@

This repository contains a set of Dockerfiles which can be used to develop, build, and run Covalent. These images will not change very often, as they are used to set up build environments but do not include the actual dependencies of Covalent. The following environments are included:

- All combinations of Debian 10, 11 and Python 3.8, 3.9, 3.10
- CentOS 7 and Python 3.8
- All combinations of Debian 11, 12, and Python 3.9, 3.10, 3.11

To build a single one of these images locally, e.g., Debian 10 with Python 3.8, run the following:
To build a single one of these images locally, e.g., Debian 12 with Python 3.10, run the following:

```
docker build ./debian10-py38
docker build ./debian12-py310
```

To build all images and upload them to ECR, use the Makefile:
Expand All @@ -30,12 +29,12 @@ To pull an image from ECR and use it:

```
aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin xxxxxxxxxxxxx.dkr.ecr.us-east-1.amazonaws.com
docker pull xxxxxxxxxxxxx.dkr.ecr.us-east-1.amazonaws.com/covalent-bld:debian10-py38
docker pull xxxxxxxxxxxxx.dkr.ecr.us-east-1.amazonaws.com/covalent-bld:debian12-py310
```

Run the image and clone Covalent, and then install it:
```
docker run --rm -it -p 8080:48008 covalent-bld:debian10-py38 /bin/bash
docker run --rm -it -p 8080:48008 covalent-bld:debian12-py310 /bin/bash
git clone https://github.com/AgnostiqHQ/covalent.git
python setup.py webapp
Expand Down
29 changes: 0 additions & 29 deletions centos7-py38/Dockerfile

This file was deleted.

41 changes: 0 additions & 41 deletions centos7-py39/Dockerfile

This file was deleted.

25 changes: 0 additions & 25 deletions debian10-py38/Dockerfile

This file was deleted.

10 changes: 5 additions & 5 deletions debian11-py310/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
FROM python:3.10-slim-bullseye

RUN apt-get update \
&& apt-get install -y --no-install-recommends curl gcc git rsync vim \
&& curl -sL https://deb.nodesource.com/setup_16.x | bash - \
&& apt-get install -y nodejs \
&& npm install --global yarn \
&& rm -rf /var/lib/apt/lists/*
&& apt-get install -y --no-install-recommends curl gcc git rsync vim \
&& curl -sL https://deb.nodesource.com/setup_20.x | bash - \
&& apt-get install -y nodejs \
&& npm install --global yarn \
&& rm -rf /var/lib/apt/lists/*
16 changes: 8 additions & 8 deletions debian11-py311/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ FROM python:3.11-rc-slim-bullseye
ENV AIOHTTP_NO_EXTENSIONS=1

RUN apt-get update \
&& apt-get install -y --no-install-recommends curl gcc git rsync vim libc6-dev autotools-dev automake libtool build-essential cmake pkg-config libopenblas-dev libzmq3-dev \
&& curl -sL https://deb.nodesource.com/setup_16.x | bash - \
&& apt-get install -y nodejs \
&& npm install --global yarn \
&& rm -rf /var/lib/apt/lists/*
&& apt-get install -y --no-install-recommends curl gcc git rsync vim libc6-dev autotools-dev automake libtool build-essential cmake pkg-config libopenblas-dev libzmq3-dev \
&& curl -sL https://deb.nodesource.com/setup_20.x | bash - \
&& apt-get install -y nodejs \
&& npm install --global yarn \
&& rm -rf /var/lib/apt/lists/*

RUN pip install --upgrade pip \
&& pip install cython \
&& pip install aiohttp --no-binary aiohttp \
&& pip install -e 'git+https://github.com/MagicStack/uvloop.git@master#egg=uvloop'
&& pip install cython \
&& pip install aiohttp --no-binary aiohttp \
&& pip install -e 'git+https://github.com/MagicStack/uvloop.git@master#egg=uvloop'
173 changes: 0 additions & 173 deletions debian11-py311/Dockerfile~

This file was deleted.

10 changes: 5 additions & 5 deletions debian11-py39/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
FROM python:3.9-slim-bullseye

RUN apt-get update \
&& apt-get install -y --no-install-recommends curl gcc git rsync vim \
&& curl -sL https://deb.nodesource.com/setup_16.x | bash - \
&& apt-get install -y nodejs \
&& npm install --global yarn \
&& rm -rf /var/lib/apt/lists/*
&& apt-get install -y --no-install-recommends curl gcc git rsync vim \
&& curl -sL https://deb.nodesource.com/setup_20.x | bash - \
&& apt-get install -y nodejs \
&& npm install --global yarn \
&& rm -rf /var/lib/apt/lists/*
12 changes: 6 additions & 6 deletions debian11-py38/Dockerfile → debian12-py310/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
# limitations under the License.

# syntax=docker/dockerfile:1
FROM python:3.8-slim-bullseye
FROM python:3.10-bookworm

RUN apt-get update \
&& apt-get install -y --no-install-recommends curl gcc git rsync vim \
&& curl -sL https://deb.nodesource.com/setup_16.x | bash - \
&& apt-get install -y nodejs \
&& npm install --global yarn \
&& rm -rf /var/lib/apt/lists/*
&& apt-get install -y --no-install-recommends curl gcc git rsync vim \
&& curl -sL https://deb.nodesource.com/setup_20.x | bash - \
&& apt-get install -y nodejs \
&& npm install --global yarn \
&& rm -rf /var/lib/apt/lists/*
Loading

0 comments on commit 20f5011

Please sign in to comment.