Fixing buildspec identifiers

Author: JohnPreston

.cicd/buildspec.yml

@@ -4,7 +4,7 @@ env:
   shell: /bin/bash
   variables:
     USE_EPOCH: 0
-    PUBLIC_REGISTRY: public.ecr.aws/ews-network
+    PUBLIC_REGISTRY: public.ecr.aws/compose-x
     DOCKER_CLI_EXPERIMENTAL: enabled
 
 batch:
@@ -18,7 +18,7 @@ batch:
         variables:
           VERSION: 3.8
           ARCH: amd64
-      buildspec: build_images.yml
+      buildspec: .cicd/build_images.yml
 
     - identifier: arm64v8_py38
       env:
@@ -29,15 +29,13 @@ batch:
         variables:
           ARCH: arm64v8
           VERSION: 3.8
-      buildspec: build_images.yml
+      buildspec: .cicd/build_images.yml
 
     - identifier: manifest
       env:
         compute-type: BUILD_GENERAL1_LARGE
         privileged-mode: true
       depend-on:
-        - amd64_py37
-        - arm64v8_py37
         - amd64_py38
         - arm64v8_py38
 
@@ -68,15 +66,15 @@ phases:
           for ARCH in "amd64" "arm64v8"; do
               ARCH_TAG=${VERSION}-${ARCH}
 
-              echo Publish from ${REGISTRY_URI}python:${ARCH_TAG}$ to ${PUBLIC_REGISTRY}/ecs-files-composer:${ARCH_TAG}$
-              docker pull ${REGISTRY_URI}python:${ARCH_TAG}
-              docker tag  ${REGISTRY_URI}python:${ARCH_TAG} ${PUBLIC_REGISTRY}/ecs-files-composer:${ARCH_TAG}
+              echo Publish from ${REGISTRY_URI}ecs-files-composer:${ARCH_TAG}$ to ${PUBLIC_REGISTRY}/ecs-files-composer:${ARCH_TAG}$
+              docker pull ${REGISTRY_URI}ecs-files-composer:${ARCH_TAG}
+              docker tag  ${REGISTRY_URI}ecs-files-composer:${ARCH_TAG} ${PUBLIC_REGISTRY}/ecs-files-composer:${ARCH_TAG}
               docker push ${PUBLIC_REGISTRY}/ecs-files-composer:${ARCH_TAG}
           done
       - |
           docker manifest create ${PUBLIC_REGISTRY}/ecs-files-composer:${VERSION}                    \
-              --amend ${PUBLIC_REGISTRY}/ecs-files-composer:${VERSION}.${VERSION}-amd64              \
-              --amend ${PUBLIC_REGISTRY}/ecs-files-composer:${VERSION}.${VERSION}-arm64v8
+              --amend ${PUBLIC_REGISTRY}/ecs-files-composer:${VERSION}-amd64              \
+              --amend ${PUBLIC_REGISTRY}/ecs-files-composer:${VERSION}-arm64v8
       - docker manifest push ${PUBLIC_REGISTRY}/ecs-files-composer:${VERSION}
 
     finally:

Dockerfile

@@ -5,17 +5,17 @@ ARG LAMBDA_IMAGE=public.ecr.aws/lambda/python:latest
 FROM $BASE_IMAGE as builder
 
 WORKDIR /opt
-COPY ecs_config_composer /opt/ecs_config_composer
+COPY ecs_files_composer /opt/ecs_files_composer
 COPY setup.py requirements.txt MANIFEST.in README.rst LICENSE /opt/
 RUN python -m venv venv ; source venv/bin/activate ; pip install wheel;  python setup.py sdist bdist_wheel; ls -l dist/
 
 FROM $BASE_IMAGE
 
 RUN yum upgrade -y
 ENV PATH=/app/.local/bin:${PATH}
-COPY --from=builder /opt/dist/ecs_config_composer-*.whl ${LAMBDA_TASK_ROOT:-/app/}/
+COPY --from=builder /opt/dist/ecs_files_composer-*.whl ${LAMBDA_TASK_ROOT:-/app/}/
 WORKDIR /app
 RUN echo $PATH ; pip install pip -U --no-cache-dir && pip install wheel --no-cache-dir && pip install *.whl --no-cache-dir
 WORKDIR /
-ENTRYPOINT ["ecs_config_composer"]
-CMD ["--env", "CONFIG"]
+ENTRYPOINT ["ecs_files_composer"]
+CMD ["-h"]

README.rst

@@ -3,8 +3,8 @@ ECS Files Composer
 ===================
 
 
-.. image:: https://img.shields.io/pypi/v/ecs_config_composer.svg
-        :target: https://pypi.python.org/pypi/ecs_config_composer
+.. image:: https://img.shields.io/pypi/v/ecs_files_composer.svg
+        :target: https://pypi.python.org/pypi/ecs_files_composer
 
 .. image:: https://readthedocs.org/projects/ecs-config-composer/badge/?version=latest
         :target: https://ecs-config-composer.readthedocs.io/en/latest/?version=latest

tests/__init__.py

@@ -1 +1 @@
-"""Unit test package for ecs_config_composer."""
+"""Unit test package for ecs_files_composer."""

tox.ini

@@ -11,7 +11,7 @@ python =
 [testenv:flake8]
 basepython = python
 deps = flake8
-commands = flake8 ecs_config_composer tests
+commands = flake8 ecs_files_composer tests
 
 [testenv]
 setenv =