Skip to content
Snippets Groups Projects
Commit adc42ccf authored by Xiang Dai's avatar Xiang Dai Committed by David
Browse files

Tag with lastest (#236)


* Tag with latest


Signed-off-by: default avatarXiang Dai <764524258@qq.com>
parent a64e0edd
No related branches found
No related tags found
No related merge requests found
...@@ -130,7 +130,7 @@ jobs: ...@@ -130,7 +130,7 @@ jobs:
name: Push Images name: Push Images
command: | command: |
docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" && docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" &&
make push-master make push-latest
deploy: deploy:
<<: *defaults <<: *defaults
......
...@@ -164,11 +164,13 @@ push-images: ...@@ -164,11 +164,13 @@ push-images:
fi \ fi \
done done
push-master: push-latest:
@set -e; \ @set -e; \
for image_name in $(IMAGE_NAMES); do \ for image_name in $(IMAGE_NAMES); do \
if ! echo $$image_name | grep build; then \ if ! echo $$image_name | grep build; then \
docker tag $$image_name:$(IMAGE_TAG) $$image_name:latest; \
docker tag $$image_name:$(IMAGE_TAG) $$image_name:master; \ docker tag $$image_name:$(IMAGE_TAG) $$image_name:master; \
docker push $$image_name:latest; \
docker push $$image_name:master; \ docker push $$image_name:master; \
fi \ fi \
done done
......
...@@ -5,7 +5,7 @@ networks: ...@@ -5,7 +5,7 @@ networks:
services: services:
loki: loki:
image: grafana/loki:master image: grafana/loki:latest
ports: ports:
- "3100:3100" - "3100:3100"
command: -config.file=/etc/loki/local-config.yaml command: -config.file=/etc/loki/local-config.yaml
...@@ -13,7 +13,7 @@ services: ...@@ -13,7 +13,7 @@ services:
- loki - loki
promtail: promtail:
image: grafana/promtail:master image: grafana/promtail:latest
volumes: volumes:
- /var/log:/var/log - /var/log:/var/log
command: -config.file=/etc/promtail/docker-config.yaml command: -config.file=/etc/promtail/docker-config.yaml
......
image: image:
tag: master tag: latest
env: env:
GF_EXPLORE_ENABLED: true GF_EXPLORE_ENABLED: true
\ No newline at end of file
...@@ -19,7 +19,7 @@ loki: ...@@ -19,7 +19,7 @@ loki:
image: image:
repository: grafana/loki repository: grafana/loki
tag: master tag: latest
pullPolicy: Always # Always pull while in BETA pullPolicy: Always # Always pull while in BETA
service: service:
...@@ -122,7 +122,7 @@ promtail: ...@@ -122,7 +122,7 @@ promtail:
image: image:
repository: grafana/promtail repository: grafana/promtail
tag: master tag: latest
pullPolicy: Always # Always pull while in BETA pullPolicy: Always # Always pull while in BETA
volumes: volumes:
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
// Our services. // Our services.
tableManager: 'grafana/cortex-table-manager:r47-06f3294e', tableManager: 'grafana/cortex-table-manager:r47-06f3294e',
loki: 'grafana/loki:master', loki: 'grafana/loki:latest',
distributor: self.loki, distributor: self.loki,
ingester: self.loki, ingester: self.loki,
......
...@@ -2,7 +2,7 @@ local k = import 'ksonnet-util/kausal.libsonnet'; ...@@ -2,7 +2,7 @@ local k = import 'ksonnet-util/kausal.libsonnet';
k { k {
_images+:: { _images+:: {
promtail: 'grafana/promtail:master', promtail: 'grafana/promtail:latest',
}, },
_config+:: { _config+:: {
......
...@@ -120,7 +120,7 @@ spec: ...@@ -120,7 +120,7 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.nodeName fieldPath: spec.nodeName
image: grafana/promtail:master image: grafana/promtail:latest
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: promtail name: promtail
ports: ports:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment