Skip to content

Commit 69ca9bd

Browse files
committed
Dockerfile changes
- move the Dockerfile from the source subfolder to the parent directory - add copy apache2 license into grafana-bridge container - change the base image to registry.access.redhat.com/ubi8/ubi:8.4-206 - invoke the requirements/requirements_ubi8.txt for installing python required packages
1 parent 4c659a8 commit 69ca9bd

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

.circleci/config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
name: Build Docker image
3131
command: |
3232
. venv/bin/activate
33-
cd source
3433
docker build -t bridge_image:latest .
3534
3635

source/Dockerfile renamed to Dockerfile

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
1-
FROM registry.access.redhat.com/ubi8/ubi
1+
FROM registry.access.redhat.com/ubi8/ubi:8.4-206
22

3-
RUN yum install -y python36 python36-devel
3+
COPY ./requirements/requirements_ubi8.txt /root/requirements_ubi8.txt
44

5+
RUN yum install -y python36 python36-devel
56
RUN /usr/bin/pip3 install --upgrade pip
6-
RUN /usr/bin/pip3 install setuptools
7-
RUN /usr/bin/pip3 install cherrypy
8-
RUN /usr/bin/pip3 install urllib3
9-
RUN /usr/bin/pip3 install requests
107

8+
RUN /usr/bin/pip3 install -r /root/requirements_ubi8.txt
119
RUN echo "Installed python version: $(/usr/bin/python3 -V)"
1210
RUN echo "Installed python packages: $(/usr/bin/pip3 list)"
1311

1412
USER root
1513

1614
RUN mkdir -p /opt/IBM/bridge
17-
ADD . /opt/IBM/bridge
18-
15+
COPY ./source/ /opt/IBM/bridge
16+
COPY LICENSE /opt/IBM/bridge
1917

2018
RUN mkdir -p /var/mmfs/gen
2119
RUN mkdir -p /opt/IBM/zimon
22-
COPY ./gpfsConfig/mmsdrfs* /var/mmfs/gen/
23-
COPY ./gpfsConfig/ZIMon* /opt/IBM/zimon/
24-
20+
COPY ./source/gpfsConfig/mmsdrfs* /var/mmfs/gen/
21+
COPY ./source/gpfsConfig/ZIMon* /opt/IBM/zimon/
2522

2623
ARG HTTPPROTOCOL=http
2724
ENV PROTOCOL=$HTTPPROTOCOL

0 commit comments

Comments
 (0)