Skip to content

Commit

Permalink
Go back to ubuntu 22
Browse files Browse the repository at this point in the history
  • Loading branch information
micafer committed Jun 7, 2024
1 parent 819c89a commit 7da9336
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up Python 3.
uses: actions/setup-python@v5
with:
python-version: '3.12'
python-version: '3.11'

- name: Install dependencies
run: python -m pip install tox
Expand Down
12 changes: 6 additions & 6 deletions docker-devel/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Dockerfile to create a container with the IM service
FROM ubuntu:24.04
FROM ubuntu:22.04
ARG BRANCH=devel
LABEL maintainer="Miguel Caballer <[email protected]>"
LABEL version="1.17.0"
Expand All @@ -12,11 +12,11 @@ RUN apt-get update && apt-get install --no-install-recommends -y wget python3 op

# Install IM
RUN apt-get update && apt-get install --no-install-recommends -y python3-setuptools python3-pip git && \
pip3 install --break-system-packages -U pip && \
pip3 install --break-system-packages msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-compute azure-mgmt-network azure-mgmt-resource azure-mgmt-dns azure-identity==1.8.0 && \
pip3 install --break-system-packages pyOpenSSL cheroot xmltodict pymongo ansible==8.7.0&& \
pip3 install --break-system-packages git+https://github.com/micafer/libcloud@ost_nets_extra && \
pip3 install --break-system-packages git+https://github.com/grycap/im@$BRANCH && \
pip3 install -U pip && \
pip3 install msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-compute azure-mgmt-network azure-mgmt-resource azure-mgmt-dns azure-identity==1.8.0 && \
pip3 install pyOpenSSL cheroot xmltodict pymongo ansible==8.7.0&& \
pip3 install git+https://github.com/micafer/libcloud@ost_nets_extra && \
pip3 install apache-libcloud==3.8.0 git+https://github.com/grycap/im@$BRANCH && \
apt-get purge -y python3-pip git && \
apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf ~/.cache/

Expand Down
10 changes: 5 additions & 5 deletions docker-py3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Dockerfile to create a container with the IM service
FROM ubuntu:24.04
FROM ubuntu:22.04

ENV VERSION=1.17.0

Expand All @@ -14,10 +14,10 @@ RUN apt-get update && apt-get install --no-install-recommends -y patch wget pyth

# Install IM
RUN apt-get update && apt-get install --no-install-recommends -y python3-setuptools python3-pip git && \
pip3 install --break-system-packages -U pip && \
pip3 install --break-system-packages msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-compute azure-mgmt-network azure-mgmt-resource azure-mgmt-dns azure-identity==1.8.0 && \
pip3 install --break-system-packages pyOpenSSL cheroot xmltodict pymongo ansible==8.7.0&& \
pip3 install --break-system-packages git+https://github.com/grycap/im@wheel && \
pip3 install -U pip && \
pip3 install msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-compute azure-mgmt-network azure-mgmt-resource azure-mgmt-dns azure-identity==1.8.0 && \
pip3 install pyOpenSSL cheroot xmltodict pymongo ansible==8.7.0&& \
pip3 install apache-libcloud==3.8.0 git+https://github.com/grycap/im@wheel && \
apt-get purge -y python3-pip git && \
apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf ~/.cache/

Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.11"
]
requires-python = ">=3.6"
dependencies = [
Expand Down

0 comments on commit 7da9336

Please sign in to comment.