Skip to content

Commit

Permalink
Merge pull request #31 from jburel/rocky9
Browse files Browse the repository at this point in the history
Rocky9
  • Loading branch information
jburel authored Apr 16, 2024
2 parents 2bc6f8a + f8ff5c7 commit a98326a
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 7 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
name: Docker
on:
push:
pull_request:

jobs:
test:
name: Build docker image
strategy:
fail-fast: false
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Build docker image
run: docker build .
12 changes: 5 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
FROM centos:centos7
FROM rockylinux:9
RUN dnf install -y glibc-locale-source glibc-langpack-en
RUN localedef -i en_US -f UTF-8 en_US.UTF-8
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
RUN yum install -y centos-release-scl \
&& yum install -y rh-python36 \
&& yum install -y python-virtualenv \
&& yum install -y openssl-devel git
ENV PATH=/opt/rh/rh-python36/root/bin/:$PATH
RUN python -m venv /py3 && /py3/bin/pip install -U pip tox future wheel
RUN dnf install -y python3 \
&& dnf install -y openssl-devel git
RUN python3 -m venv /py3 && /py3/bin/pip install -U pip tox future wheel

ENV VIRTUAL_ENV=/py3
ENV PATH="$VIRTUAL_ENV/bin:$PATH"
Expand Down
3 changes: 3 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
.. image:: https://github.com/ome/omero-cli-server/workflows/Tox/badge.svg
:target: https://github.com/ome/omero-cli-server/actions

.. image:: https://github.com/ome/omero-cli-server/workflows/Docker/badge.svg
:target: https://github.com/ome/omero-cli-server/actions

.. image:: https://badge.fury.io/py/omero-cli-server.svg
:target: https://badge.fury.io/py/omero-cli-server

Expand Down

0 comments on commit a98326a

Please sign in to comment.