Skip to content
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.

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

Already on GitHub? Sign in to your account

Get rid of all references to docker.io/thhal #3655

Merged
merged 1 commit into from
Jul 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions build-aux/main.mk
Original file line number Diff line number Diff line change
Expand Up @@ -450,3 +450,9 @@ private-registry: $(tools/helm) ## (Test) Add a private docker registry to the c
test: check-all ## (ZAlias) Alias for 'check-all'
save-image: save-tel2-image
push-image: push-tel2-image

.PHONY: push-test-images
push-test-images:
docker buildx build --platform=linux/amd64,linux/arm64 --push --tag docker.io/telepredocker buildx build --platform=linux/amd64,linux/arm64 --push --tag docker.io/telepresenceio/echo-server:latest --tag docker.io/telepresenceio/echo-server:0.1.0 .
docker buildx build --platform=linux/amd64,linux/arm64 --push --tag docker.io/telepredocker buildx build --platform=linux/amd64,linux/arm64 --push --tag docker.io/telepresenceio/udp-echo:latest --tag docker.io/telepresenceio/udp-echo:0.1.0 .

6 changes: 3 additions & 3 deletions integration_test/testdata/echo-server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ RUN go mod download
COPY frontend.go .
COPY main.go .

FROM base as builder
FROM base AS builder
RUN go build -o echo-server .

FROM base as development
FROM base AS development
RUN go build -gcflags="all=-N -l" -o echo-server .
EXPOSE 40000
CMD ["/go/bin/dlv", "--listen=:40000", "--headless=true", "--api-version=2", "--accept-multiclient", "exec", "/echo-server/echo-server"]

FROM alpine as production
FROM alpine AS production
COPY --from=builder /echo-server/echo-server /
CMD ["/echo-server"]
2 changes: 1 addition & 1 deletion integration_test/testdata/k8s/echo-double-one-unnamed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
spec:
containers:
- name: echo-server
image: docker.io/thhal/echo-server:latest
image: docker.io/telepresenceio/echo-server:latest
ports:
- containerPort: 8080
- containerPort: 8081
Expand Down
4 changes: 2 additions & 2 deletions integration_test/testdata/k8s/echo-extra-udp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
spec:
containers:
- name: echo-udp-server
image: docker.io/thhal/udp-test:0.1.0
image: docker.io/telepresenceio/udp-echo:latest
env:
- name: PORT
value: "8080"
Expand All @@ -39,7 +39,7 @@ spec:
cpu: 50m
memory: 8Mi
- name: echo-server
image: docker.io/thhal/echo-server:latest
image: docker.io/telepresenceio/echo-server:latest
ports:
- name: http
containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion integration_test/testdata/k8s/echo-no-containerport.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
spec:
containers:
- name: echo-server
image: docker.io/thhal/echo-server:latest
image: docker.io/telepresenceio/echo-server:latest
env:
- name: PORTS
value: "8080,8081"
Expand Down
2 changes: 1 addition & 1 deletion integration_test/testdata/k8s/echo-no-vols.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
automountServiceAccountToken: false
containers:
- name: echo-server
image: docker.io/thhal/echo-server:latest
image: docker.io/telepresenceio/echo-server:latest
ports:
- name: http
containerPort: 8080
Expand Down
4 changes: 2 additions & 2 deletions integration_test/testdata/k8s/echo-udp-tcp-unnamed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
spec:
containers:
- name: echo-udp-server
image: docker.io/thhal/udp-test:0.1.0
image: docker.io/telepresenceio/udp-echo:latest
ports:
- containerPort: 8080
protocol: UDP
Expand All @@ -29,7 +29,7 @@ spec:
cpu: 50m
memory: 8Mi
- name: echo-server
image: docker.io/thhal/echo-server:latest
image: docker.io/telepresenceio/echo-server:latest
ports:
- containerPort: 8080
env:
Expand Down
2 changes: 1 addition & 1 deletion integration_test/udp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ func (s *connectedSuite) TestUDPEcho() {
ctx := s.Context()
require := s.Require()
svc := "udp-echo"
tag := "docker.io/thhal/udp-test:0.1.0"
tag := "docker.io/telepresenceio/udp-echo:latest"

require.NoError(s.Kubectl(ctx, "create", "deploy", svc, "--image", tag))
require.NoError(s.Kubectl(ctx, "expose", "deploy", svc, "--port", "80", "--protocol", "UDP", "--target-port", "8080"))
Expand Down
Loading