Skip to content

Commit c8aba36

Browse files
authored
[cicd] Upgrade out of centos7 for cuesubmit and cuegui (#1620)
1 parent 158b6a3 commit c8aba36

File tree

2 files changed

+20
-41
lines changed

2 files changed

+20
-41
lines changed

cuegui/Dockerfile

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
FROM --platform=linux/x86_64 centos:7
1+
FROM --platform=linux/x86_64 rockylinux:9.3
22

33
WORKDIR /src
44

5-
# centos:7 repos moved to vault.centos
6-
RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/CentOS-*.repo
7-
RUN sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/CentOS-*.repo
8-
RUN sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/CentOS-*.repo
9-
105
RUN yum -y install \
116
epel-release \
127
fontconfig \
@@ -25,20 +20,13 @@ RUN yum -y install \
2520
xcb-util-wm.x86_64
2621

2722
RUN yum -y install \
28-
python36 \
29-
python36-devel \
30-
python36-pip
31-
32-
RUN python3.6 -m pip install --upgrade pip
33-
RUN python3.6 -m pip install --upgrade setuptools
34-
35-
RUN dbus-uuidgen > /etc/machine-id
23+
python\
24+
python-pip
3625

37-
COPY LICENSE ./
38-
COPY requirements.txt ./
39-
COPY requirements_gui.txt ./
26+
RUN python -m pip install --upgrade pip
4027

41-
RUN python3.6 -m pip install -r requirements.txt -r requirements_gui.txt
28+
COPY LICENSE requirements.txt requirements_gui.txt ./
29+
RUN python -m pip install -r requirements.txt -r requirements_gui.txt
4230

4331
COPY proto/ ./proto
4432
COPY pycue/README.md ./pycue/
@@ -47,15 +35,15 @@ COPY pycue/FileSequence ./pycue/FileSequence
4735
COPY pycue/opencue ./pycue/opencue
4836
COPY ci/fix_compiled_proto.py .
4937

50-
RUN python3.6 -m grpc_tools.protoc \
38+
RUN python -m grpc_tools.protoc \
5139
-I=./proto \
5240
--python_out=./pycue/opencue/compiled_proto \
5341
--grpc_python_out=./pycue/opencue/compiled_proto \
5442
./proto/*.proto
5543

5644
# Fix imports to work in both Python 2 and 3. See
5745
# <https://github.com/protocolbuffers/protobuf/issues/1491> for more info.
58-
RUN python3 ./fix_compiled_proto.py pycue/opencue/compiled_proto
46+
RUN python ./fix_compiled_proto.py pycue/opencue/compiled_proto
5947

6048
COPY cuegui/README.md ./cuegui/
6149
COPY cuegui/setup.py ./cuegui/
@@ -65,10 +53,8 @@ COPY cuegui/cuegui ./cuegui/cuegui
6553
COPY VERSION.in VERSIO[N] ./
6654
RUN test -e VERSION || echo "$(cat VERSION.in)" | tee VERSION
6755

68-
RUN cd pycue && python3.6 setup.py install
69-
70-
RUN cd cuegui && xvfb-run -d python3.6 setup.py test
71-
56+
RUN cd pycue && python setup.py install
57+
RUN cd cuegui && xvfb-run -d python setup.py test
7258
RUN cp LICENSE requirements.txt requirements_gui.txt VERSION cuegui/
7359

7460
RUN versioned_name="cuegui-$(cat ./VERSION)-all" \

cuesubmit/Dockerfile

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,24 @@
1-
FROM --platform=linux/x86_64 centos:7
1+
FROM --platform=linux/x86_64 rockylinux:9.3
22

33
WORKDIR /src
44

5-
# centos:7 repos moved to vault.centos
6-
RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/CentOS-*.repo
7-
RUN sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/CentOS-*.repo
8-
RUN sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/CentOS-*.repo
9-
105
RUN yum -y install \
116
epel-release \
127
gcc \
138
mesa-libGL \
149
python-devel
1510

1611
RUN yum -y install \
17-
python36 \
18-
python36-devel \
19-
python36-pip
12+
python \
13+
python-pip
2014

21-
RUN python3.6 -m pip install --upgrade pip
22-
RUN python3.6 -m pip install --upgrade setuptools
15+
RUN python -m pip install --upgrade pip
2316

2417
COPY LICENSE ./
2518
COPY requirements.txt ./
2619
COPY requirements_gui.txt ./
2720

28-
RUN python3.6 -m pip install -r requirements.txt -r requirements_gui.txt
21+
RUN python -m pip install -r requirements.txt -r requirements_gui.txt
2922

3023
COPY proto/ ./proto
3124
COPY pycue/README.md ./pycue/
@@ -34,15 +27,15 @@ COPY pycue/opencue ./pycue/opencue
3427
COPY pycue/FileSequence ./pycue/FileSequence
3528
COPY ci/fix_compiled_proto.py .
3629

37-
RUN python3.6 -m grpc_tools.protoc \
30+
RUN python -m grpc_tools.protoc \
3831
-I=./proto \
3932
--python_out=./pycue/opencue/compiled_proto \
4033
--grpc_python_out=./pycue/opencue/compiled_proto \
4134
./proto/*.proto
4235

4336
# Fix imports to work in both Python 2 and 3. See
4437
# <https://github.com/protocolbuffers/protobuf/issues/1491> for more info.
45-
RUN python3 ./fix_compiled_proto.py pycue/opencue/compiled_proto
38+
RUN python ./fix_compiled_proto.py pycue/opencue/compiled_proto
4639

4740
COPY pyoutline/README.md ./pyoutline/
4841
COPY pyoutline/setup.py ./pyoutline/
@@ -59,9 +52,9 @@ COPY cuesubmit/cuesubmit ./cuesubmit/cuesubmit
5952
COPY VERSION.in VERSIO[N] ./
6053
RUN test -e VERSION || echo "$(cat VERSION.in)" | tee VERSION
6154

62-
RUN cd pycue && python3.6 setup.py install
63-
RUN cd pyoutline && python3.6 setup.py install
64-
RUN cd cuesubmit && python3.6 setup.py test
55+
RUN cd pycue && python setup.py install
56+
RUN cd pyoutline && python setup.py install
57+
RUN cd cuesubmit && python setup.py test
6558

6659
RUN cp LICENSE requirements.txt requirements_gui.txt VERSION cuesubmit/
6760

0 commit comments

Comments
 (0)