Skip to content
This repository has been archived by the owner on Jun 4, 2024. It is now read-only.

Stop publishing remaining plugins to quay.io (and remove all references to) #927

Merged
merged 2 commits into from
Sep 26, 2023
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
9 changes: 1 addition & 8 deletions access/email/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ RELEASE_MESSAGE = "Building with GOOS=$(OS) GOARCH=$(ARCH)."
DOCKER_NAME = teleport-plugin-email
DOCKER_IMAGE = 146628656107.dkr.ecr.us-west-2.amazonaws.com/gravitational/$(DOCKER_NAME):$(VERSION)
DOCKER_IMAGE_ECR_PUBLIC = public.ecr.aws/gravitational/$(DOCKER_NAME):$(VERSION)
DOCKER_IMAGE_QUAY = quay.io/gravitational/$(DOCKER_NAME):$(VERSION)
DOCKER_BUILD_ARGS = --build-arg GO_VERSION=${GO_VERSION} --build-arg ACCESS_PLUGIN=email --build-arg GITREF=$(GITREF)

.PHONY: $(BINARY)
Expand Down Expand Up @@ -62,13 +61,7 @@ docker-push:
docker push ${DOCKER_IMAGE}

.PHONY: docker-promote
docker-promote: docker-promote-quay docker-promote-ecr-public

.PHONY: docker-promote-quay
docker-promote-quay:
docker pull ${DOCKER_IMAGE} && \
docker tag ${DOCKER_IMAGE} ${DOCKER_IMAGE_QUAY} && \
docker push ${DOCKER_IMAGE_QUAY}
docker-promote: docker-promote-ecr-public

.PHONY: docker-promote-ecr-public
docker-promote-ecr-public:
Expand Down
9 changes: 1 addition & 8 deletions access/jira/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ RELEASE_MESSAGE = "Building with GOOS=$(OS) GOARCH=$(ARCH)."
DOCKER_NAME = teleport-plugin-jira
DOCKER_IMAGE = 146628656107.dkr.ecr.us-west-2.amazonaws.com/gravitational/$(DOCKER_NAME):$(VERSION)
DOCKER_IMAGE_ECR_PUBLIC = public.ecr.aws/gravitational/$(DOCKER_NAME):$(VERSION)
DOCKER_IMAGE_QUAY = quay.io/gravitational/$(DOCKER_NAME):$(VERSION)
DOCKER_BUILD_ARGS = --build-arg GO_VERSION=${GO_VERSION} --build-arg ACCESS_PLUGIN=jira --build-arg GITREF=$(GITREF)

.PHONY: $(BINARY)
Expand Down Expand Up @@ -62,13 +61,7 @@ docker-push:
docker push ${DOCKER_IMAGE}

.PHONY: docker-promote
docker-promote: docker-promote-quay docker-promote-ecr-public

.PHONY: docker-promote-quay
docker-promote-quay:
docker pull ${DOCKER_IMAGE} && \
docker tag ${DOCKER_IMAGE} ${DOCKER_IMAGE_QUAY} && \
docker push ${DOCKER_IMAGE_QUAY}
docker-promote: docker-promote-ecr-public

.PHONY: docker-promote-ecr-public
docker-promote-ecr-public:
Expand Down
9 changes: 1 addition & 8 deletions access/mattermost/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ RELEASE_MESSAGE = "Building with GOOS=$(OS) GOARCH=$(ARCH)."
DOCKER_NAME = teleport-plugin-mattermost
DOCKER_IMAGE = 146628656107.dkr.ecr.us-west-2.amazonaws.com/gravitational/$(DOCKER_NAME):$(VERSION)
DOCKER_IMAGE_ECR_PUBLIC = public.ecr.aws/gravitational/$(DOCKER_NAME):$(VERSION)
DOCKER_IMAGE_QUAY = quay.io/gravitational/$(DOCKER_NAME):$(VERSION)
DOCKER_BUILD_ARGS = --build-arg GO_VERSION=${GO_VERSION} --build-arg ACCESS_PLUGIN=mattermost --build-arg GITREF=$(GITREF)

.PHONY: $(BINARY)
Expand Down Expand Up @@ -62,13 +61,7 @@ docker-push:
docker push ${DOCKER_IMAGE}

.PHONY: docker-promote
docker-promote: docker-promote-quay docker-promote-ecr-public

.PHONY: docker-promote-quay
docker-promote-quay:
docker pull ${DOCKER_IMAGE} && \
docker tag ${DOCKER_IMAGE} ${DOCKER_IMAGE_QUAY} && \
docker push ${DOCKER_IMAGE_QUAY}
docker-promote: docker-promote-ecr-public

.PHONY: docker-promote-ecr-public
docker-promote-ecr-public:
Expand Down
8 changes: 4 additions & 4 deletions access/msteams/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ $ ./install

### Docker Image
```bash
$ docker pull quay.io/gravitational/teleport-plugin-msteams:9.0.2
$ docker pull public.ecr.aws/gravitational/teleport-plugin-msteams:9.0.2
```

```bash
$ docker run quay.io/gravitational/teleport-plugin-msteams:9.0.2 version
$ docker run public.ecr.aws/gravitational/teleport-plugin-msteams:9.0.2 version
teleport-msteams v9.0.2 git:teleport-msteams-v9.0.2-0-g9e149895 go1.17.8
```

For a list of available tags, visit [https://quay.io/](https://quay.io/repository/gravitational/teleport-plugin-msteams?tab=tags)
For a list of available tags, visit [https://gallery.ecr.aws/](https://gallery.ecr.aws/gravitational/teleport-plugin-msteams)

### Building from source

Expand Down Expand Up @@ -168,7 +168,7 @@ $ teleport-msteams start -c ~/msteams/teleport-msteams.toml
or with docker:

```bash
$ docker run -v <path/to/config>:~/msteams/teleport-msteams.toml quay.io/gravitational/teleport-plugin-msteams:9.0.2 start
$ docker run -v <path/to/config>:~/msteams/teleport-msteams.toml public.ecr.aws/gravitational/teleport-plugin-msteams:9.0.2 start
```

## Usage
Expand Down
9 changes: 1 addition & 8 deletions access/pagerduty/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ RELEASE_MESSAGE = "Building with GOOS=$(OS) GOARCH=$(ARCH)."
DOCKER_NAME = teleport-plugin-pagerduty
DOCKER_IMAGE = 146628656107.dkr.ecr.us-west-2.amazonaws.com/gravitational/$(DOCKER_NAME):$(VERSION)
DOCKER_IMAGE_ECR_PUBLIC = public.ecr.aws/gravitational/$(DOCKER_NAME):$(VERSION)
DOCKER_IMAGE_QUAY = quay.io/gravitational/$(DOCKER_NAME):$(VERSION)
DOCKER_BUILD_ARGS = --build-arg GO_VERSION=${GO_VERSION} --build-arg ACCESS_PLUGIN=pagerduty --build-arg GITREF=$(GITREF)

.PHONY: $(BINARY)
Expand Down Expand Up @@ -62,13 +61,7 @@ docker-push:
docker push ${DOCKER_IMAGE}

.PHONY: docker-promote
docker-promote: docker-promote-quay docker-promote-ecr-public

.PHONY: docker-promote-quay
docker-promote-quay:
docker pull ${DOCKER_IMAGE} && \
docker tag ${DOCKER_IMAGE} ${DOCKER_IMAGE_QUAY} && \
docker push ${DOCKER_IMAGE_QUAY}
docker-promote: docker-promote-ecr-public

.PHONY: docker-promote-ecr-public
docker-promote-ecr-public:
Expand Down
9 changes: 1 addition & 8 deletions access/slack/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ RELEASE_MESSAGE = "Building with GOOS=$(OS) GOARCH=$(ARCH)."
DOCKER_NAME = teleport-plugin-slack
DOCKER_IMAGE = 146628656107.dkr.ecr.us-west-2.amazonaws.com/gravitational/$(DOCKER_NAME):$(VERSION)
DOCKER_IMAGE_ECR_PUBLIC = public.ecr.aws/gravitational/$(DOCKER_NAME):$(VERSION)
DOCKER_IMAGE_QUAY = quay.io/gravitational/$(DOCKER_NAME):$(VERSION)
DOCKER_BUILD_ARGS = --build-arg GO_VERSION=${GO_VERSION} --build-arg ACCESS_PLUGIN=slack --build-arg GITREF=$(GITREF)

.PHONY: $(BINARY)
Expand Down Expand Up @@ -62,13 +61,7 @@ docker-push: ## Push docker image with the plugin.
docker push ${DOCKER_IMAGE}

.PHONY: docker-promote
docker-promote: docker-promote-quay docker-promote-ecr-public

.PHONY: docker-promote-quay
docker-promote-quay:
docker pull ${DOCKER_IMAGE} && \
docker tag ${DOCKER_IMAGE} ${DOCKER_IMAGE_QUAY} && \
docker push ${DOCKER_IMAGE_QUAY}
docker-promote: docker-promote-ecr-public

.PHONY: docker-promote-ecr-public
docker-promote-ecr-public:
Expand Down
6 changes: 3 additions & 3 deletions docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ SRCDIR ?= /go/src/github.com/gravitational/teleport-plugins
MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))

# Teleport Enterprise Binary release name. Can be any teleport
# enterprise version, but has to be available on get.gravitational.com
RELEASE ?= teleport-ent-v6.0.2-linux-amd64-bin
# enterprise version, but has to be available on cdn.teleport.dev
RELEASE ?= teleport-ent-v14.0.0-linux-amd64-bin

RUNTIME ?= go1.21.1
BBOX ?= quay.io/gravitational/teleport-buildbox:$(RUNTIME)
BBOX ?= public.ecr.aws/gravitational/teleport-buildbox:$(RUNTIME)

# Teleport CLI and plugins CLI flags to pass to them on start
# This is used in insecure-up and debug to pass
Expand Down
4 changes: 2 additions & 2 deletions docker/plugins/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Defines Teleport Slack image, based on Teleport OSS image.
ARG RUNTIME="go1.16.2"
ARG BBOX="quay.io/gravitational/teleport-buildbox"
ARG RUNTIME="go1.21.1"
ARG BBOX="public.ecr.aws/gravitational/teleport-buildbox"
FROM $BBOX:$RUNTIME

RUN apt-get update
Expand Down
4 changes: 2 additions & 2 deletions docker/teleport/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# This image builds a Docker image with Teleport Enterprise.
FROM teleport:latest

ARG RELEASE="teleport-ent-v6.0.0-alpha.2-linux-amd64-bin"
ARG RELEASE="teleport-ent-v14.0.0-linux-amd64-bin"

# Install Teleport
RUN (cd /teleport;\
curl -L https://get.gravitational.com/$RELEASE.tar.gz | tar -xz ;\
curl -L https://cdn.teleport.dev/$RELEASE.tar.gz | tar -xz ;\
./teleport-ent/install)

9 changes: 1 addition & 8 deletions event-handler/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ IDENTITY_FILE=example/keys/identity
DOCKER_NAME=teleport-plugin-event-handler
DOCKER_IMAGE = 146628656107.dkr.ecr.us-west-2.amazonaws.com/gravitational/$(DOCKER_NAME):$(VERSION)
DOCKER_IMAGE_ECR_PUBLIC = public.ecr.aws/gravitational/$(DOCKER_NAME):$(VERSION)
DOCKER_IMAGE_QUAY = quay.io/gravitational/$(DOCKER_NAME):$(VERSION)
DOCKER_BUILD_ARGS = --build-arg GO_VERSION=${GO_VERSION} --build-arg GITREF=$(GITREF)

RELEASE_NAME = teleport-event-handler
Expand Down Expand Up @@ -66,13 +65,7 @@ docker-push:
docker push ${DOCKER_IMAGE}

.PHONY: docker-promote
docker-promote: docker-promote-quay docker-promote-ecr-public

.PHONY: docker-promote-quay
docker-promote-quay:
docker pull ${DOCKER_IMAGE} && \
docker tag ${DOCKER_IMAGE} ${DOCKER_IMAGE_QUAY} && \
docker push ${DOCKER_IMAGE_QUAY}
docker-promote: docker-promote-ecr-public

.PHONY: docker-promote-ecr-public
docker-promote-ecr-public:
Expand Down