github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-12-01 14:47:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'public-single-node' into pmm-6401-read-prometheus-data-files

Browse source
This commit is contained in:
Aliaksandr Valialkin 2023-02-09 14:07:32 -08:00
commit 37f48cdaa5
No known key found for this signature in database
GPG key ID: A72BEC6CD3D0DED1
9 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/victoria-metrics/multiarch/Dockerfile
View file

@ -2,7 +2,7 @@
ARG certs_image ARG certs_image
ARG root_image ARG root_image
FROM $certs_image as certs FROM $certs_image as certs
RUN apk --update --no-cache add ca-certificates RUN apk update && apk upgrade && apk --update --no-cache add ca-certificates
FROM $root_image FROM $root_image
COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt

2
app/vmagent/multiarch/Dockerfile
View file

@ -2,7 +2,7 @@
ARG certs_image ARG certs_image
ARG root_image ARG root_image
FROM $certs_image as certs FROM $certs_image as certs
RUN apk --update --no-cache add ca-certificates RUN apk update && apk upgrade && apk --update --no-cache add ca-certificates
FROM $root_image FROM $root_image
COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt

2
app/vmalert/multiarch/Dockerfile
View file

@ -2,7 +2,7 @@
ARG certs_image ARG certs_image
ARG root_image ARG root_image
FROM $certs_image as certs FROM $certs_image as certs
RUN apk --update --no-cache add ca-certificates RUN apk update && apk upgrade && apk --update --no-cache add ca-certificates
FROM $root_image FROM $root_image
COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt

2
app/vmauth/multiarch/Dockerfile
View file

@ -2,7 +2,7 @@
ARG certs_image ARG certs_image
ARG root_image ARG root_image
FROM $certs_image as certs FROM $certs_image as certs
RUN apk --update --no-cache add ca-certificates RUN apk update && apk upgrade && apk --update --no-cache add ca-certificates
FROM $root_image FROM $root_image
COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt

2
app/vmbackup/multiarch/Dockerfile
View file

@ -2,7 +2,7 @@
ARG certs_image ARG certs_image
ARG root_image ARG root_image
FROM $certs_image as certs FROM $certs_image as certs
RUN apk --update --no-cache add ca-certificates RUN apk update && apk upgrade && apk --update --no-cache add ca-certificates
FROM $root_image FROM $root_image
COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt

2
app/vmctl/multiarch/Dockerfile
View file

@ -2,7 +2,7 @@
ARG certs_image ARG certs_image
ARG root_image ARG root_image
FROM $certs_image as certs FROM $certs_image as certs
RUN apk --update --no-cache add ca-certificates RUN apk update && apk upgrade && apk --update --no-cache add ca-certificates
FROM $root_image FROM $root_image
COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt

2
app/vmrestore/multiarch/Dockerfile
View file

@ -2,7 +2,7 @@
ARG certs_image ARG certs_image
ARG root_image ARG root_image
FROM $certs_image as certs FROM $certs_image as certs
RUN apk --update --no-cache add ca-certificates RUN apk update && apk upgrade && apk --update --no-cache add ca-certificates
FROM $root_image FROM $root_image
COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt

2
deployment/docker/Makefile
View file

@ -6,7 +6,7 @@ ROOT_IMAGE ?= alpine:3.17.1
CERTS_IMAGE := alpine:3.17.1 CERTS_IMAGE := alpine:3.17.1
GO_BUILDER_IMAGE := golang:1.20.0-alpine GO_BUILDER_IMAGE := golang:1.20.0-alpine
BUILDER_IMAGE := local/builder:2.0.0-$(shell echo $(GO_BUILDER_IMAGE) | tr :/ __)-1 BUILDER_IMAGE := local/builder:2.0.0-$(shell echo $(GO_BUILDER_IMAGE) | tr :/ __)-1
BASE_IMAGE := local/base:1.1.3-$(shell echo $(ROOT_IMAGE) | tr :/ __)-$(shell echo $(CERTS_IMAGE) | tr :/ __) BASE_IMAGE := local/base:1.1.4-$(shell echo $(ROOT_IMAGE) | tr :/ __)-$(shell echo $(CERTS_IMAGE) | tr :/ __)
package-base: package-base:
(docker image ls --format '{{.Repository}}:{{.Tag}}' | grep -q '$(BASE_IMAGE)$$') \ (docker image ls --format '{{.Repository}}:{{.Tag}}' | grep -q '$(BASE_IMAGE)$$') \

2
deployment/docker/base/Dockerfile
View file

@ -3,7 +3,7 @@ ARG certs_image
ARG root_image ARG root_image
FROM $certs_image as certs FROM $certs_image as certs
RUN apk --update --no-cache add ca-certificates RUN apk update && apk upgrade && apk --update --no-cache add ca-certificates
FROM $root_image FROM $root_image