From f4690b9a363f7c8dedc1997139375d152b2a54f4 Mon Sep 17 00:00:00 2001 From: Paul Horton Date: Fri, 19 Nov 2021 13:10:34 +0000 Subject: [PATCH 1/2] fix: update `Dockerfile` to use Python 3.10 Signed-off-by: Paul Horton --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index afe9e5a64..d6ee847ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM python:3.9.7-slim-buster +FROM python:3.10-slim-buster ARG VERSION COPY ./dist /tmp/dist RUN pip install cyclonedx-bom==${VERSION} --find-links file:///tmp/dist -ENTRYPOINT ["cyclonedx-py"] +ENTRYPOINT ["cyclonedx-bom"] From 946190b6d866cb16e04c35275d8582e3e7bfbe3a Mon Sep 17 00:00:00 2001 From: Paul Horton Date: Fri, 19 Nov 2021 13:18:02 +0000 Subject: [PATCH 2/2] ci: renable publishing of Docker Images Signed-off-by: Paul Horton --- .github/workflows/release.yml | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b8ae754f1..613d9107d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -54,23 +54,20 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} pypi_token: ${{ secrets.PYPI_TOKEN }} -# - name: Package release -# id: package_release -# env: -# REPO: cyclonedx/cyclonedx-python -# run: | -# VERSION=`cat VERSION` -# echo "##[set-output name=version;]$VERSION" -# python setup.py sdist bdist_wheel -# docker build -f Dockerfile --build-arg VERSION=$VERSION -t $REPO:$VERSION -t $REPO:latest . + - name: Build Docker Image + id: package_release + env: + REPO: cyclonedx/cyclonedx-python + run: | + VERSION=`poetry version -s` + docker build -f Dockerfile --build-arg VERSION=$VERSION -t $REPO:$VERSION -t $REPO:latest . -# -# - name: Publish docker image -# env: -# REPO: cyclonedx/cyclonedx-python -# DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} -# run: | -# VERSION=`cat VERSION` -# docker login --username coderpatros --password "$DOCKER_TOKEN" -# docker push $REPO:latest -# docker push $REPO:${{ steps.package_release.outputs.version }} + - name: Publish Docker Image(s) + env: + REPO: cyclonedx/cyclonedx-python + DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} + run: | + VERSION=`poetry version -s` + docker login --username coderpatros --password "$DOCKER_TOKEN" + docker push $REPO:latest + docker push $REPO:$VERSION