edge-containers-cli 4.4.0__tar.gz → 4.4.1b1__tar.gz

{edge_containers_cli-4.4.0 → edge_containers_cli-4.4.1b1}/.copier-answers.yml

@@ -5,7 +5,7 @@ author_email: giles.knap@gmail.com
 author_name: Giles Knap
 description: CLI for deploying and managing epics containers IOCs and services
 distribution_name: edge-containers-cli
-docker: false
+docker: true
 docs_type: README
 git_platform: github.com
 github_org: epics-containers

edge_containers_cli-4.4.1b1/.dockerignore

@@ -0,0 +1,4 @@
+Dockerfile
+README.md
+.venv*
+venv*

edge_containers_cli-4.4.1b1/.github/workflows/_container.yml

@@ -0,0 +1,60 @@
+on:
+  workflow_call:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          # Need this to get version number from last tag
+          fetch-depth: 0
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GitHub Docker Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and export to Docker local cache
+        uses: docker/build-push-action@v6
+        env:
+          DOCKER_BUILD_RECORD_UPLOAD: false
+        with:
+          context: .
+          # Need load and tags so we can test it below
+          load: true
+          tags: tag_for_testing
+
+      - name: Test cli works in cached runtime image
+        run: docker run --rm tag_for_testing --version
+
+      - name: Create tags for publishing image
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/${{ github.repository }}
+          tags: |
+            type=ref,event=tag
+            type=raw,value=latest
+
+      - name: Push cached image to container registry
+        if: github.ref_type == 'tag'
+        uses: docker/build-push-action@v6
+        env:
+          DOCKER_BUILD_RECORD_UPLOAD: false
+        # This does not build the image again, it will find the image in the
+        # Docker cache and publish it
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

{edge_containers_cli-4.4.0 → edge_containers_cli-4.4.1b1}/.github/workflows/ci.yml

@@ -34,6 +34,14 @@ jobs:
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
+  container:
+    needs: check
+    if: needs.check.outputs.branch-pr == ''
+    uses: ./.github/workflows/_container.yml
+    permissions:
+      contents: read
+      packages: write
+
   dist:
     needs: check
     if: needs.check.outputs.branch-pr == ''

edge_containers_cli-4.4.1b1/Dockerfile

@@ -0,0 +1,41 @@
+# The devcontainer should use the developer target and run as root with podman
+# or docker with user namespaces.
+ARG PYTHON_VERSION=3.12
+FROM python:${PYTHON_VERSION} AS developer
+
+# Set up a virtual environment and put it in PATH
+RUN python -m venv /venv
+ENV PATH=/venv/bin:$PATH
+
+# install tools used by ec #####################################################
+
+# ArgoCD CLI - see https://github.com/argoproj/argo-cd/releases
+RUN VERSION=v2.14.10 && \
+    curl -sSL -o argocd https://github.com/argoproj/argo-cd/releases/download/$VERSION/argocd-linux-amd64 && \
+    echo "d1750274a336f0a090abf196a832cee14cb9f1c2fc3d20d80b0dbfeff83550fa argocd" | sha256sum -c && \
+    install -m 555 argocd /usr/local/bin/argocd && \
+     rm argocd
+
+# kubectl - see https://kubernetes.io/docs/tasks/tools/install-kubectl-linux/
+RUN VERSION=v1.32.3 && \
+    curl -sSLO https://dl.k8s.io/release/$VERSION/bin/linux/amd64/kubectl && \
+    echo "ab209d0c5134b61486a0486585604a616a5bb2fc07df46d304b3c95817b2d79f kubectl" | sha256sum -c && \
+    install -m 555 kubectl /usr/local/bin/kubectl && \
+    rm kubectl
+
+# helm - see https://github.com/helm/helm/releases
+RUN VERSION=v3.17.3 && \
+    curl -sSL -o helm.tar.gz https://get.helm.sh/helm-$VERSION-linux-amd64.tar.gz && \
+    echo "ee88b3c851ae6466a3de507f7be73fe94d54cbf2987cbaa3d1a3832ea331f2cd helm.tar.gz" | sha256sum -c && \
+    tar -xzf helm.tar.gz --strip-components=1 linux-amd64/helm && \
+    install -m 555 helm /usr/local/bin/helm && \
+    rm helm.tar.gz
+
+# install the context into the venv
+COPY . /context
+WORKDIR /context
+RUN touch dev-requirements.txt && \
+    pip install -c dev-requirements.txt .
+
+ENTRYPOINT ["ec"]
+CMD ["--version"]

{edge_containers_cli-4.4.0 → edge_containers_cli-4.4.1b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edge-containers-cli
-Version: 4.4.0
+Version: 4.4.1b1
 Summary: CLI for deploying and managing epics containers IOCs and services
 Author-email: Giles Knap <giles.knap@gmail.com>
 License:                                  Apache License

{edge_containers_cli-4.4.0 → edge_containers_cli-4.4.1b1}/src/edge_containers_cli/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '4.4.0'
-__version_tuple__ = version_tuple = (4, 4, 0)
+__version__ = version = '4.4.1b1'
+__version_tuple__ = version_tuple = (4, 4, 1, 'b1')

{edge_containers_cli-4.4.0 → edge_containers_cli-4.4.1b1}/src/edge_containers_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edge-containers-cli
-Version: 4.4.0
+Version: 4.4.1b1
 Summary: CLI for deploying and managing epics containers IOCs and services
 Author-email: Giles Knap <giles.knap@gmail.com>
 License:                                  Apache License

{edge_containers_cli-4.4.0 → edge_containers_cli-4.4.1b1}/src/edge_containers_cli.egg-info/SOURCES.txt

@@ -1,4 +1,5 @@
 .copier-answers.yml
+.dockerignore
 .gitignore
 .pre-commit-config.yaml
 Dockerfile
@@ -15,6 +16,7 @@ pyproject.toml
 .github/pages/index.html
 .github/pages/make_switcher.py
 .github/workflows/_check.yml
+.github/workflows/_container.yml
 .github/workflows/_dist.yml
 .github/workflows/_pypi.yml
 .github/workflows/_release.yml

edge_containers_cli-4.4.0/Dockerfile

@@ -1,13 +0,0 @@
-# The devcontainer should use the developer target and run as root with podman
-# or docker with user namespaces.
-ARG PYTHON_VERSION=3.11
-FROM python:${PYTHON_VERSION} AS developer
-
-# Add any system dependencies for the developer/build environment here
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    graphviz \
-    && rm -rf /var/lib/apt/lists/*
-
-# Set up a virtual environment and put it in PATH
-RUN python -m venv /venv
-ENV PATH=/venv/bin:$PATH