Skip to content

Commit 3eea35d

Browse files
author
Josie Fegan
authored
2024 Dockerfile updates & Python 3.9 (#139)
Fix minor nitpicks that the current docker build code has with the Dockerfile contents. While we're in the area, move to Python 3.9 so that we are at least somewhat closer to current.
1 parent 36b709e commit 3eea35d

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

.circleci/config.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# python-opsramp CircleCI 2.0 configuration file
22
#
3-
# (c) Copyright 2019-2022 Hewlett Packard Enterprise Development LP
3+
# (c) Copyright 2019-2024 Hewlett Packard Enterprise Development LP
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
1616
#
1717
version: 2.1
1818
jobs:
19-
packaging_py37:
19+
packaging_py39:
2020
docker:
21-
- image: cimg/python:3.7.5
21+
- image: cimg/python:3.9.19
2222
working_directory: ~/repo
2323
steps:
2424
- checkout
@@ -41,9 +41,9 @@ jobs:
4141
. venv2/bin/activate
4242
rm -rf python_opsramp.egg-info
4343
python3 -m build
44-
unit_py37:
44+
unit_py39:
4545
docker:
46-
- image: cimg/python:3.7.5
46+
- image: cimg/python:3.9.19
4747
working_directory: ~/repo
4848
steps:
4949
- checkout
@@ -67,5 +67,5 @@ workflows:
6767
version: 2
6868
"CircleCI":
6969
jobs:
70-
- unit_py37
71-
- packaging_py37
70+
- unit_py39
71+
- packaging_py39

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# start this container interactively and use -e to pass in the environment
44
# variables it needs (see cli.py). Once inside you can run commands like:
55
#
6-
# (c) Copyright 2019-2022 Hewlett Packard Enterprise Development LP
6+
# (c) Copyright 2019-2024 Hewlett Packard Enterprise Development LP
77
#
88
# Licensed under the Apache License, Version 2.0 (the "License");
99
# you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@
1717
# See the License for the specific language governing permissions and
1818
# limitations under the License.
1919
#
20-
FROM python:3.7.5-slim as baseimage
20+
FROM python:3.9.19-slim AS baseimage
2121

22-
FROM baseimage as build
22+
FROM baseimage AS build
2323
RUN apt-get update && apt-get install -y --no-install-recommends \
2424
git \
2525
&& rm -rf /var/lib/apt/lists/*
@@ -30,9 +30,9 @@ ADD . .
3030
RUN rm -rf build dist *.egg-info .eggs
3131
RUN pip install .
3232

33-
FROM baseimage as prod
33+
FROM baseimage AS prod
3434
LABEL description="OpsRamp CLI"
35-
LABEL maintainer "HPE GreenLake CSO <eemz@hpe.com>"
35+
LABEL maintainer="HPE GreenLake CSO <eemz@hpe.com>"
3636
COPY --from=build /usr/local /usr/local
3737

3838
ENTRYPOINT ["/bin/bash"]

0 commit comments

Comments
 (0)