Merge pull request #6 from Robot-Wranglers/mainline

fix docker build/tag; remove cruft
Robot-Wranglers · Mar 14, 2024 · 986779c · 986779c
2 parents 2bcb9ca + bdd92f5
commit 986779c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 23 deletions.
diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
@@ -42,13 +42,13 @@ jobs:
         id: meta
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
-          images: robot-wranglers/aws-ssm-tool
+          images: robotwranglers/aws-ssm-tool
 
       - name: Build and push Docker image
         uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
         with:
           context: .
           file: ./Dockerfile
           push: true
-          tags: robot-wranglers/aws-ssm-tool:latest,robot-wranglers/aws-ssm-tool:4.2,robot-wranglers/aws-ssm-tool:4.2_2015-02-22
+          tags: robotwranglers/aws-ssm-tool:latest
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-python@v3
         with: {python-version: '3.9'}
       - name: Release Package
-        run: make init release 
+        run: make init pypi-release 
         env:
           PYPI_USER: ${{ secrets.PYPI_USER }}
           PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
diff --git a/Makefile b/Makefile
@@ -57,13 +57,12 @@ pypi-release:
 	--password $${PYPI_TOKEN} \
 	dist/*
 
+DOCKER_ORG_NAME ?= robotwranglers
 DOCKER_IMAGE_NAME ?= aws-ssm-tool
 
 docker-build: build-docker
 build-docker:
-	docker build -t $(DOCKER_IMAGE_NAME) .
-
-release: pypi-release docker-release
+	docker build -t $(DOCKER_ORG_NAME)/$(DOCKER_IMAGE_NAME) .
 
 tox-%:
 	tox -e ${*}

diff --git a/src/ssm/cli/options.py b/src/ssm/cli/options.py
@@ -36,10 +36,6 @@
     "--raw", "-r", help="unquotes text return values (like jq -r)", default=False
 )
 
-# force_or_dry = force = dry_run = click.option(
-#     "--force/--dry-run", "-f/-d", help="perform actions", default=False, envvar="FORCE"
-# )
-
 optional_prefix = click.option(
     "--prefix", help="src prefix to operate under", required=False, default=""
 )
@@ -96,9 +92,6 @@
     show_default=True,
 )
 
-# required_profile = profile_partial(
-#     required=True,
-# )
 profile = profile_partial(
     default="default",
     required=False,
@@ -109,13 +102,3 @@
 dst_profile = dst_profile_default = dst_profile_partial(
     default="default", required=False
 )
-# src_profile_no_default = src_profile_partial(default=None, required=False)
-# dst_profile_no_default = dst_profile_partial(default=None, required=False)
-
-# src_prefix = click.option(
-#     "--src-prefix",
-#     envvar="SRC_PREFIX",
-#     help="src prefix to operate under",
-#     required=False,
-#     default="",
-# )