Released 0.11.2 (datmanslo#4)

* v0.11.2

* Fix missing requests

* Set buildx to default in action

* move release step after build

* Update Dockerfile

* done

* limit platform scope

Author: datmanslo

.github/workflows/image.yml

@@ -10,22 +10,63 @@ jobs:
       - name: checkout code
         uses: actions/checkout@v2
 
-      - name: Set up Docker Buildx
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+
+name: Create Release and Push Tag to Dockerhub
+
+jobs:
+  build:
+    name: Create Release
+    runs-on: ubuntu-latest
+    steps:
+      - 
+        name: Checkout code
+        uses: actions/checkout@v2
+      - 
+        name: Set env
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
+      - 
+        name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          body: |
+            Changes in this Release
+            - Updated to CATT v0.11.2
+          draft: false
+          prerelease: false
+      
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: all
+      -
+        name: Set up Docker Buildx
         id: buildx
-        uses: crazy-max/ghaction-docker-buildx@v3
+        uses: docker/setup-buildx-action@v1
         with:
-          buildx-version: latest
-          qemu-version: latest
-
-      - name: Available platforms
+          version: latest
+          install: true
+      -
+        name: Available platforms
         run: echo ${{ steps.buildx.outputs.platforms }}
 
       - name: login to docker hub
         run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
 
       - name: build the image
         run: |
-          docker buildx build \
+          docker build \
             --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x \
             --output "type=image,push=true" \
             --tag datmanslo/catt:latest \

.github/workflows/release.yaml

@@ -11,42 +11,50 @@ jobs:
     name: Create Release
     runs-on: ubuntu-latest
     steps:
-
-      - name: Checkout code
+      - 
+        name: Checkout code
         uses: actions/checkout@v2
-
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+      - 
+        name: Set env
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
         with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          body: |
-            Changes in this Release
-            - Added Github Actions
-            - Updated to CATT v0.11.3
-          draft: false
-          prerelease: false
-      
-      - name: Set up Docker Buildx
+          platforms: all
+      -
+        name: Set up Docker Buildx
         id: buildx
-        uses: crazy-max/ghaction-docker-buildx@v3
+        uses: docker/setup-buildx-action@v1
         with:
-          buildx-version: latest
-          qemu-version: latest
-
-      - name: Available platforms
+          version: latest
+          install: true
+      -
+        name: Available platforms
         run: echo ${{ steps.buildx.outputs.platforms }}
 
       - name: login to docker hub
         run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
 
       - name: build the image
         run: |
-          docker buildx build \
+          docker build \
             --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x \
             --output "type=image,push=true" \
-            --tag datmanslo/catt:${{ github.ref }} \
-            - < ./Dockerfile
+            --tag datmanslo/catt:$RELEASE_VERSION \
+            - < ./Dockerfile
+      - 
+        name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          body: |
+            Changes in this Release
+            - Added Github Actions
+            - Updated to CATT v0.11.2
+          draft: false
+          prerelease: false

.travis.yml

@@ -7,4 +7,4 @@ install:
   - docker build -t datmanslo/catt .
 
 script:
-  - docker run --rm --name catt datmanslo/catt --version | grep -c "catt v0.11.3, Yearning Yachtman." || travis_terminate 1
+  - docker run --rm --name catt datmanslo/catt --version | grep -c "catt v0.11.2, Yearning Yachtman." || travis_terminate 1

Dockerfile

@@ -3,15 +3,14 @@ ARG BASE_OS_VERSION="3.12.1"
 
 FROM ${BASE_OS}:${BASE_OS_VERSION}
 
-ARG CATT_VERSION=0.11.3
+ARG CATT_VERSION=0.11.2
 
 LABEL maintainer="[email protected]" \
       version="{CATT_VERSION}" \
       repo="github.com/datmanslo/docker-catt"
 
 RUN apk add --no-cache python3 py3-pip && \
     pip3 install catt==${CATT_VERSION} && \
-    apk del --purge py3-pip && \
     rm -rf /root/.cache/pip
 
 ENTRYPOINT ["catt"]

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/datmanslo/docker-catt.svg?branch=master)](https://travis-ci.org/datmanslo/docker-catt)
+[![Build Status](https://travis-ci.com/datmanslo/docker-catt.svg?branch=main)](https://travis-ci.com/datmanslo/docker-catt)
 # docker-catt
 "Dockerized" version of https://github.com/skorokithakis/catt: Cast All The Things
 ## Usage:

buildah.sh

@@ -4,7 +4,7 @@ set -o errexit
 
 base_os="alpine"
 base_os_version="3.12.1"
-catt_version="v0.11.3"
+catt_version="v0.11.2"
 container=$(buildah from $base_os:$base_os_version)
 image_name="datmanslo/catt"
 
@@ -14,8 +14,7 @@ buildah config --label version=$catt_version $container
 buildah config --label repo="github.com/datmanslo/docker-catt" $container
 
 buildah run $container apk add --no-cache python3 py3-pip
-buildah run $container pip3 install catt==$catt_version
-buildah run $container apk del --purge py3-pip
+buildah run $container python3 -m pip install catt==$catt_version
 buildah run $container rm -rf /root/.cache/pip
 
 buildah config --entrypoint catt $container