Skip to content

Commit

Permalink
cease publishing to dockerhub (#161)
Browse files Browse the repository at this point in the history
* cease publishing to dockerhub

* update chart with eks-charts
  • Loading branch information
brycahta committed Jan 31, 2022
1 parent fb528fb commit 0bc6997
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 51 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ env:
DEFAULT_PY_VERSION: "3.9"
GITHUB_USERNAME: ${{ secrets.EC2_BOT_GITHUB_USERNAME }}
GITHUB_TOKEN: ${{ secrets.EC2_BOT_GITHUB_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}

jobs:
release:
Expand Down
13 changes: 0 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ ECR_REPO ?= ${ECR_REGISTRY}/amazon-ec2-metadata-mock
IMG ?= amazon/amazon-ec2-metadata-mock
IMG_TAG ?= ${VERSION}
IMG_W_TAG = ${IMG}:${IMG_TAG}
DOCKERHUB_USERNAME ?= ""
DOCKERHUB_TOKEN ?= ""
GOOS ?= linux
GOARCH ?= amd64
GOPROXY ?= "https://proxy.golang.org,direct"
Expand Down Expand Up @@ -106,22 +104,15 @@ build-docker-images-windows:
${MAKEFILE_PATH}/scripts/build-docker-images -d -p ${SUPPORTED_PLATFORMS_WINDOWS} -r ${IMG} -v ${VERSION}

push-docker-images-linux:
@docker login -u ${DOCKERHUB_USERNAME} -p="${DOCKERHUB_TOKEN}"
${MAKEFILE_PATH}/scripts/push-docker-images -p ${SUPPORTED_PLATFORMS_LINUX} -r ${IMG} -v ${VERSION} -m
${MAKEFILE_PATH}/scripts/retag-docker-images -p ${SUPPORTED_PLATFORMS_LINUX} -v ${VERSION} -o ${IMG} -n ${ECR_REPO}
@ECR_REGISTRY=${ECR_REGISTRY} ${MAKEFILE_PATH}/scripts/ecr-public-login
${MAKEFILE_PATH}/scripts/push-docker-images -p ${SUPPORTED_PLATFORMS_LINUX} -r ${ECR_REPO} -v ${VERSION} -m

push-docker-images-windows:
@docker login -u ${DOCKERHUB_USERNAME} -p="${DOCKERHUB_TOKEN}"
${MAKEFILE_PATH}/scripts/push-docker-images -p ${SUPPORTED_PLATFORMS_WINDOWS} -r ${IMG} -v ${VERSION} -m
${MAKEFILE_PATH}/scripts/retag-docker-images -p ${SUPPORTED_PLATFORMS_WINDOWS} -v ${VERSION} -o ${IMG} -n ${ECR_REPO}
@ECR_REGISTRY=${ECR_REGISTRY} ${MAKEFILE_PATH}/scripts/ecr-public-login
${MAKEFILE_PATH}/scripts/push-docker-images -p ${SUPPORTED_PLATFORMS_WINDOWS} -r ${ECR_REPO} -v ${VERSION} -m

sync-readme-to-dockerhub:
${MAKEFILE_PATH}/scripts/sync-readme-to-dockerhub

sync-readme-to-ecr-public:
@ECR_REGISTRY=${ECR_REGISTRY} ${MAKEFILE_PATH}/scripts/ecr-public-login
${MAKEFILE_PATH}/scripts/sync-readme-to-ecr-public
Expand Down Expand Up @@ -158,10 +149,6 @@ docker-build:
docker-run:
docker run ${IMG_W_TAG}

docker-push:
@docker login -u ${DOCKERHUB_USERNAME} -p="${DOCKERHUB_TOKEN}"
docker push ${IMG_W_TAG}

## Targets intended to be run in preparation for a new release
create-local-release-tag-major:
${MAKEFILE_PATH}/scripts/create-local-tag-for-release -m
Expand Down
7 changes: 4 additions & 3 deletions helm/amazon-ec2-metadata-mock/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
apiVersion: v1
name: amazon-ec2-metadata-mock
description: A Helm chart for the Amazon EC2 Metadata Mock
description: A Helm chart for Amazon EC2 Metadata Mock
version: 1.10.0
home: https://github.com/aws/amazon-ec2-metadata-mock
icon: https://raw.githubusercontent.com/aws/amazon-ec2-metadata-mock/main/helm/aws-logo.png
home: https://github.com/aws/eks-charts
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
sources:
- https://github.com/aws/amazon-ec2-metadata-mock
- https://github.com/aws/eks-charts/
maintainers:
- name: pdk27
url: https://github.com/pdk27
Expand Down
2 changes: 1 addition & 1 deletion scripts/push-docker-images
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ DOCKER_CLI_CONFIG="$HOME/.docker/config.json"

USAGE=$(cat << 'EOM'
Usage: push-docker-images [-p <platform pairs>]
Pushes docker images for the platform pairs passed in w/ a dockerhub manifest
Pushes docker images for the platform pairs passed in w/ a container manifest
Example: push-docker-images -p "linux/amd64,linux/arm"
Optional:
-p Platform pair list (os/architecture) [DEFAULT: linux/amd64]
Expand Down
31 changes: 0 additions & 31 deletions scripts/sync-readme-to-dockerhub

This file was deleted.

0 comments on commit 0bc6997

Please sign in to comment.