Skip to content
This repository has been archived by the owner on Feb 23, 2023. It is now read-only.

various fixes #14

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/Dockerfile
Expand Up @@ -7,7 +7,7 @@ FROM ${IMAGE} as builder

# Signifies this is a temporary image that can be purged
LABEL autodelete="true"
RUN apk add --update gcc musl-dev libffi-dev make openssl-dev
RUN apk add --update gcc musl-dev libffi-dev make openssl-dev rust cargo
RUN pip3 --default-timeout=5 --retries 15 install --upgrade --prefix=/install -r requirements.txt

FROM ${IMAGE}
Expand Down
2 changes: 1 addition & 1 deletion build/alpine/Dockerfile
@@ -1,5 +1,5 @@
ARG TAG=latest
FROM alpine:3.10
FROM alpine:3.12
LABEL VERSION=${TAG}
ARG REPO_FILE=repositories
ADD $REPO_FILE /etc/apk/repositories
Expand Down
4 changes: 2 additions & 2 deletions build/alpine/repositories
@@ -1,2 +1,2 @@
http://dl-cdn.alpinelinux.org/alpine/v3.10/main
http://dl-cdn.alpinelinux.org/alpine/v3.10/community
http://dl-cdn.alpinelinux.org/alpine/v3.12/main
http://dl-cdn.alpinelinux.org/alpine/v3.12/community
4 changes: 2 additions & 2 deletions build/alpine/repositories.internal
@@ -1,2 +1,2 @@
http://repomirror-ict.eng.netapp.com/alpine-linux/v3.10/main
http://repomirror-ict.eng.netapp.com/alpine-linux/v3.10/community
http://repomirror-ict.eng.netapp.com/alpine-linux/v3.12/main
http://repomirror-ict.eng.netapp.com/alpine-linux/v3.12/community
2 changes: 1 addition & 1 deletion build/python/Dockerfile
Expand Up @@ -4,7 +4,7 @@ FROM ${PROJ_NAME}/alpine-base:${TAG} as builder
# Signifies this is a temporary image that can be purged
LABEL autodelete="true"

FROM python:3.8-alpine3.10
FROM python:3.8-alpine3.12
ARG PIP_CONF=pip.conf
ADD $PIP_CONF /etc/pip.conf
COPY --from=builder /etc/apk/repositories /etc/apk/repositories
Expand Down
2 changes: 1 addition & 1 deletion plugins/eseries_monitoring/alpine_base/Dockerfile
@@ -1,5 +1,5 @@
ARG TAG=latest
FROM alpine:3.10
FROM alpine:3.12
LABEL VERSION=${TAG}
ARG ALPINE_REPO_FILE=repositories
ADD $ALPINE_REPO_FILE /etc/apk/repositories
Expand Down
2 changes: 1 addition & 1 deletion plugins/eseries_monitoring/collector/Dockerfile
Expand Up @@ -9,4 +9,4 @@ RUN pip install -r requirements.txt && rm -rf /root/.cache
ADD docker-entrypoint.sh config.json *.py ./
RUN chmod +x *.sh *.py

ENTRYPOINT ["./docker-entrypoint.sh"]
ENTRYPOINT ["./docker-entrypoint.sh"]
4 changes: 2 additions & 2 deletions plugins/eseries_monitoring/python_base/Dockerfile
Expand Up @@ -4,10 +4,10 @@ FROM ${PROJ_NAME}-plugin/eseries_monitoring/alpine-base as builder
# Signifies this is a temporary image that can be purged
LABEL autodelete="true"

FROM python:3.8.1-alpine3.10
FROM python:3.8-alpine3.12
ARG PIP_CONF=pip.conf
ADD $PIP_CONF /etc/pip.conf
COPY --from=builder /etc/apk/repositories /etc/apk/repositories
ONBUILD WORKDIR /home
ONBUILD COPY requirements.txt .
ONBUILD RUN apk update && apk upgrade && rm -rf /var/cache/apk/*
ONBUILD RUN apk update && apk upgrade && rm -rf /var/cache/apk/*