Skip to content

Commit

Permalink
python upgrade and move to ubi7
Browse files Browse the repository at this point in the history
  • Loading branch information
lavanya-f5 committed Jan 11, 2022
1 parent c85a46e commit 58c9b6d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion build-tools/Dockerfile.debian
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ COPY . .

RUN $REPOPATH/build-tools/rel-build.sh

FROM python:3.6-slim-buster
FROM python:3.10-slim-buster


ENV APPPATH /app
Expand Down
2 changes: 1 addition & 1 deletion build-tools/Dockerfile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN $REPOPATH/build-tools/rel-build.sh && \
go get github.com/go-delve/delve/cmd/dlv


FROM python:3.6-slim-buster
FROM python:3.10-slim-buster

ENV APPPATH /app

Expand Down
10 changes: 7 additions & 3 deletions build-tools/Dockerfile.ubi
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN $REPOPATH/build-tools/rel-build.sh && \
apt-get update && apt-get install -y go-md2man && \
go-md2man -in $REPOPATH/build-tools/help.md -out /help.1

FROM registry.redhat.io/ubi8/ubi-minimal
FROM registry.redhat.io/ubi7/ubi-minimal

LABEL name="f5networks/f5-ipam-controller" \
vendor="F5 Networks" \
Expand Down Expand Up @@ -45,8 +45,12 @@ COPY --from=builder "/help.1" /
COPY LICENSE /licenses/

RUN microdnf update && \
microdnf --enablerepo=ubi-8-baseos install --nodocs python36 git shadow-utils && \
microdnf --enablerepo=ubi-8-baseos --enablerepo=ubi-8-appstream update nss-tools nss-softokn nss-util && \
microdnf --enablerepo=ubi-7-server-devtools-rpms --enablerepo=ubi-7-server-extras-rpms \
--enablerepo=ubi-7-server-optional-rpms --enablerepo=ubi-server-rhscl-7-rpms \
install --nodocs git shadow-utils && \
microdnf --enablerepo=ubi-7-server-devtools-rpms --enablerepo=ubi-7-server-extras-rpms \
--enablerepo=ubi-7-server-optional-rpms --enablerepo=ubi-server-rhscl-7-rpms \
update nss-tools nss-softokn nss-util && \
adduser -u 1200 ctlr && \
microdnf remove fipscheck fipscheck-lib libgnome-keyring libedit openssh openssh-clients \
perl-Git perl-TermReadKey perl-macros git-core git-core-doc git less \
Expand Down
2 changes: 1 addition & 1 deletion next-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.6
0.1.7

0 comments on commit 58c9b6d

Please sign in to comment.