Skip to content

Commit f404a55

Browse files
lithoruslithorus
committed
Update
1 parent 2155d49 commit f404a55

File tree

6 files changed

+28
-42
lines changed

6 files changed

+28
-42
lines changed

‎.github/workflows/release-pipeline.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
name: "Build Docker Images"
2929
strategy:
3030
matrix:
31-
component: [pycue, rqd, pyoutline, cuesubmit, cueadmin] #cuebot, cuegui]
31+
component: [pycue, rqd, pyoutline, cuesubmit, cueadmin, cuegui] #cuebot
3232

3333
steps:
3434
- name: Download a single artifact
@@ -51,7 +51,7 @@ jobs:
5151
run: |
5252
ls -la packages
5353
ls -la ${{ steps.package_outputs.outputs.proto_path }}
54-
docker build --no-cache \
54+
docker build \
5555
--build-arg OPENCUE_PROTO_PACKAGE_PATH="${{ steps.package_outputs.outputs.proto_path }}" \
5656
--build-arg OPENCUE_RQD_PACKAGE_PATH="${{ steps.package_outputs.outputs.rqd_path }}" \
5757
--build-arg OPENCUE_PYCUE_PACKAGE_PATH="${{ steps.package_outputs.outputs.pycue_path }}" \

‎cueadmin/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ FROM python:3.9
22

33
WORKDIR /opt/opencue
44

5-
# This is just to make it simpler between the different images
5+
# Paths to the pre-built python packages.
6+
# They are all defined her but no necessary used to make it simpler between the images
67
ARG OPENCUE_PROTO_PACKAGE_PATH=/tmp/invalidpath
78
ARG OPENCUE_RQD_PACKAGE_PATH=/tmp/invalidpath
89
ARG OPENCUE_PYCUE_PACKAGE_PATH=/tmp/invalidpath

‎cuegui/Dockerfile‎

Lines changed: 18 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
FROM --platform=linux/x86_64 rockylinux:9.3
22

3-
WORKDIR /src
3+
WORKDIR /opt/opencue
4+
5+
# Paths to the pre-built python packages.
6+
# They are all defined her but no necessary used to make it simpler between the images
7+
ARG OPENCUE_PROTO_PACKAGE_PATH=/tmp/invalidpath
8+
ARG OPENCUE_RQD_PACKAGE_PATH=/tmp/invalidpath
9+
ARG OPENCUE_PYCUE_PACKAGE_PATH=/tmp/invalidpath
10+
ARG OPENCUE_PYOUTLINE_PACKAGE_PATH=/tmp/invalidpath
11+
ARG OPENCUE_CUESUBMIT_PACKAGE_PATH=/tmp/invalidpath
12+
ARG OPENCUE_CUEGUI_PACKAGE_PATH=/tmp/invalidpath
13+
ARG OPENCUE_CUEADMIN_PACKAGE_PATH=/tmp/invalidpath
414

515
RUN yum -y install \
616
epel-release \
@@ -23,42 +33,13 @@ RUN yum -y install \
2333
python\
2434
python-pip
2535

26-
RUN python -m pip install --upgrade pip
36+
RUN python3 -m pip install --upgrade pip
2737

28-
COPY LICENSE requirements.txt requirements_gui.txt ./
29-
RUN python -m pip install -r requirements.txt -r requirements_gui.txt
38+
COPY LICENSE ./
3039

31-
COPY proto/ ./proto
32-
COPY pycue/README.md ./pycue/
33-
COPY pycue/setup.py ./pycue/
34-
COPY pycue/FileSequence ./pycue/FileSequence
35-
COPY pycue/opencue ./pycue/opencue
36-
COPY ci/fix_compiled_proto.py .
40+
RUN mkdir /tmp/packages
41+
COPY ${OPENCUE_PROTO_PACKAGE_PATH} /tmp/packages/
42+
COPY ${OPENCUE_PYCUE_PACKAGE_PATH} /tmp/packages/
43+
COPY ${OPENCUE_PYGUI_PACKAGE_PATH} /tmp/packages/
3744

38-
RUN python -m grpc_tools.protoc \
39-
-I=./proto \
40-
--python_out=./pycue/opencue/compiled_proto \
41-
--grpc_python_out=./pycue/opencue/compiled_proto \
42-
./proto/*.proto
43-
44-
# Fix imports to work in both Python 2 and 3. See
45-
# <https://github.com/protocolbuffers/protobuf/issues/1491> for more info.
46-
RUN python ./fix_compiled_proto.py pycue/opencue/compiled_proto
47-
48-
COPY cuegui/README.md ./cuegui/
49-
COPY cuegui/setup.py ./cuegui/
50-
COPY cuegui/tests ./cuegui/tests
51-
COPY cuegui/cuegui ./cuegui/cuegui
52-
53-
COPY VERSION.in VERSIO[N] ./
54-
RUN test -e VERSION || echo "$(cat VERSION.in)" | tee VERSION
55-
56-
RUN cd pycue && python setup.py install
57-
RUN cd cuegui && xvfb-run -d python setup.py test
58-
RUN cp LICENSE requirements.txt requirements_gui.txt VERSION cuegui/
59-
60-
RUN versioned_name="cuegui-$(cat ./VERSION)-all" \
61-
&& mv cuegui "${versioned_name}" \
62-
&& tar -cvzf "${versioned_name}.tar.gz" ${versioned_name}/* \
63-
&& mkdir -p /opt/opencue \
64-
&& cp "${versioned_name}.tar.gz" /opt/opencue/
45+
RUN python3 -m pip install /tmp/packages/*.whl

‎pycue/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ FROM python:3.9
22

33
WORKDIR /opt/opencue
44

5-
# This is just to make it simpler between the different images
5+
# Paths to the pre-built python packages.
6+
# They are all defined her but no necessary used to make it simpler between the images
67
ARG OPENCUE_PROTO_PACKAGE_PATH=/tmp/invalidpath
78
ARG OPENCUE_RQD_PACKAGE_PATH=/tmp/invalidpath
89
ARG OPENCUE_PYCUE_PACKAGE_PATH=/tmp/invalidpath

‎pyoutline/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ FROM python:3.9
22

33
WORKDIR /opt/opencue
44

5-
# This is just to make it simpler between the different images
5+
# Paths to the pre-built python packages.
6+
# They are all defined her but no necessary used to make it simpler between the images
67
ARG OPENCUE_PROTO_PACKAGE_PATH=/tmp/invalidpath
78
ARG OPENCUE_RQD_PACKAGE_PATH=/tmp/invalidpath
89
ARG OPENCUE_PYCUE_PACKAGE_PATH=/tmp/invalidpath

‎rqd/Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ FROM rockylinux:8.9
22

33
WORKDIR /opt/opencue
44

5+
# Paths to the pre-built python packages.
6+
# They are all defined her but no necessary used to make it simpler between the images
57
ARG OPENCUE_PROTO_PACKAGE_PATH=/tmp/invalidpath
68
ARG OPENCUE_RQD_PACKAGE_PATH=/tmp/invalidpath
79
ARG OPENCUE_PYCUE_PACKAGE_PATH=/tmp/invalidpath

0 commit comments

Comments
 (0)