edge-containers-cli 4.4.0__tar.gz → 4.4.2__tar.gz

{edge_containers_cli-4.4.0 → edge_containers_cli-4.4.2}/.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.0 → edge_containers_cli-4.4.2}/.devcontainer/devcontainer.json

@@ -29,7 +29,7 @@
     },
     "features": {
         // add in eternal history and other bash features
-        "ghcr.io/diamondlightsource/devcontainer-features/bash-config:1.0.0": {}
+        "ghcr.io/diamondlightsource/devcontainer-features/bash-config:1": {}
     },
     // Create the config folder for the bash-config feature
     "initializeCommand": "mkdir -p ${localEnv:HOME}/.config/bash-config",

edge_containers_cli-4.4.2/.dockerignore

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

edge_containers_cli-4.4.2/.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.2}/.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.2/Dockerfile

@@ -0,0 +1,17 @@
+# This container is used for deploying ec as an apptainer container including
+# the CLI tools it uses. See https://github.com/DiamondLightSource/deploy-tools
+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 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.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edge-containers-cli
-Version: 4.4.0
+Version: 4.4.2
 Summary: CLI for deploying and managing epics containers IOCs and services
 Author-email: Giles Knap <giles.knap@gmail.com>
 License:                                  Apache License
@@ -258,8 +258,7 @@ PyPI            | `pip install edge-containers-cli`
 Releases        | <https://github.com/epics-containers/edge-containers-cli/releases>
 
 
-To discover the CLI commands, create a python virtual environment,
-and perform the following:
+To discover the CLI commands, create a python virtual environment, and perform the following:
 
     pip install edge-containers-cli
     ec --version

{edge_containers_cli-4.4.0 → edge_containers_cli-4.4.2}/README.md

@@ -22,8 +22,7 @@ PyPI            | `pip install edge-containers-cli`
 Releases        | <https://github.com/epics-containers/edge-containers-cli/releases>
 
 
-To discover the CLI commands, create a python virtual environment,
-and perform the following:
+To discover the CLI commands, create a python virtual environment, and perform the following:
 
     pip install edge-containers-cli
     ec --version

{edge_containers_cli-4.4.0 → edge_containers_cli-4.4.2}/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.2'
+__version_tuple__ = version_tuple = (4, 4, 2)

{edge_containers_cli-4.4.0 → edge_containers_cli-4.4.2}/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.2
 Summary: CLI for deploying and managing epics containers IOCs and services
 Author-email: Giles Knap <giles.knap@gmail.com>
 License:                                  Apache License
@@ -258,8 +258,7 @@ PyPI            | `pip install edge-containers-cli`
 Releases        | <https://github.com/epics-containers/edge-containers-cli/releases>
 
 
-To discover the CLI commands, create a python virtual environment,
-and perform the following:
+To discover the CLI commands, create a python virtual environment, and perform the following:
 
     pip install edge-containers-cli
     ec --version

{edge_containers_cli-4.4.0 → edge_containers_cli-4.4.2}/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