Skip to content

Backport of Reference hashicorp/consul instead of consul for Docker image into release/1.14.x #17918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nathancoleman merged 3 commits into from
Jun 28, 2023
Merged

Backport of Reference hashicorp/consul instead of consul for Docker image into release/1.14.x #17918

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed2fc2d
backport of commit d490377d50ae474f1b6919ebd5befa4a5c923f3a
nathancoleman Jun 27, 2023
14368b5
Reference hashicorp/consul instead of consul for Docker image (#17914)
nathancoleman Jun 27, 2023
c376603
Reference hashicorp/consul for integration test
nathancoleman Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-support/docker/Consul-Dev-Multiarch.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG CONSUL_IMAGE_VERSION=latest
FROM consul:${CONSUL_IMAGE_VERSION}
FROM hashicorp/consul:${CONSUL_IMAGE_VERSION}
RUN apk update && apk add iptables
ARG TARGETARCH
COPY linux_${TARGETARCH}/consul /bin/consul
2 changes: 1 addition & 1 deletion build-support/docker/Consul-Dev.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG CONSUL_IMAGE_VERSION=latest
FROM consul:${CONSUL_IMAGE_VERSION}
FROM hashicorp/consul:${CONSUL_IMAGE_VERSION}
RUN apk update && apk add iptables
COPY consul /bin/consul
4 changes: 2 additions & 2 deletions website/content/docs/k8s/installation/install.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ metadata:
spec:
containers:
- name: example
image: 'consul:latest'
image: 'hashicorp/consul:latest'
env:
- name: HOST_IP
valueFrom:
Expand Down Expand Up @@ -341,7 +341,7 @@ spec:
spec:
containers:
- name: example
image: 'consul:latest'
image: 'hashicorp/consul:latest'
env:
- name: HOST_IP
valueFrom:
Expand Down